[build] Re-visit build system and directory structure
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Mon, 17 May 2010 04:12:05 +0000 (00:12 -0400)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Tue, 18 May 2010 00:07:29 +0000 (20:07 -0400)
Thanks to OSR's ntdev mailing-list and Tim Roberts' response,
we now have a directory layout with some hierarchical
organization.  Very nice.

29 files changed:
.gitignore
WinVBlock.dev
makedriver.bat
src/aoe/aoe.rc [new file with mode: 0644]
src/aoe/makedriver.bat [new file with mode: 0644]
src/aoe/sources [deleted file]
src/aoe/sources.amd64 [deleted file]
src/aoe/sources.x86 [deleted file]
src/winvblock/bus/bus.c [moved from src/bus/bus.c with 100% similarity]
src/winvblock/bus/dev_ctl.c [moved from src/bus/bus_dev_ctl.c with 100% similarity]
src/winvblock/bus/makelib.bat [new file with mode: 0644]
src/winvblock/bus/pnp.c [moved from src/bus/bus_pnp.c with 100% similarity]
src/winvblock/debug.c [moved from src/bus/debug.c with 100% similarity]
src/winvblock/disk/dev_ctl.c [moved from src/bus/disk_dev_ctl.c with 100% similarity]
src/winvblock/disk/disk.c [moved from src/bus/disk.c with 100% similarity]
src/winvblock/disk/makelib.bat [new file with mode: 0644]
src/winvblock/disk/pnp.c [moved from src/bus/disk_pnp.c with 100% similarity]
src/winvblock/disk/scsi.c [moved from src/bus/disk_scsi.c with 100% similarity]
src/winvblock/driver.c [moved from src/bus/driver.c with 100% similarity]
src/winvblock/filedisk.c [moved from src/bus/filedisk.c with 100% similarity]
src/winvblock/irp.c [moved from src/bus/irp.c with 100% similarity]
src/winvblock/makedriver.bat [new file with mode: 0644]
src/winvblock/probe.c [moved from src/bus/probe.c with 100% similarity]
src/winvblock/ramdisk/grub4dos.c [moved from src/bus/grub4dos.c with 100% similarity]
src/winvblock/ramdisk/makelib.bat [new file with mode: 0644]
src/winvblock/ramdisk/memdisk.c [moved from src/bus/memdisk.c with 100% similarity]
src/winvblock/ramdisk/ramdisk.c [moved from src/bus/ramdisk.c with 100% similarity]
src/winvblock/registry.c [moved from src/bus/registry.c with 100% similarity]
src/winvblock/winvblock.rc [moved from src/bus/winvblock.rc with 100% similarity]

index bc5cc0d..5e40895 100644 (file)
@@ -10,3 +10,6 @@ WinVBlock.layout
 *.wrn
 objchk*
 objfre*
+makefile
+sources
+*.def
index aa01eca..e8bf9b0 100644 (file)
@@ -1,14 +1,14 @@
 [Project]\r
 FileName=WinVBlock.dev\r
 Name=WinVBlock\r
-UnitCount=43\r
+UnitCount=52\r
 PchHead=-1\r
 PchSource=-1\r
 Ver=3\r
 IsCpp=1\r
 ProfilesCount=2\r
 ProfileIndex=0\r
-Folders=\r
+Folders=AoE,HTTPDisk,HTTPDisk_Util\r
 \r
 [Unit1]\r
 FileName=src\loader\loader.c\r
@@ -31,7 +31,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit4]\r
-FileName=src\bus\bus.c\r
+FileName=src\bus\bus_dev_ctl.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -41,7 +41,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit5]\r
-FileName=src\bus\bus_dev_ctl.c\r
+FileName=src\bus\bus_pnp.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -51,7 +51,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit6]\r
-FileName=src\bus\bus_pnp.c\r
+FileName=src\bus\debug.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -61,16 +61,6 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit8]\r
-FileName=src\bus\disk.c\r
-CompileCpp=1\r
-Folder=WinVBlock\r
-Compile=1\r
-Link=1\r
-Priority=1000\r
-OverrideBuildCmd=0\r
-BuildCmd=\r
-\r
-[Unit9]\r
 FileName=src\bus\disk_dev_ctl.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
