update wdk distribution to use relative paths where possible

5 files changed, 16 insertions, 14 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