summary refs log tree commit diff stats
path: root/build
diff options
context:
space:
mode:
authorBerke Viktor <berkeviktor@aol.com>2011-12-03 21:44:36 +0100
committerBerke Viktor <berkeviktor@aol.com>2011-12-03 21:44:36 +0100
commit86c43f53a5b9abe8aec611c2a5d576c7c3017598 (patch)
treee8f12f79bd8abb4f9b7f24d5050193962ec04bc3 /build
parent6fc70632316076a477fcc438812e52fa21d67b15 (diff)
use strawberry perl for 5.14 too and use gendef for def generation
Diffstat (limited to 'build')
-rw-r--r--build/build-x64.bat4
-rw-r--r--build/build-x86.bat4
-rw-r--r--build/strawberry-importlib.bat19
3 files changed, 4 insertions, 23 deletions
diff --git a/build/build-x64.bat b/build/build-x64.bat
index a35069d6..b7a12351 100644
--- a/build/build-x64.bat
+++ b/build/build-x64.bat
@@ -4,9 +4,9 @@ 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;%WDK_ROOT%\lib\Mfc\amd64;%WDK_ROOT%\lib\ATL\amd64
 set OPATH=%PATH%
 set DEV_64=%cd%\..\dep-x64
-set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin
+set PATH=%PROGRAMFILES(X86)%\Microsoft Visual Studio 10.0\VC\bin\amd64;%PROGRAMFILES(X86)%\Microsoft SDKs\Windows\v7.0A\Bin\x64;%DEV_64%\bin;c:\mozilla-build\gendef
 set PERL_512=c:\mozilla-build\perl-5.12-x64\perl
-set PERL_514=c:\mozilla-build\perl-5.14-x64
+set PERL_514=c:\mozilla-build\perl-5.14-x64\perl
 echo [Setup] > xchat-wdk-x64.iss
 echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk-x64.iss
 echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk-x64.iss
diff --git a/build/build-x86.bat b/build/build-x86.bat
index 08f1413a..2e31a69b 100644
--- a/build/build-x86.bat
+++ b/build/build-x86.bat
@@ -4,9 +4,9 @@ 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;%WDK_ROOT%\lib\Mfc\i386;%WDK_ROOT%\lib\ATL\i386
 set OPATH=%PATH%
 set DEV_32=%cd%\..\dep-x86
-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;%DEV_32%\bin
+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;%DEV_32%\bin;c:\mozilla-build\gendef
 set PERL_512=c:\mozilla-build\perl-5.12-x86\perl
-set PERL_514=c:\mozilla-build\perl-5.14-x86
+set PERL_514=c:\mozilla-build\perl-5.14-x86\perl
 echo [Setup] > xchat-wdk-x86.iss
 echo WizardImageFile=%cd%\bitmaps\wizardimage.bmp >> xchat-wdk-x86.iss
 echo WizardSmallImageFile=%cd%\bitmaps\wizardsmallimage.bmp >> xchat-wdk-x86.iss
diff --git a/build/strawberry-importlib.bat b/build/strawberry-importlib.bat
deleted file mode 100644
index 61da96b3..00000000
--- a/build/strawberry-importlib.bat
+++ /dev/null
@@ -1,19 +0,0 @@
-@echo off
-set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE
-cd c:\mozilla-build\perl-5.12-x86\perl\lib\CORE
-echo.Overwrite existing def file?
-pause
-dumpbin /exports ..\..\bin\perl512.dll > perl512.def
-echo.Please adjust the resulting file manually, then hit return!
-pause
-lib /machine:x86 /def:perl512.def
-pause
-set PATH=c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64
-cd c:\mozilla-build\perl-5.12-x64\perl\lib\CORE
-echo.Overwrite existing def file?
-pause
-dumpbin /exports ..\..\bin\perl512.dll > perl512.def
-echo.Please adjust the resulting file manually, then hit return!
-pause
-lib /machine:x64 /def:perl512.def
-pause