@@ -80,7 +70,7 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit10]\r
+[Unit9]\r
 FileName=src\bus\disk_pnp.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
@@ -90,7 +80,7 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit11]\r
+[Unit10]\r
 FileName=src\bus\disk_scsi.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
@@ -100,7 +90,7 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit12]\r
+[Unit11]\r
 FileName=src\bus\driver.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
@@ -110,7 +100,7 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit13]\r
+[Unit12]\r
 FileName=src\bus\filedisk.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
@@ -120,7 +110,7 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit14]\r
+[Unit13]\r
 FileName=src\bus\grub4dos.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
@@ -130,7 +120,7 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit15]\r
+[Unit14]\r
 FileName=src\bus\memdisk.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
@@ -140,7 +130,7 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit16]\r
+[Unit15]\r
 FileName=src\bus\probe.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
@@ -151,7 +141,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit17]\r
-FileName=src\bus\protocol.c\r
+FileName=src\bus\registry.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -234,7 +224,7 @@ CompilerSet=1
 CompilerType=1\r
 \r
 [Unit7]\r
-FileName=src\bus\debug.c\r
+FileName=src\bus\disk.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -244,7 +234,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit20]\r
-FileName=src\include\aoe.h\r
+FileName=src\include\bus_dev_ctl.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -254,7 +244,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit21]\r
-FileName=src\include\bus.h\r
+FileName=src\include\bus_pnp.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -264,7 +254,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit18]\r
-FileName=src\bus\ramdisk.c\r
+FileName=src\include\aoe.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -274,7 +264,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit23]\r
-FileName=src\include\bus_pnp.h\r
+FileName=src\include\disk.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -284,7 +274,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit22]\r
-FileName=src\include\bus_dev_ctl.h\r
+FileName=src\include\debug.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -294,7 +284,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit24]\r
-FileName=src\include\debug.h\r
+FileName=src\include\disk_dev_ctl.h\r
 Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
@@ -304,7 +294,7 @@ BuildCmd=
 CompileCpp=1\r
 \r
 [Unit25]\r
-FileName=src\include\disk.h\r
+FileName=src\include\disk_pnp.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -314,7 +304,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit26]\r
-FileName=src\include\disk_dev_ctl.h\r
+FileName=src\include\disk_scsi.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -324,7 +314,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit27]\r
-FileName=src\include\disk_pnp.h\r
+FileName=src\include\driver.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -334,7 +324,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit28]\r
-FileName=src\include\disk_scsi.h\r
+FileName=src\include\filedisk.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -344,7 +334,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit29]\r
-FileName=src\include\driver.h\r
+FileName=src\include\grub4dos.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -354,7 +344,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit30]\r
-FileName=src\include\filedisk.h\r
+FileName=src\include\irp.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -364,7 +354,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit31]\r
-FileName=src\include\grub4dos.h\r
+FileName=src\include\mdi.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -374,7 +364,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit32]\r
-FileName=src\include\irp.h\r
+FileName=src\include\memdisk.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -384,7 +374,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit33]\r
-FileName=src\include\mdi.h\r
+FileName=src\include\mount.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -394,7 +384,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit34]\r
-FileName=src\include\memdisk.h\r
+FileName=src\include\portable.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -404,7 +394,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit35]\r
-FileName=src\include\mount.h\r
+FileName=src\include\probe.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -414,7 +404,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit36]\r
-FileName=src\include\portable.h\r
+FileName=src\include\protocol.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -424,7 +414,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit19]\r
-FileName=src\bus\registry.c\r
+FileName=src\include\bus.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -434,7 +424,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit37]\r
-FileName=src\include\probe.h\r
+FileName=src\include\ramdisk.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -444,7 +434,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit38]\r
-FileName=src\include\protocol.h\r
+FileName=src\include\registry.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -454,7 +444,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit39]\r
-FileName=src\include\ramdisk.h\r
+FileName=src\include\resource.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -464,7 +454,7 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit40]\r
-FileName=src\include\registry.h\r
+FileName=src\include\winvblock.h\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -474,27 +464,57 @@ OverrideBuildCmd=0
 BuildCmd=\r
 \r
 [Unit41]\r
