jmertic Wed, 28 Oct 2009 14:59:10 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=290033
Log:
Add HKLM/Software/PHP/Version registry key on install.
Changed paths:
_U php/win-installer/trunk/
U php/win-installer/trunk/GenPHPInstaller.wxs.php
U php/win-installer/trunk/PHPInstallerBase52.wxs
U php/win-installer/trunk/PHPInstallerBase52NTS.wxs
U php/win-installer/trunk/PHPInstallerBase53.wxs
U php/win-installer/trunk/PHPInstallerBase53NTS.wxs
U php/win-installer/trunk/PHPInstallerBase60.wxs
U php/win-installer/trunk/PHPInstallerBase60NTS.wxs
Property changes on: php/win-installer/trunk
___________________________________________________________________
Modified: svn:ignore
- *.wixobj
*.wixlib
*.msi
+ *.wixobj
*.wixlib
*.msi
Files
Modified: php/win-installer/trunk/GenPHPInstaller.wxs.php
===================================================================
--- php/win-installer/trunk/GenPHPInstaller.wxs.php 2009-10-28 14:53:28 UTC
(rev 290032)
+++ php/win-installer/trunk/GenPHPInstaller.wxs.php 2009-10-28 14:59:10 UTC
(rev 290033)
@@ -15,6 +15,15 @@
$PHPInstallerBaseWXS->getElementsByTagName('Product')->item(0)->setAttribute("Version","$version");
$PHPInstallerBaseWXS->getElementsByTagName('Product')->item(0)->setAttribute("Id",genGUID());
$PHPInstallerBaseWXS->getElementsByTagName('Package')->item(0)->setAttribute("Description","PHP
$version Installer");
+$tags = $PHPInstallerBaseWXS->getElementsByTagName('Registry');
+$i = 0;
+while ( $i < $tags->length ) {
+ if ( $tags->item($i)->getAttribute('Id') == 'PHPRegistryVersion' ) {
+ $tags->item($i)->setAttribute("Value","$version");
+ break;
+ }
+ $i++;
+}
// Add in the VC9 MSM if we are building that installer
if ( !empty($includemsm) ) {
Modified: php/win-installer/trunk/PHPInstallerBase52.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase52.wxs 2009-10-28 14:53:28 UTC
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase52.wxs 2009-10-28 14:59:10 UTC
(rev 290033)
@@ -211,6 +211,13 @@
Action='write'
Type='string'
Value='[INSTALLDIR]' />
+ <Registry Id='PHPRegistryVersion'
+ Root='HKLM'
+ Key='Software\PHP'
+ Name='Version'
+ Action='write'
+ Type='string'
+ Value='5.2.0' />
</Component>
<Component Id="phpEXE"
DiskId="1"
Modified: php/win-installer/trunk/PHPInstallerBase52NTS.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2009-10-28 14:53:28 UTC
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase52NTS.wxs 2009-10-28 14:59:10 UTC
(rev 290033)
@@ -189,6 +189,13 @@
Action='write'
Type='string'
Value='[INSTALLDIR]' />
+ <Registry Id='PHPRegistryVersion'
+ Root='HKLM'
+ Key='Software\PHP'
+ Name='Version'
+ Action='write'
+ Type='string'
+ Value='5.2.0' />
</Component>
<Component Id="phpEXE"
DiskId="1"
Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase53.wxs 2009-10-28 14:53:28 UTC
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase53.wxs 2009-10-28 14:59:10 UTC
(rev 290033)
@@ -211,6 +211,13 @@
Action='write'
Type='string'
Value='[INSTALLDIR]' />
+ <Registry Id='PHPRegistryVersion'
+ Root='HKLM'
+ Key='Software\PHP'
+ Name='Version'
+ Action='write'
+ Type='string'
+ Value='5.2.0' />
</Component>
<Component Id="phpEXE"
DiskId="1"
Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2009-10-28 14:53:28 UTC
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2009-10-28 14:59:10 UTC
(rev 290033)
@@ -189,6 +189,13 @@
Action='write'
Type='string'
Value='[INSTALLDIR]' />
+ <Registry Id='PHPRegistryVersion'
+ Root='HKLM'
+ Key='Software\PHP'
+ Name='Version'
+ Action='write'
+ Type='string'
+ Value='5.2.0' />
</Component>
<Component Id="phpEXE"
DiskId="1"
Modified: php/win-installer/trunk/PHPInstallerBase60.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase60.wxs 2009-10-28 14:53:28 UTC
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase60.wxs 2009-10-28 14:59:10 UTC
(rev 290033)
@@ -211,6 +211,13 @@
Action='write'
Type='string'
Value='[INSTALLDIR]' />
+ <Registry Id='PHPRegistryVersion'
+ Root='HKLM'
+ Key='Software\PHP'
+ Name='Version'
+ Action='write'
+ Type='string'
+ Value='5.2.0' />
</Component>
<Component Id="phpEXE"
DiskId="1"
Modified: php/win-installer/trunk/PHPInstallerBase60NTS.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2009-10-28 14:53:28 UTC
(rev 290032)
+++ php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2009-10-28 14:59:10 UTC
(rev 290033)
@@ -189,6 +189,13 @@
Action='write'
Type='string'
Value='[INSTALLDIR]' />
+ <Registry Id='PHPRegistryVersion'
+ Root='HKLM'
+ Key='Software\PHP'
+ Name='Version'
+ Action='write'
+ Type='string'
+ Value='5.2.0' />
</Component>
<Component Id="phpEXE"
DiskId="1"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
