jmertic Thu Sep 11 19:16:37 2008 UTC
Modified files:
/win-installer GenPHPInstaller.wxs.php build.bat
Log:
Enable installer for VC9 x64 PHP builds.
http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.6&r2=1.7&diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.6
win-installer/GenPHPInstaller.wxs.php:1.7
--- win-installer/GenPHPInstaller.wxs.php:1.6 Thu Sep 11 18:54:56 2008
+++ win-installer/GenPHPInstaller.wxs.php Thu Sep 11 19:16:37 2008
@@ -22,7 +22,7 @@
$Merge = $PHPInstallerBaseWXS->createElement('Merge');
$Merge = $TargetDir->appendChild($Merge);
$Merge->setAttribute('Id','VCRedist');
- $Merge->setAttribute('SourceFile','Microsoft_VC90_CRT_x86.msm');
+
$Merge->setAttribute('SourceFile',"Microsoft_VC90_CRT_{$includemsm}.msm");
$Merge->setAttribute('DiskId','1');
$Merge->setAttribute('Language','0');
http://cvs.php.net/viewvc.cgi/win-installer/build.bat?r1=1.12&r2=1.13&diff_format=u
Index: win-installer/build.bat
diff -u win-installer/build.bat:1.12 win-installer/build.bat:1.13
--- win-installer/build.bat:1.12 Thu Sep 11 18:54:56 2008
+++ win-installer/build.bat Thu Sep 11 19:16:37 2008
@@ -17,12 +17,16 @@
if %2==nts set suffix="NTS"
if %2==vc9 set extrabuildtype="vc9-"
if %2==vc9 set includevc9msm="x86"
+if %2==x64 set extrabuildtype="vc9-x64-"
+if %2==x64 set includevc9msm="x86_x64"
if (%3)==() goto build
if %3==nts set extrants="nts-"
if %3==nts set suffix="NTS"
if %3==vc9 set extrabuildtype="vc9-"
if %3==vc9 set includevc9msm="x86"
+if %3==x64 set extrabuildtype="vc9-x64-"
+if %3==x64 set includevc9msm="x86_x64"
:build
set msiname="php-%1-%extrants%win32-%extrabuildtype%installer.msi"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
