[build] Move PXE NBP sources into nbp subdir
authorShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Fri, 30 Apr 2010 20:15:48 +0000 (16:15 -0400)
committerShao Miller <Shao.Miller@yrdsb.edu.on.ca>
Fri, 30 Apr 2010 21:05:09 +0000 (17:05 -0400)
It's time to re-organize the project's directory structure.

25 files changed:
Makefile
ReadMe.txt
makedist.bat
src/nbp/pxe.asm/Makefile [moved from src/pxe.asm/Makefile with 100% similarity]
src/nbp/pxe.asm/aoe.S [moved from src/pxe.asm/aoe.S with 100% similarity]
src/nbp/pxe.asm/aoe.h [moved from src/pxe.asm/aoe.h with 100% similarity]
src/nbp/pxe.asm/aoe.ld [moved from src/pxe.asm/aoe.ld with 100% similarity]
src/nbp/pxe.asm/debug.S [moved from src/pxe.asm/debug.S with 100% similarity]
src/nbp/pxe.asm/global.S [moved from src/pxe.asm/global.S with 100% similarity]
src/nbp/pxe.asm/int13.S [moved from src/pxe.asm/int13.S with 100% similarity]
src/nbp/pxe.asm/lib.S [moved from src/pxe.asm/lib.S with 100% similarity]
src/nbp/pxe.asm/pxe.S [moved from src/pxe.asm/pxe.S with 100% similarity]
src/nbp/pxe.c/Makefile [moved from src/pxe.c/Makefile with 100% similarity]
src/nbp/pxe.c/aoe.ld [moved from src/pxe.c/aoe.ld with 100% similarity]
src/nbp/pxe.c/asm.S [moved from src/pxe.c/asm.S with 100% similarity]
src/nbp/pxe.c/asm.h [moved from src/pxe.c/asm.h with 100% similarity]
src/nbp/pxe.c/debug.S [moved from src/pxe.c/debug.S with 100% similarity]
src/nbp/pxe.c/lib.c [moved from src/pxe.c/lib.c with 100% similarity]
src/nbp/pxe.c/lib.h [moved from src/pxe.c/lib.h with 100% similarity]
src/nbp/pxe.c/libasm.S [moved from src/pxe.c/libasm.S with 100% similarity]
src/nbp/pxe.c/main.c [moved from src/pxe.c/main.c with 100% similarity]
src/nbp/pxe.c/main.h [moved from src/pxe.c/main.h with 100% similarity]
src/nbp/pxe.c/printf.c [moved from src/pxe.c/printf.c with 100% similarity]
src/nbp/pxe.c/pxe.c [moved from src/pxe.c/pxe.c with 100% similarity]
src/nbp/pxe.c/pxe.h [moved from src/pxe.c/pxe.h with 100% similarity]

index e356b62..642736c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ PXESTYLE := asm
 all: bin/aoe.0 bin/loader32.exe bin/wvblk32.sys bin/aoe.exe bin/winvblk.inf bin/txtsetup.oem
 
 clean:
-       @rm -rf src/obj src/pxe.asm/obj src/pxe.c/obj bin
+       @rm -rf src/obj src/nbp/pxe.asm/obj src/nbp/pxe.c/obj bin
 
 dist:
        @sh -c "unset \`set | cut -f 1 -d \"=\" | egrep -v \"PATH|COMSPEC\"\` 2> /dev/null ; cmd /c makedist.bat"
