jmertic Mon, 21 Sep 2009 03:28:59 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288495
Log:
Re-add the option to include the pear installer with the PHP install.
Changed paths:
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
Modified: php/win-installer/trunk/PHPInstallerBase53.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase53.wxs 2009-09-21 03:20:31 UTC
(rev 288494)
+++ php/win-installer/trunk/PHPInstallerBase53.wxs 2009-09-21 03:28:59 UTC
(rev 288495)
@@ -131,6 +131,13 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="PFiles">
<Directory Id="INSTALLDIR" Name="PHP">
+ <Component Id="gopearBAT"
+ DiskId="1"
+ Guid="C8385835-A5DD-4A90-9A44-5F49DE05B0B7">
+ <File Id="file2"
+ Name="go-pear.bat"
+ Source="Files\go-pear.bat"/>
+ </Component>
<Component Id="installTXT"
DiskId="1"
Guid="D1055308-60DA-4C10-A29B-E582D0A3D675">
@@ -346,6 +353,17 @@
Source="Files\dev\php5ts.lib"/>
</Component>
</Directory>
+ <Directory Id="PEARdirectory"
+ Name="PEAR">
+ <Component Id="gopearPHAR"
+ DiskId="1"
+ Guid="F3B9AE05-9E15-4E06-8192-91C513C8209A">
+ <File Id="file181"
+ Name="GO-PEA_1.PHA"
+ LongName="go-pear.phar"
+ Source="Files\PEAR\go-pear.phar"/>
+ </Component>
+ </Directory>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder"
@@ -506,6 +524,14 @@
Level="10">
<ComponentRef Id="Empty"/>
<Feature AllowAdvertise="no"
+ Id="PEAR"
+ Title="$(loc.FeaturePEARTitle)"
+ Description="$(loc.FeaturePEARDescription)"
+ Level="1">
+ <ComponentRef Id="gopearPHAR"/>
+ <ComponentRef Id="gopearBAT"/>
+ </Feature>
+ <Feature AllowAdvertise="no"
Id="Manual"
Title="$(loc.FeatureManualTitle)"
Description="$(loc.FeatureManualDescription)"
Modified: php/win-installer/trunk/PHPInstallerBase53NTS.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2009-09-21 03:20:31 UTC
(rev 288494)
+++ php/win-installer/trunk/PHPInstallerBase53NTS.wxs 2009-09-21 03:28:59 UTC
(rev 288495)
@@ -109,6 +109,13 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="PFiles">
<Directory Id="INSTALLDIR" Name="PHP">
+ <Component Id="gopearBAT"
+ DiskId="1"
+ Guid="C8385835-A5DD-4A90-9A44-5F49DE05B0B7">
+ <File Id="file2"
+ Name="go-pear.bat"
+ Source="Files\go-pear.bat"/>
+ </Component>
<Component Id="installTXT"
DiskId="1"
Guid="D1055308-60DA-4C10-A29B-E582D0A3D675">
@@ -324,6 +331,17 @@
Source="Files\dev\php5.lib"/>
</Component>
</Directory>
+ <Directory Id="PEARdirectory"
+ Name="PEAR">
+ <Component Id="gopearPHAR"
+ DiskId="1"
+ Guid="F3B9AE05-9E15-4E06-8192-91C513C8209A">
+ <File Id="file181"
+ Name="GO-PEA_1.PHA"
+ LongName="go-pear.phar"
+ Source="Files\PEAR\go-pear.phar"/>
+ </Component>
+ </Directory>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder"
@@ -423,6 +441,14 @@
Level="10">
<ComponentRef Id="Empty"/>
<Feature AllowAdvertise="no"
+ Id="PEAR"
+ Title="$(loc.FeaturePEARTitle)"
+ Description="$(loc.FeaturePEARDescription)"
+ Level="1">
+ <ComponentRef Id="gopearPHAR"/>
+ <ComponentRef Id="gopearBAT"/>
+ </Feature>
+ <Feature AllowAdvertise="no"
Id="Manual"
Title="$(loc.FeatureManualTitle)"
Description="$(loc.FeatureManualDescription)"
Modified: php/win-installer/trunk/PHPInstallerBase60.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase60.wxs 2009-09-21 03:20:31 UTC
(rev 288494)
+++ php/win-installer/trunk/PHPInstallerBase60.wxs 2009-09-21 03:28:59 UTC
(rev 288495)
@@ -131,6 +131,13 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="PFiles">
<Directory Id="INSTALLDIR" Name="PHP">
+ <Component Id="gopearBAT"
+ DiskId="1"
+ Guid="C8385835-A5DD-4A90-9A44-5F49DE05B0B7">
+ <File Id="file2"
+ Name="go-pear.bat"
+ Source="Files\go-pear.bat"/>
+ </Component>
<Component Id="installTXT"
DiskId="1"
Guid="D1055308-60DA-4C10-A29B-E582D0A3D675">
@@ -346,6 +353,18 @@
Source="Files\dev\php6ts.lib"/>
</Component>
</Directory>
+
+ <Directory Id="PEARdirectory"
+ Name="PEAR">
+ <Component Id="gopearPHAR"
+ DiskId="1"
+ Guid="F3B9AE05-9E15-4E06-8192-91C513C8209A">
+ <File Id="file181"
+ Name="GO-PEA_1.PHA"
+ LongName="go-pear.phar"
+ Source="Files\PEAR\go-pear.phar"/>
+ </Component>
+ </Directory>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder"
@@ -506,6 +525,14 @@
Level="10">
<ComponentRef Id="Empty"/>
<Feature AllowAdvertise="no"
+ Id="PEAR"
+ Title="$(loc.FeaturePEARTitle)"
+ Description="$(loc.FeaturePEARDescription)"
+ Level="1">
+ <ComponentRef Id="gopearPHAR"/>
+ <ComponentRef Id="gopearBAT"/>
+ </Feature>
+ <Feature AllowAdvertise="no"
Id="Manual"
Title="$(loc.FeatureManualTitle)"
Description="$(loc.FeatureManualDescription)"
Modified: php/win-installer/trunk/PHPInstallerBase60NTS.wxs
===================================================================
--- php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2009-09-21 03:20:31 UTC
(rev 288494)
+++ php/win-installer/trunk/PHPInstallerBase60NTS.wxs 2009-09-21 03:28:59 UTC
(rev 288495)
@@ -109,6 +109,13 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder" Name="PFiles">
<Directory Id="INSTALLDIR" Name="PHP">
+ <Component Id="gopearBAT"
+ DiskId="1"
+ Guid="C8385835-A5DD-4A90-9A44-5F49DE05B0B7">
+ <File Id="file2"
+ Name="go-pear.bat"
+ Source="Files\go-pear.bat"/>
+ </Component>
<Component Id="installTXT"
DiskId="1"
Guid="D1055308-60DA-4C10-A29B-E582D0A3D675">
@@ -324,6 +331,17 @@
Source="Files\dev\php6.lib"/>
</Component>
</Directory>
+ <Directory Id="PEARdirectory"
+ Name="PEAR">
+ <Component Id="gopearPHAR"
+ DiskId="1"
+ Guid="F3B9AE05-9E15-4E06-8192-91C513C8209A">
+ <File Id="file181"
+ Name="GO-PEA_1.PHA"
+ LongName="go-pear.phar"
+ Source="Files\PEAR\go-pear.phar"/>
+ </Component>
+ </Directory>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder"
@@ -429,6 +447,14 @@
Level="10">
<ComponentRef Id="Empty"/>
<Feature AllowAdvertise="no"
+ Id="PEAR"
+ Title="$(loc.FeaturePEARTitle)"
+ Description="$(loc.FeaturePEARDescription)"
+ Level="1">
+ <ComponentRef Id="gopearPHAR"/>
+ <ComponentRef Id="gopearBAT"/>
+ </Feature>
+ <Feature AllowAdvertise="no"
Id="Manual"
Title="$(loc.FeatureManualTitle)"
Description="$(loc.FeatureManualDescription)"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