-FileName=src\include\resource.h\r
+FileName=src\bus\winvblock.rc\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
-Link=1\r
+Link=0\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
 [Unit42]\r
-FileName=src\include\winvblock.h\r
+FileName=src\aoe\driver.c\r
 CompileCpp=1\r
+Folder=AoE\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit43]\r
+FileName=src\bus\irp.c\r
 Folder=WinVBlock\r
 Compile=1\r
 Link=1\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
+CompileCpp=1\r
+\r
+[Unit44]\r
+FileName=src\aoe\protocol.c\r
+CompileCpp=1\r
+Folder=AoE\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit45]\r
+FileName=src\httpdisk\ktdi.h\r
+CompileCpp=1\r
+Folder=HTTPDisk\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
 \r
 [Unit3]\r
-FileName=src\bus\aoe.c\r
+FileName=src\bus\bus.c\r
 CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
@@ -503,12 +523,81 @@ Priority=1000
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
-[Unit43]\r
-FileName=src\bus\winvblock.rc\r
+[Unit16]\r
+FileName=src\bus\ramdisk.c\r
+CompileCpp=1\r
 Folder=WinVBlock\r
 Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit46]\r
+FileName=src\httpdisk\httpdisk.c\r
+CompileCpp=1\r
+Folder=HTTPDisk\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit47]\r
+FileName=src\httpdisk\httpdisk.rc\r
+Folder=HTTPDisk\r
+Compile=1\r
 Link=0\r
 Priority=1000\r
 OverrideBuildCmd=0\r
 BuildCmd=\r
 \r
+[Unit48]\r
+FileName=src\httpdisk\ksocket.c\r
+CompileCpp=1\r
+Folder=HTTPDisk\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit49]\r
+FileName=src\httpdisk\ksocket.h\r
+CompileCpp=1\r
+Folder=HTTPDisk\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit50]\r
+FileName=src\httpdisk\ktdi.c\r
+CompileCpp=1\r
+Folder=HTTPDisk\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit51]\r
+FileName=src\httpdisk_util\httpdisk.rc\r
+Folder=HTTPDisk_Util\r
+Compile=1\r
+Link=0\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
+[Unit52]\r
+FileName=src\httpdisk_util\httpdisk.c\r
+CompileCpp=1\r
+Folder=HTTPDisk_Util\r
+Compile=1\r
+Link=1\r
+Priority=1000\r
+OverrideBuildCmd=0\r
+BuildCmd=\r
+\r
index fbc874a..aef3e17 100644 (file)
@@ -23,8 +23,8 @@ if "%2" == "32" set arg2=w2k
 if "%2" == "64" set arg2=wnet amd64\r
 if "%2" == "32" set arch=i386\r
 if "%2" == "64" set arch=amd64\r
-if "%2" == "32" set name=wvblk32\r
-if "%2" == "64" set name=wvblk64\r
+if "%2" == "32" set bits=32\r
+if "%2" == "64" set bits=64\r
 if "%2" == "32" set obj=%obj%_w2k_x86\r
 if "%2" == "64" set obj=%obj%_wnet_amd64\r
 goto run\r
@@ -34,8 +34,8 @@ if "%1" == "32" set arg2=w2k
 if "%1" == "64" set arg2=wnet amd64\r
 if "%1" == "32" set arch=i386\r
 if "%1" == "64" set arch=amd64\r
