update wdk distribution to use relative paths where possible

11 files changed, 69 insertions, 57 deletions

diff --git a/ext/enchant-wdk/src/build-x64.bat b/ext/enchant-wdk/src/build-x64.bat
index 455418c0..332af68f 100644
--- a/ext/enchant-wdk/src/build-x64.bat
+++ b/ext/enchant-wdk/src/build-x64.bat
@@ -1,10 +1,11 @@
 @echo off
-set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70
-set LIB=c:\WinDDK\7600.16385.1\lib\wnet\amd64;c:\WinDDK\7600.16385.1\lib\Crt\amd64
+set WDK_ROOT=c:\WinDDK\7600.16385.1
+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70
+set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64
 set OPATH=%PATH%
-set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64
+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64
 nmake -f makefile.mak clean
-nmake -f makefile.mak X64=1 DLL=1 MFLAGS=-MD GLIBDIR=c:\mozilla-build\build\xchat-dev64\include\glib-2.0
+nmake -f makefile.mak X64=1 DLL=1 MFLAGS=-MD GLIBDIR=..\glib-x64\include\glib-2.0
 echo.Press return when ready to install!
 pause
 set PATH=%OPATH%
diff --git a/ext/enchant-wdk/src/build-x86.bat b/ext/enchant-wdk/src/build-x86.bat
index 2121550d..f5cc71b9 100644
--- a/ext/enchant-wdk/src/build-x86.bat
+++ b/ext/enchant-wdk/src/build-x86.bat
@@ -1,10 +1,11 @@
 @echo off
-set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70
-set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
+set WDK_ROOT=c:\WinDDK\7600.16385.1
+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\api\crt\stl70
+set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386
 set OPATH=%PATH%
-set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE
+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE
 nmake -f makefile.mak clean
-nmake -f makefile.mak DLL=1 MFLAGS=-MD GLIBDIR=c:\mozilla-build\build\xchat-dev32\include\glib-2.0
+nmake -f makefile.mak DLL=1 MFLAGS=-MD GLIBDIR=..\glib-x86\include\glib-2.0
 echo.Press return when ready to install!
 pause
 set PATH=%OPATH%
diff --git a/ext/enchant-wdk/src/libenchant.rc b/ext/enchant-wdk/src/libenchant.rc
index 8f9b98ec..f8f52651 100644
--- a/ext/enchant-wdk/src/libenchant.rc
+++ b/ext/enchant-wdk/src/libenchant.rc
@@ -1,7 +1,7 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION 1,6,0,1
+  FILEVERSION 1,6,0,2
   PRODUCTVERSION 1,6,0,0
   FILEFLAGSMASK 0
   FILEFLAGS 0
@@ -15,7 +15,7 @@ VS_VERSION_INFO VERSIONINFO
       BEGIN
 	VALUE "CompanyName", "none"
 	VALUE "FileDescription", "libenchant"
-	VALUE "FileVersion", "1.6.0.1"
+	VALUE "FileVersion", "1.6.0.2"
 	VALUE "InternalName", "libenchant"
 	VALUE "OriginalFilename", "libenchant.dll"
 	VALUE "ProductName", "libenchant"
diff --git a/ext/enchant-wdk/src/release-x64.bat b/ext/enchant-wdk/src/release-x64.bat
index 531b790d..0a40fc71 100644
--- a/ext/enchant-wdk/src/release-x64.bat
+++ b/ext/enchant-wdk/src/release-x64.bat
@@ -1,9 +1,9 @@
 @echo off
-set ENCHANT_DEST=c:\mozilla-build\build\enchant-wdk-1.6.0-x64
+set ENCHANT_DEST=..\..\enchant-wdk-1.6.0-x64
 set RELEASE_DIR=..\bin\release
 rmdir /q /s %ENCHANT_DEST%
 mkdir %ENCHANT_DEST%
