jmertic Thu Jun 25 15:59:13 2009 UTC
Modified files:
/win-installer GenPHPInstaller.wxs.php PHPInstallerBase52.wxs
PHPInstallerBase52NTS.wxs PHPInstallerBase53.wxs
PHPInstallerBase53NTS.wxs PHPInstallerBase60.wxs
PHPInstallerBase60NTS.wxs
Log:
Added including the readme-redist-bins.txt with the installer only if it
exists.
http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.13&r2=1.14&diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.13
win-installer/GenPHPInstaller.wxs.php:1.14
--- win-installer/GenPHPInstaller.wxs.php:1.13 Wed Apr 1 19:47:32 2009
+++ win-installer/GenPHPInstaller.wxs.php Thu Jun 25 15:59:13 2009
@@ -41,8 +41,6 @@
$MergeRef->setAttribute('Id','VCRedist_policy');
}
-$PHPInstallerBaseWXS->save("PHPInstaller$version.wxs");
-
// remove extension info from php.ini-production
if ( is_file("Files/php.ini-production") )
$infile = fopen("Files/php.ini-production",'r');
@@ -62,5 +60,31 @@
fclose($infile);
fclose($outfile);
+// check for presence of certain file; if not there then remove the feature
from the installer
+$files = array(
+ 'readme-redist-bins.txt' => 'readmedistbinsTXT',
+ );
+
+foreach ( $files as $filename => $component ) {
+ if ( !file_exists("Files/$filename") ) {
+ $Components = $PHPInstallerBaseWXS->getElementsByTagName('Component');
+ foreach ( $Components as $Component ) {
+ if ( $Component->getAttribute('Id') == $component ) {
+ $Component->parentNode->removeChild($Component);
+ break;
+ }
+ }
+ $ComponentRefs =
$PHPInstallerBaseWXS->getElementsByTagName('ComponentRef');
+ foreach ( $ComponentRefs as $ComponentRef ) {
+ if ( $ComponentRef->getAttribute('Id') == $component ) {
+ $ComponentRef->parentNode->removeChild($ComponentRef);
+ break;
+ }
+ }
+ }
+}
+
+$PHPInstallerBaseWXS->save("PHPInstaller$version.wxs");
+
exit;
?>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.44&r2=1.45&diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.44
win-installer/PHPInstallerBase52.wxs:1.45
--- win-installer/PHPInstallerBase52.wxs:1.44 Mon Jun 8 21:02:56 2009
+++ win-installer/PHPInstallerBase52.wxs Thu Jun 25 15:59:13 2009
@@ -164,6 +164,14 @@
Name="news.txt"
Source="Files\news.txt"/>
</Component>
+ <Component Id="readmedistbinsTXT"
+ DiskId="1"
+ Guid="23359910-5f6e-11de-8a39-0800200c9a66">
+ <File Id="filereadmedistbinsTXT"
+ Name="README_1.TXT"
+ LongName="readme-redist-bins.txt"
+ Source="Files\readme-redist-bins.txt"/>
+ </Component>
<Component Id="phpcgiEXE"
DiskId="1"
Guid="7ECF5817-CAB7-41EE-9E91-DDD2B1F5951B">
@@ -353,6 +361,7 @@
Level="1">
<ComponentRef Id="licenseTXT"/>
<ComponentRef Id="newsTXT"/>
+ <ComponentRef Id="readmedistbinsTXT"/>
<ComponentRef Id="installTXT"/>
<ComponentRef Id="phpGIF"/>
<ComponentRef Id="phprecommendedINI"/>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.20&r2=1.21&diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.20
win-installer/PHPInstallerBase52NTS.wxs:1.21
--- win-installer/PHPInstallerBase52NTS.wxs:1.20 Mon Jun 8 21:02:56 2009
+++ win-installer/PHPInstallerBase52NTS.wxs Thu Jun 25 15:59:13 2009
@@ -142,6 +142,14 @@
Name="news.txt"
Source="Files\news.txt"/>
</Component>
+ <Component Id="readmedistbinsTXT"
+ DiskId="1"
+ Guid="23359910-5f6e-11de-8a39-0800200c9a66">
+ <File Id="filereadmedistbinsTXT"
+ Name="README_1.TXT"
+ LongName="readme-redist-bins.txt"
+ Source="Files\readme-redist-bins.txt"/>
+ </Component>
<Component Id="phpcgiEXE"
DiskId="1"
Guid="7ECF5817-CAB7-41EE-9E91-DDD2B1F5951B">
@@ -331,6 +339,7 @@
Level="1">
<ComponentRef Id="licenseTXT"/>
<ComponentRef Id="newsTXT"/>
+ <ComponentRef Id="readmedistbinsTXT"/>
<ComponentRef Id="installTXT"/>
<ComponentRef Id="phpGIF"/>
<ComponentRef Id="phprecommendedINI"/>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.23&r2=1.24&diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.23
win-installer/PHPInstallerBase53.wxs:1.24
--- win-installer/PHPInstallerBase53.wxs:1.23 Mon Jun 8 21:02:56 2009
+++ win-installer/PHPInstallerBase53.wxs Thu Jun 25 15:59:13 2009
@@ -157,12 +157,13 @@
Name="news.txt"
Source="Files\news.txt"/>
</Component>
- <Component Id="phpcgiEXE"
+ <Component Id="readmedistbinsTXT"
DiskId="1"
- Guid="7ECF5817-CAB7-41EE-9E91-DDD2B1F5951B">
- <File Id="file12"
- Name="php-cgi.exe"
- Source="Files\php-cgi.exe"/>
+ Guid="23359910-5f6e-11de-8a39-0800200c9a66">
+ <File Id="filereadmedistbinsTXT"
+ Name="README_1.TXT"
+ LongName="readme-redist-bins.txt"
+ Source="Files\readme-redist-bins.txt"/>
</Component>
<Component Id="phpwinEXE"
DiskId="1"
@@ -332,6 +333,7 @@
Level="1">
<ComponentRef Id="licenseTXT"/>
<ComponentRef Id="newsTXT"/>
+ <ComponentRef Id="readmedistbinsTXT"/>
<ComponentRef Id="installTXT"/>
<ComponentRef Id="phpGIF"/>
<ComponentRef Id="phprecommendedINI"/>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.20&r2=1.21&diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.20
win-installer/PHPInstallerBase53NTS.wxs:1.21
--- win-installer/PHPInstallerBase53NTS.wxs:1.20 Mon Jun 8 21:02:56 2009
+++ win-installer/PHPInstallerBase53NTS.wxs Thu Jun 25 15:59:13 2009
@@ -135,6 +135,14 @@
Name="news.txt"
Source="Files\news.txt"/>
</Component>
+ <Component Id="readmedistbinsTXT"
+ DiskId="1"
+ Guid="23359910-5f6e-11de-8a39-0800200c9a66">
+ <File Id="filereadmedistbinsTXT"
+ Name="README_1.TXT"
+ LongName="readme-redist-bins.txt"
+ Source="Files\readme-redist-bins.txt"/>
+ </Component>
<Component Id="phpcgiEXE"
DiskId="1"
Guid="7ECF5817-CAB7-41EE-9E91-DDD2B1F5951B">
@@ -310,6 +318,7 @@
Level="1">
<ComponentRef Id="licenseTXT"/>
<ComponentRef Id="newsTXT"/>
+ <ComponentRef Id="readmedistbinsTXT"/>
<ComponentRef Id="installTXT"/>
<ComponentRef Id="phpGIF"/>
<ComponentRef Id="phprecommendedINI"/>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.36&r2=1.37&diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.36
win-installer/PHPInstallerBase60.wxs:1.37
--- win-installer/PHPInstallerBase60.wxs:1.36 Mon Jun 8 21:02:56 2009
+++ win-installer/PHPInstallerBase60.wxs Thu Jun 25 15:59:13 2009
@@ -157,6 +157,14 @@
Name="news.txt"
Source="Files\news.txt"/>
</Component>
+ <Component Id="readmedistbinsTXT"
+ DiskId="1"
+ Guid="23359910-5f6e-11de-8a39-0800200c9a66">
+ <File Id="filereadmedistbinsTXT"
+ Name="README_1.TXT"
+ LongName="readme-redist-bins.txt"
+ Source="Files\readme-redist-bins.txt"/>
+ </Component>
<Component Id="phpcgiEXE"
DiskId="1"
Guid="7ECF5817-CAB7-41EE-9E91-DDD2B1F5951B">
@@ -332,6 +340,7 @@
Level="1">
<ComponentRef Id="licenseTXT"/>
<ComponentRef Id="newsTXT"/>
+ <ComponentRef Id="readmedistbinsTXT"/>
<ComponentRef Id="installTXT"/>
<ComponentRef Id="phpGIF"/>
<ComponentRef Id="phprecommendedINI"/>
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.20&r2=1.21&diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.20
win-installer/PHPInstallerBase60NTS.wxs:1.21
--- win-installer/PHPInstallerBase60NTS.wxs:1.20 Mon Jun 8 21:02:56 2009
+++ win-installer/PHPInstallerBase60NTS.wxs Thu Jun 25 15:59:13 2009
@@ -135,6 +135,14 @@
Name="news.txt"
Source="Files\news.txt"/>
</Component>
+ <Component Id="readmedistbinsTXT"
+ DiskId="1"
+ Guid="23359910-5f6e-11de-8a39-0800200c9a66">
+ <File Id="filereadmedistbinsTXT"
+ Name="README_1.TXT"
+ LongName="readme-redist-bins.txt"
+ Source="Files\readme-redist-bins.txt"/>
+ </Component>
<Component Id="phpcgiEXE"
DiskId="1"
Guid="7ECF5817-CAB7-41EE-9E91-DDD2B1F5951B">
@@ -310,6 +318,7 @@
Level="1">
<ComponentRef Id="licenseTXT"/>
<ComponentRef Id="newsTXT"/>
+ <ComponentRef Id="readmedistbinsTXT"/>
<ComponentRef Id="installTXT"/>
<ComponentRef Id="phpGIF"/>
<ComponentRef Id="phprecommendedINI"/>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