@@ -25,13 +25,13 @@ checked: bin/winvblk.inf bin/txtsetup.oem $(addprefix src/,$c $h) Makefile
        @sh -c "unset \`set | cut -f 1 -d \"=\" | egrep -v \"PATH|COMSPEC\"\` 2> /dev/null ; cmd /c makechecked.bat"
        @touch -r Makefile $(wildcard bin/*.sys)
 
-bin/aoe.0: src/pxe.$(PXESTYLE)/aoe.0 Makefile
+bin/aoe.0: src/nbp/pxe.$(PXESTYLE)/aoe.0 Makefile
        @mkdir -p bin
-       cp src/pxe.$(PXESTYLE)/aoe.0 bin
+       cp src/nbp/pxe.$(PXESTYLE)/aoe.0 bin
 
-src/pxe.$(PXESTYLE)/aoe.0: $(wildcard src/pxe.$(PXESTYLE)/*.c) $(wildcard src/pxe.$(PXESTYLE)/*.h) $(wildcard src/pxe.$(PXESTYLE)/*.S) src/pxe.$(PXESTYLE)/aoe.ld src/pxe.$(PXESTYLE)/Makefile Makefile
-       rm -rf src/pxe.$(PXESTYLE)/aoe.0
-       make -C src/pxe.$(PXESTYLE)
+src/nbp/pxe.$(PXESTYLE)/aoe.0: $(wildcard src/nbp/pxe.$(PXESTYLE)/*.c) $(wildcard src/nbp/pxe.$(PXESTYLE)/*.h) $(wildcard src/nbp/pxe.$(PXESTYLE)/*.S) src/nbp/pxe.$(PXESTYLE)/aoe.ld src/nbp/pxe.$(PXESTYLE)/Makefile Makefile
+       rm -rf src/nbp/pxe.$(PXESTYLE)/aoe.0
+       make -C src/nbp/pxe.$(PXESTYLE)
 
 bin/winvblk.inf bin/txtsetup.oem: makeinf.bat Makefile
        @sh -c "unset \`set | cut -f 1 -d \"=\" | egrep -v \"PATH|COMSPEC\"\` 2> /dev/null ; cmd /c makeinf.bat ; exit 0" >/dev/null 2>&1
index c5d64b5..292f2a7 100644 (file)
@@ -122,7 +122,7 @@ Compiling:
 To compile this you need either MSYS or the windows 2003 DDK, preferably both.\r
 Set the path to the DDK in config.bat and run the bat files makefree or makechecked to build everything but aoe.0.\r
 aoe.0 will not be deleted and is prebuild in the package, so you can get away with only using the DDK.\r
-To build aoe.0 you need MSYS or a Linux box (type make in the pxe.asm or pxe.c dir in Linux to compile it).\r
+To build aoe.0 you need MSYS or a Linux box (type make in the src/nbp/pxe.asm or src/nbp/pxe.c dir in Linux to compile it).\r
 MSYS can also build the driver itself, but only the 32bit version, and it will not generate windbg symbol files.\r
 Also, the MSYS generated driver has a higher chance of failing, due to compiler bugs.\r
 When compiling the driver with makefree/makechecked or in MSYS with make, a loader32/64.exe will also be build to quickly install the driver without going through the control panel.\r
index de606ed..8f5b894 100644 (file)
@@ -2,8 +2,8 @@
 call config.bat\r
 rd /s /q bin 2>nul\r
 rd /s /q src\obj 2>nul\r
-rd /s /q src\pxe.asm\obj 2>nul\r
-rd /s /q src\pxe.c\obj 2>nul\r
+rd /s /q src\nbp\pxe.asm\obj 2>nul\r
+rd /s /q src\nbp\pxe.c\obj 2>nul\r
 mkdir bin 2>nul\r
 cmd /c makeutils\r
 cmd /c makeinf\r
@@ -13,4 +13,4 @@ del bin\loader32.exe
 del bin\loader64.exe\r
 del bin\wvblk32.pdb\r
 del bin\wvblk64.pdb\r
-copy src\pxe.%pxestyle%\aoe.0 bin\r
+copy src\nbp\pxe.%pxestyle%\aoe.0 bin\r
similarity index 100%
rename from src/pxe.asm/aoe.S
rename to src/nbp/pxe.asm/aoe.S
similarity index 100%
rename from src/pxe.asm/aoe.h
rename to src/nbp/pxe.asm/aoe.h
similarity index 100%
rename from src/pxe.asm/aoe.ld
rename to src/nbp/pxe.asm/aoe.ld
similarity index 100%
rename from src/pxe.asm/debug.S
rename to src/nbp/pxe.asm/debug.S
similarity index 100%
rename from src/pxe.asm/int13.S
rename to src/nbp/pxe.asm/int13.S
similarity index 100%
rename from src/pxe.asm/lib.S
rename to src/nbp/pxe.asm/lib.S
similarity index 100%
rename from src/pxe.asm/pxe.S
rename to src/nbp/pxe.asm/pxe.S
similarity index 100%
rename from src/pxe.c/Makefile
rename to src/nbp/pxe.c/Makefile
similarity index 100%
rename from src/pxe.c/aoe.ld
rename to src/nbp/pxe.c/aoe.ld
similarity index 100%
rename from src/pxe.c/asm.S
rename to src/nbp/pxe.c/asm.S
similarity index 100%
rename from src/pxe.c/asm.h
rename to src/nbp/pxe.c/asm.h
similarity index 100%
rename from src/pxe.c/debug.S
rename to src/nbp/pxe.c/debug.S
similarity index 100%
rename from src/pxe.c/lib.c
rename to src/nbp/pxe.c/lib.c
similarity index 100%
rename from src/pxe.c/lib.h
rename to src/nbp/pxe.c/lib.h
similarity index 100%
rename from src/pxe.c/libasm.S
rename to src/nbp/pxe.c/libasm.S
similarity index 100%
rename from src/pxe.c/main.c
rename to src/nbp/pxe.c/main.c
similarity index 100%
rename from src/pxe.c/main.h
rename to src/nbp/pxe.c/main.h
similarity index 100%
rename from src/pxe.c/printf.c
rename to src/nbp/pxe.c/printf.c
similarity index 100%
rename from src/pxe.c/pxe.c
rename to src/nbp/pxe.c/pxe.c
similarity index 100%
rename from src/pxe.c/pxe.h
rename to src/nbp/pxe.c/pxe.h