-copy ..\COPYING.LIB %ENCHANT_DEST%\COPYING
+copy ..\COPYING.LIB %ENCHANT_DEST%\LICENSE.ENCHANT
 xcopy /q /s /i %RELEASE_DIR%\enchant.exe %ENCHANT_DEST%\bin\
 copy %RELEASE_DIR%\enchant-lsmod.exe %ENCHANT_DEST%\bin
 copy %RELEASE_DIR%\libenchant.dll %ENCHANT_DEST%\bin
diff --git a/ext/enchant-wdk/src/release-x86.bat b/ext/enchant-wdk/src/release-x86.bat
index ee01c999..a33bec76 100644
--- a/ext/enchant-wdk/src/release-x86.bat
+++ b/ext/enchant-wdk/src/release-x86.bat
@@ -1,9 +1,9 @@
 @echo off
-set ENCHANT_DEST=c:\mozilla-build\build\enchant-wdk-1.6.0-x86
+set ENCHANT_DEST=..\..\enchant-wdk-1.6.0-x86
 set RELEASE_DIR=..\bin\release
 rmdir /q /s %ENCHANT_DEST%
 mkdir %ENCHANT_DEST%
-copy ..\COPYING.LIB %ENCHANT_DEST%\COPYING
+copy ..\COPYING.LIB %ENCHANT_DEST%\LICENSE.ENCHANT
 xcopy /q /s /i %RELEASE_DIR%\enchant.exe %ENCHANT_DEST%\bin\
 copy %RELEASE_DIR%\enchant-lsmod.exe %ENCHANT_DEST%\bin
 copy %RELEASE_DIR%\libenchant.dll %ENCHANT_DEST%\bin
diff --git a/ext/lua-wdk/build-x64.bat b/ext/lua-wdk/build-x64.bat
index 4322d3fb..a160cd97 100644
--- a/ext/lua-wdk/build-x64.bat
+++ b/ext/lua-wdk/build-x64.bat
@@ -1,8 +1,9 @@
 @echo off

+set WDK_ROOT=c:\WinDDK\7600.16385.1

 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:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64

+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk

+set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64

+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64

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

 call etc\luavs-x64.bat

 @echo off

@@ -14,19 +15,19 @@ mkdir %DEST%
 mkdir %DEST%\bin

 mkdir %DEST%\lib

 mkdir %DEST%\include

-xcopy COPYRIGHT %DEST%

+copy COPYRIGHT %DEST%\LICENSE.LUA

 :: 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

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

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

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

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

 :: library

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

+copy 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

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

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

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

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

+copy 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 dfa47b57..75a054ed 100644
--- a/ext/lua-wdk/build-x86.bat
+++ b/ext/lua-wdk/build-x86.bat
@@ -1,8 +1,9 @@
 @echo off

+set WDK_ROOT=c:\WinDDK\7600.16385.1

 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:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE

+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk

+set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386

+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE

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

 call etc\luavs.bat

 @echo off

@@ -14,19 +15,19 @@ mkdir %DEST%
 mkdir %DEST%\bin

 mkdir %DEST%\lib

 mkdir %DEST%\include

-xcopy COPYRIGHT %DEST%

+copy COPYRIGHT %DEST%\LICENSE.LUA

 :: 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

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

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

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

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

 :: library

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

+copy 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

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

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

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

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

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

 echo.Finished!

 pause

diff --git a/ext/nss-wdk/build-x64.bat b/ext/nss-wdk/build-x64.bat
index d8a9e3fd..96bb0422 100644
--- a/ext/nss-wdk/build-x64.bat
+++ b/ext/nss-wdk/build-x64.bat
@@ -1,7 +1,8 @@
 @echo off
-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:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools-x64\bin
+set WDK_ROOT=c:\WinDDK\7600.16385.1
+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk
+set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64
+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools-x64\bin
 set BUILD_OPT=1
 set USE_64=1
 set WINDDK_BUILD=1
diff --git a/ext/nss-wdk/build-x86.bat b/ext/nss-wdk/build-x86.bat
index 880f7586..c6d4868e 100644
--- a/ext/nss-wdk/build-x86.bat
+++ b/ext/nss-wdk/build-x86.bat
@@ -1,7 +1,8 @@
 @echo off
