some heavy restructuring and reformatting

4 files changed, 40 insertions, 10 deletions

diff --git a/ext/lua-wdk/build-x64.bat b/ext/lua-wdk/build-x64.bat
index 32c8b7b7..b0feed5a 100644
--- a/ext/lua-wdk/build-x64.bat
+++ b/ext/lua-wdk/build-x64.bat
@@ -3,15 +3,30 @@ set OPATH=%PATH%
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk

 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64

 set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin

-set DEST=..\lua-5.1.4-2-wdk-x64

+set DEST=..\lua-wdk-5.1.4-2-x64

 call etc\luavs-x64.bat

 @echo off

 echo.Press return when ready to install!

 pause

 set PATH=%OPATH%

 rmdir /Q /S %DEST%

-xcopy /S /I src %DEST%

+mkdir %DEST%

+mkdir %DEST%\bin

+mkdir %DEST%\lib

+mkdir %DEST%\include

 xcopy COPYRIGHT %DEST%

-del %DEST%\Makefile

+:: binaries and libraries

+xcopy src\lua.exe %DEST%\bin

+xcopy src\lua51.dll %DEST%\bin

+xcopy src\lua51.exp %DEST%\bin

+xcopy src\luac.exe %DEST%\bin

+:: library

+xcopy src\lua51.lib %DEST%\lib

+:: api

+xcopy src\lua.h %DEST%\include

+xcopy src\luaconf.h %DEST%\include

+xcopy src\lualib.h %DEST%\include

+xcopy src\lauxlib.h %DEST%\include

+xcopy etc\lua.hpp %DEST%\include

 echo.Finished!

 pause

diff --git a/ext/lua-wdk/build-x86.bat b/ext/lua-wdk/build-x86.bat
index a5cebfd9..e912a472 100644
--- a/ext/lua-wdk/build-x86.bat
+++ b/ext/lua-wdk/build-x86.bat
@@ -3,15 +3,30 @@ set OPATH=%PATH%
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk

 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386

 set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin

-set DEST=..\lua-5.1.4-2-wdk-x86

+set DEST=..\lua-wdk-5.1.4-2-x86

 call etc\luavs.bat

 @echo off

 echo.Press return when ready to install!

 pause

 set PATH=%OPATH%

 rmdir /Q /S %DEST%

-xcopy /S /I src %DEST%

+mkdir %DEST%

+mkdir %DEST%\bin

+mkdir %DEST%\lib

+mkdir %DEST%\include

 xcopy COPYRIGHT %DEST%

-del %DEST%\Makefile

+:: binaries and libraries

+xcopy src\lua.exe %DEST%\bin

+xcopy src\lua51.dll %DEST%\bin

+xcopy src\lua51.exp %DEST%\bin

+xcopy src\luac.exe %DEST%\bin

+:: library

+xcopy src\lua51.lib %DEST%\lib

+:: api

+xcopy src\lua.h %DEST%\include

+xcopy src\luaconf.h %DEST%\include

+xcopy src\lualib.h %DEST%\include

+xcopy src\lauxlib.h %DEST%\include

+xcopy etc\lua.hpp %DEST%\include

 echo.Finished!

 pause

diff --git a/ext/openssl-wdk/build-x64.bat b/ext/openssl-wdk/build-x64.bat
index 27ebbbff..cc57f8d0 100644
--- a/ext/openssl-wdk/build-x64.bat
+++ b/ext/openssl-wdk/build-x64.bat
@@ -2,7 +2,7 @@
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk;c:\mozilla-build\build\openssl-1.0.0a\ms;c:\mozilla-build\build\zlib-x64\include

 set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64;c:\mozilla-build\build\zlib-x64\lib

 set PATH=c:\WinDDK\7600.16385.1\bin\x86\amd64;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\perl-5.12-x64\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x64\bin\

-perl Configure VC-WIN64A enable-camellia no-asm zlib-dynamic --openssldir=c:/mozilla-build/build/openssl-1.0.0a-wdk-x64

+perl Configure VC-WIN64A enable-camellia no-asm zlib-dynamic --openssldir=c:/mozilla-build/build/openssl-wdk-1.0.0a-x64

 call ms\do_win64a

 nmake -f ms\ntdll.mak vclean

 nmake -f ms\ntdll.mak

@@ -10,5 +10,5 @@ nmake -f ms\ntdll.mak test
 echo.Press return when ready to install!

 pause

 nmake -f ms\ntdll.mak install

-perl util\copy.pl c:/mozilla-build/build/zlib-x64/bin/zlib1.dll c:/mozilla-build/build/openssl-1.0.0a-wdk-x64/bin

+perl util\copy.pl c:/mozilla-build/build/zlib-x64/bin/zlib1.dll c:/mozilla-build/build/openssl-wdk-1.0.0a-x64/bin

 echo.Finished!

diff --git a/ext/openssl-wdk/build-x86.bat b/ext/openssl-wdk/build-x86.bat
index a5894b39..77a31dfc 100644
--- a/ext/openssl-wdk/build-x86.bat
+++ b/ext/openssl-wdk/build-x86.bat
@@ -2,7 +2,7 @@
 set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\ddk;c:\mozilla-build\build\openssl-1.0.0a\ms;c:\mozilla-build\build\zlib-x86\include

 set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386;c:\mozilla-build\build\zlib-x86\lib

 set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files\Microsoft SDKs\Windows\v6.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin;c:\mozilla-build\perl-5.12-x86\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x86\bin

-perl Configure VC-WIN32 enable-camellia zlib-dynamic --openssldir=c:/mozilla-build/build/openssl-1.0.0a-wdk-x86

+perl Configure VC-WIN32 enable-camellia zlib-dynamic --openssldir=c:/mozilla-build/build/openssl-wdk-1.0.0a-x86

 call ms\do_nasm

 @echo off

 nmake -f ms\ntdll.mak vclean

@@ -11,5 +11,5 @@ nmake -f ms\ntdll.mak test
 echo.Press return when ready to install!

 pause

 nmake -f ms\ntdll.mak install

-perl util\copy.pl c:/mozilla-build/build/zlib-x86/bin/zlib1.dll c:/mozilla-build/build/openssl-1.0.0a-wdk-x86/bin

+perl util\copy.pl c:/mozilla-build/build/zlib-x86/bin/zlib1.dll c:/mozilla-build/build/openssl-wdk-1.0.0a-x86/bin

 echo.Finished!