-if "%1" == "32" set name=wvblk32\r
-if "%1" == "64" set name=wvblk64\r
+if "%1" == "32" set bits=32\r
+if "%1" == "64" set bits=64\r
 if "%1" == "32" set obj=w2k_x86\r
 if "%1" == "64" set obj=wnet_amd64\r
 if "%2" == "f" goto next_2_ok\r
@@ -62,27 +62,14 @@ pushd .
 call %ddkdir%\bin\setenv.bat %ddkdir% %arg1% %arg2%\r
 popd\r
 \r
-cd src\bus\r
-echo !INCLUDE $(NTMAKEENV)\makefile.def > makefile\r
-echo INCLUDES=..\include > sources\r
-echo TARGETNAME=%name% >> sources\r
-echo TARGETTYPE=EXPORT_DRIVER >> sources\r
-echo TARGETPATH=obj >> sources\r
-echo TARGETLIBS=$(DDK_LIB_PATH)\\ndis.lib >> sources\r
-echo SOURCES=%c% >> sources\r
-echo C_DEFINES=-DPROJECT_BUS=1 >> sources\r
-echo NAME %name%.sys> %name%.def\r
-build\r
-copy obj%obj%\%arch%\%name%.sys ..\..\bin >nul\r
-copy obj%obj%\%arch%\%name%.pdb ..\..\bin >nul\r
-copy obj%obj%\%arch%\%name%.lib ..\..\bin >nul\r
-del makefile\r
-del sources\r
-del %name%.def\r
-rem del build%obj%.log\r
-rem del build%obj%.wrn 2>nul\r
-rem del build%obj%.err 2>nul\r
-rem rd /s /q obj%obj%\r
-cd ..\..\r
+rem Build order is important here\r
+set sys=winvblock aoe\r
+\r
+for /d %%a in (%sys%) do (\r
+  pushd .\r
+  cd src\%%a\r
+  call makedriver.bat\r
+  popd\r
+  )\r
 \r
 :end
