cvs: win-installer / GenPHPInstaller.wxs.php
| From: | John Mertic | Date: | Wed, 03 Dec 2008 21:18:30 +0000 |
| Subject: | cvs: win-installer / GenPHPInstaller.wxs.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-54681@lists.php.net to get a copy of this message | ||
jmertic Wed Dec 3 21:18:30 2008 UTC
Modified files:
/win-installer GenPHPInstaller.wxs.php
Log:
Don't use the same id for the msm merge element and feature element.
http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.9&r2=1.10&diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.9 win-installer/GenPHPInstaller.wxs.php:1.10
--- win-installer/GenPHPInstaller.wxs.php:1.9 Mon Oct 20 15:01:28 2008
+++ win-installer/GenPHPInstaller.wxs.php Wed Dec 3 21:18:29 2008
@@ -29,11 +29,12 @@
$MainFeature = $PHPInstallerBaseWXS->getElementsByTagName('Feature')->item(0);
$Feature = $PHPInstallerBaseWXS->createElement('Feature');
$Feature = $MainFeature->appendChild($Feature);
- $Feature->setAttribute('Id','VCRedist');
+ $Feature->setAttribute('Id','VCRedistFeature');
$Feature->setAttribute('Title','Visual C++ 9.0 Runtime');
$Feature->setAttribute('AllowAdvertise','no');
$Feature->setAttribute('Display','hidden');
$Feature->setAttribute('Level','1');
+ $Feature->setAttribute('InstallDefault','source');
$MergeRef = $PHPInstallerBaseWXS->createElement('MergeRef');
$MergeRef = $Feature->appendChild($MergeRef);