-set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt
-set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386
-set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools\bin
+set WDK_ROOT=c:\WinDDK\7600.16385.1
+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt
+set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386
+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\msys\bin;c:\mozilla-build\moztools\bin
 set BUILD_OPT=1
 set USE_64=
 set WINDDK_BUILD=1
diff --git a/ext/openssl-wdk/build-x64.bat b/ext/openssl-wdk/build-x64.bat
index e5657645..4c6b1e7b 100644
--- a/ext/openssl-wdk/build-x64.bat
+++ b/ext/openssl-wdk/build-x64.bat
@@ -1,9 +1,12 @@
 @echo off

+set WDK_ROOT=c:\WinDDK\7600.16385.1

+set PERL_PATH=c:\mozilla-build\perl-5.12-x64\bin

+set NASM_PATH=c:\mozilla-build\nasm

 set OPENSSL_DEST=..\openssl-wdk-1.0.0a-x64

-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:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\x64;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=./

+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk;ms;zlib-x64\include

+set LIB=%WDK_ROOT%\lib\wnet\amd64;%WDK_ROOT%\lib\Crt\amd64;zlib-x64\lib

+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%PERL_PATH%;%NASM_PATH%;%SystemRoot%\System32;..\zlib-x64\bin

+perl Configure VC-WIN64A enable-camellia zlib-dynamic --openssldir=./

 call ms\do_win64a

 nmake -f ms\ntdll.mak vclean

 nmake -f ms\ntdll.mak

@@ -21,7 +24,7 @@ move lib %OPENSSL_DEST%
 mkdir %OPENSSL_DEST%\share

 move openssl.cnf %OPENSSL_DEST%\share\openssl.cnf.example

 move include-orig include

-copy c:\mozilla-build\build\zlib-x64\bin\zlib1.dll %OPENSSL_DEST%\bin

+copy zlib-x64\bin\zlib1.dll %OPENSSL_DEST%\bin

 move cert.pem %OPENSSL_DEST%\bin

 echo.Finished!

 pause

diff --git a/ext/openssl-wdk/build-x86.bat b/ext/openssl-wdk/build-x86.bat
index 20c3ca7d..72155e8a 100644
--- a/ext/openssl-wdk/build-x86.bat
+++ b/ext/openssl-wdk/build-x86.bat
@@ -1,8 +1,11 @@
 @echo off

+set WDK_ROOT=c:\WinDDK\7600.16385.1

+set PERL_PATH=c:\mozilla-build\perl-5.12-x86\bin

+set NASM_PATH=c:\mozilla-build\nasm

 set OPENSSL_DEST=..\openssl-wdk-1.0.0a-x86

-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:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\mozilla-build\perl-5.12-x86\bin;c:\Windows\System32;c:\mozilla-build\nasm;c:\mozilla-build\build\zlib-x86\bin

+set INCLUDE=%WDK_ROOT%\inc\api;%WDK_ROOT%\inc\crt;%WDK_ROOT%\inc\ddk;ms;zlib-x86\include

+set LIB=%WDK_ROOT%\lib\wxp\i386;%WDK_ROOT%\lib\Crt\i386;zlib-x86\lib

+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin;%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\Common7\IDE;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin;%PERL_PATH%;%NASM_PATH%;%SystemRoot%\System32;..\zlib-x86\bin

 perl Configure VC-WIN32 enable-camellia zlib-dynamic --openssldir=./

 call ms\do_nasm

 @echo off

@@ -22,7 +25,7 @@ move lib %OPENSSL_DEST%
 mkdir %OPENSSL_DEST%\share

 move openssl.cnf %OPENSSL_DEST%\share\openssl.cnf.example

 move include-orig include

-copy c:\mozilla-build\build\zlib-x86\bin\zlib1.dll %OPENSSL_DEST%\bin

+copy zlib-x86\bin\zlib1.dll %OPENSSL_DEST%\bin

 move cert.pem %OPENSSL_DEST%\bin

 echo.Finished!

 pause