\ No newline at end of file
diff --git a/src/aoe/aoe.rc b/src/aoe/aoe.rc
new file mode 100644 (file)
index 0000000..251d13a
--- /dev/null
@@ -0,0 +1,26 @@
+1 VERSIONINFO\r
+FILEVERSION 0,0,1,7\r
+PRODUCTVERSION 0,0,1,7\r
+FILEOS 0x40004\r
+FILETYPE 0x3\r
+{\r
+BLOCK "StringFileInfo"\r
+{\r
+       BLOCK "000004B0"\r
+       {\r
+               VALUE "CompanyName", "Shao Miller"\r
+               VALUE "FileDescription", "WinVBlock AoE SAN Disk Driver"\r
+               VALUE "FileVersion", "0.0.1.7 (May-16-2010)"\r
+               VALUE "InternalName", "WinVBlock AoE SAN Disk Driver"\r
+               VALUE "LegalCopyright", "© 2008 V., © 2009-2010 Shao Miller, All rights reserved, Licensed under GPL."\r
+               VALUE "OriginalFilename", "aoe.sys"\r
+               VALUE "ProductName", "WinVBlock AoE SAN Disk Driver"\r
+               VALUE "ProductVersion", "0.0.1.7"\r
+       }\r
+}\r
+\r
+BLOCK "VarFileInfo"\r
+{\r
+       VALUE "Translation", 0x0000 0x04B0\r
+}\r
+}\r
diff --git a/src/aoe/makedriver.bat b/src/aoe/makedriver.bat
new file mode 100644 (file)
index 0000000..75dbac0
--- /dev/null
@@ -0,0 +1,19 @@
+@echo off\r
+\r
+set c=driver.c protocol.c aoe.rc\r
+\r
+set name=AoE%bits%\r
+\r
+echo INCLUDES=..\include                       > sources\r
+echo TARGETNAME=%name%                         >> sources\r
+echo TARGETTYPE=DRIVER                         >> sources\r
+echo TARGETPATH=obj                            >> sources\r
+echo TARGETLIBS=..\\..\\bin\\WVBlk%bits%.lib   \>> sources\r
+echo            $(DDK_LIB_PATH)\\ndis.lib      >> sources\r
+echo SOURCES=%c%                               >> sources\r
+echo C_DEFINES=-DPROJECT_AOE=1                 >> sources\r
+\r
+build\r
+copy obj%obj%\%arch%\%name%.sys ..\..\bin >nul\r
+copy obj%obj%\%arch%\%name%.pdb ..\..\bin >nul\r
+copy obj%obj%\%arch%\%name%.lib ..\..\bin >nul
\ No newline at end of file
diff --git a/src/aoe/sources b/src/aoe/sources
deleted file mode 100644 (file)
index 81c7939..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-INCLUDES=..\include\r
-TARGETNAME=aoe32\r
-TARGETTYPE=DRIVER\r
-TARGETPATH=obj\r
-TARGETLIBS=$(DDK_LIB_PATH)\\ndis.lib ..\\..\\bin\\wvblk32.lib\r
-SOURCES=driver.c protocol.c\r
-C_DEFINES=-DPROJECT_AOE=1
\ No newline at end of file
diff --git a/src/aoe/sources.amd64 b/src/aoe/sources.amd64
deleted file mode 100644 (file)
index 3feb334..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-INCLUDES=..\include\r
-TARGETNAME=aoe64\r
-TARGETTYPE=DRIVER\r
-TARGETPATH=obj\r
-TARGETLIBS=$(DDK_LIB_PATH)\\ndis.lib ..\\..\\bin\\wvblk64.lib\r
-SOURCES=driver.c protocol.c\r
-C_DEFINES=-DPROJECT_AOE=1
\ No newline at end of file
diff --git a/src/aoe/sources.x86 b/src/aoe/sources.x86
deleted file mode 100644 (file)
index 81c7939..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-INCLUDES=..\include\r
-TARGETNAME=aoe32\r
-TARGETTYPE=DRIVER\r
-TARGETPATH=obj\r
-TARGETLIBS=$(DDK_LIB_PATH)\\ndis.lib ..\\..\\bin\\wvblk32.lib\r
-SOURCES=driver.c protocol.c\r
-C_DEFINES=-DPROJECT_AOE=1
\ No newline at end of file
similarity index 100%
rename from src/bus/bus.c
rename to src/winvblock/bus/bus.c
diff --git a/src/winvblock/bus/makelib.bat b/src/winvblock/bus/makelib.bat
new file mode 100644 (file)
index 0000000..7c16d9b
--- /dev/null
@@ -0,0 +1,17 @@
+@echo off\r
+\r
+set libname=bus\r
+\r
+set c=bus.c dev_ctl.c pnp.c\r
+\r
+echo !INCLUDE $(NTMAKEENV)\makefile.def        > makefile\r
+\r
+echo INCLUDES=..\..\include            > sources\r
+echo TARGETNAME=%libname%              >> sources\r
+echo TARGETTYPE=DRIVER_LIBRARY         >> sources\r
+echo TARGETPATH=obj                    >> sources\r
+echo SOURCES=%c%                       >> sources\r
+echo C_DEFINES=-DPROJECT_BUS=1         >> sources\r
+\r
+build\r
+set links=%links% %libname%\\obj%obj%\\%arch%\\%libname%.lib
\ No newline at end of file
similarity index 100%
rename from src/bus/bus_pnp.c
rename to src/winvblock/bus/pnp.c
similarity index 100%
rename from src/bus/debug.c
rename to src/winvblock/debug.c
similarity index 100%
rename from src/bus/disk.c
rename to src/winvblock/disk/disk.c
diff --git a/src/winvblock/disk/makelib.bat b/src/winvblock/disk/makelib.bat
new file mode 100644 (file)
index 0000000..eddb6e8
--- /dev/null
@@ -0,0 +1,17 @@
+@echo off\r
+\r
+set libname=disk\r
+\r
+set c=disk.c dev_ctl.c scsi.c pnp.c\r
+\r
+echo !INCLUDE $(NTMAKEENV)\makefile.def        > makefile\r
+\r
+echo INCLUDES=..\..\include            > sources\r
+echo TARGETNAME=%libname%              >> sources\r
+echo TARGETTYPE=DRIVER_LIBRARY         >> sources\r
+echo TARGETPATH=obj                    >> sources\r
+echo SOURCES=%c%                       >> sources\r
+echo C_DEFINES=-DPROJECT_BUS=1         >> sources\r
+\r
+build\r
+set links=%links% %libname%\\obj%obj%\\%arch%\\%libname%.lib
\ No newline at end of file
similarity index 100%
rename from src/bus/disk_pnp.c
rename to src/winvblock/disk/pnp.c
similarity index 100%
rename from src/bus/driver.c
rename to src/winvblock/driver.c
similarity index 100%
rename from src/bus/filedisk.c
rename to src/winvblock/filedisk.c
similarity index 100%
rename from src/bus/irp.c
rename to src/winvblock/irp.c
diff --git a/src/winvblock/makedriver.bat b/src/winvblock/makedriver.bat
new file mode 100644 (file)
index 0000000..4188d42
--- /dev/null
@@ -0,0 +1,33 @@
+@echo off\r
+\r
+set lib=bus disk ramdisk\r
+\r
+set links=\r
+for /d %%a in (%lib%) do (\r
+  pushd .\r
+  cd %%a\r
+  call makelib.bat\r
+  popd\r
+  )\r
+\r
+set c=debug.c driver.c filedisk.c irp.c probe.c registry.c winvblock.rc\r
+\r
+set name=WVBlk%bits%\r
+\r
+echo !INCLUDE $(NTMAKEENV)\makefile.def        > makefile\r
+\r
+echo INCLUDES=..\include               > sources\r
+echo TARGETNAME=%name%                 >> sources\r
+echo TARGETTYPE=EXPORT_DRIVER          >> sources\r
+echo TARGETPATH=obj                    >> sources\r
+echo LINKLIBS=%links%                  >> sources\r
+echo TARGETLIBS=%links%                        >> sources\r
+echo SOURCES=%c%                       >> sources\r
+echo C_DEFINES=-DPROJECT_BUS=1         >> sources\r
+\r
+echo NAME %name%.sys                   > %name%.def\r
+\r
+build\r
+copy obj%obj%\%arch%\%name%.sys ..\..\bin >nul\r
+copy obj%obj%\%arch%\%name%.pdb ..\..\bin >nul\r
+copy obj%obj%\%arch%\%name%.lib ..\..\bin >nul
\ No newline at end of file
similarity index 100%
rename from src/bus/probe.c
rename to src/winvblock/probe.c
diff --git a/src/winvblock/ramdisk/makelib.bat b/src/winvblock/ramdisk/makelib.bat
new file mode 100644 (file)
index 0000000..eb61fac
--- /dev/null
@@ -0,0 +1,17 @@
+@echo off\r
+\r
+set libname=ramdisk\r
+\r
+set c=ramdisk.c memdisk.c grub4dos.c\r
+\r
+echo !INCLUDE $(NTMAKEENV)\makefile.def        > makefile\r
+\r
+echo INCLUDES=..\..\include            > sources\r
+echo TARGETNAME=%libname%              >> sources\r
+echo TARGETTYPE=DRIVER_LIBRARY         >> sources\r
+echo TARGETPATH=obj                    >> sources\r
+echo SOURCES=%c%                       >> sources\r
+echo C_DEFINES=-DPROJECT_BUS=1         >> sources\r
+\r
+build\r
+set links=%links% %libname%\\obj%obj%\\%arch%\\%libname%.lib
\ No newline at end of file
similarity index 100%
rename from src/bus/registry.c
rename to src/winvblock/registry.c