jmertic         Wed May 27 13:12:02 2009 UTC

  Modified files:              
    /win-installer      PHPInstallerBase52.wxs PHPInstallerBase52NTS.wxs 
                        PHPInstallerBase53.wxs PHPInstallerBase53NTS.wxs 
                        PHPInstallerBase60.wxs PHPInstallerBase60NTS.wxs 
  Log:
  Install the PHP CLI exe always, removing the ability for a user to not select 
it.
  
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52.wxs?r1=1.41&r2=1.42&diff_format=u
Index: win-installer/PHPInstallerBase52.wxs
diff -u win-installer/PHPInstallerBase52.wxs:1.41 
win-installer/PHPInstallerBase52.wxs:1.42
--- win-installer/PHPInstallerBase52.wxs:1.41   Fri Feb 20 15:48:15 2009
+++ win-installer/PHPInstallerBase52.wxs        Wed May 27 13:12:01 2009
@@ -358,23 +358,10 @@
       <ComponentRef Id="phprecommendedINI"/>
       <ComponentRef Id="win2003eventlog"/>
       <ComponentRef Id="PHPRegistry"/>
-    
-      <Feature AllowAdvertise="no" 
-        Id="MainProgram" 
-        Title="$(loc.FeatureMainProgramTitle)" 
-        Description="$(loc.FeatureMainProgramDescription)" 
-        TypicalDefault="install" 
-        Level="1">
-        <ComponentRef Id="php5tsDLL"/>
-        <ComponentRef Id="php5tsLIB"/>
-        <ComponentRef Id="php5embedLIB"/>
-        <Feature AllowAdvertise="no" 
-          Id="MainExecutable" 
-          Title="$(loc.FeatureMainExecutableTitle)" 
-          Description="$(loc.FeatureMainExecutableDescription)" 
-          Level="1">
-          <ComponentRef Id="phpEXE"/>
-        </Feature>
+      <ComponentRef Id="php5tsDLL"/>
+      <ComponentRef Id="php5tsLIB"/>
+      <ComponentRef Id="php5embedLIB"/>
+      <ComponentRef Id="phpEXE"/>
         <Feature AllowAdvertise="no" 
           Id="ScriptExecutable" 
           Title="$(loc.FeatureScriptExecutableTitle)" 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.17&r2=1.18&diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.17 
win-installer/PHPInstallerBase52NTS.wxs:1.18
--- win-installer/PHPInstallerBase52NTS.wxs:1.17        Fri Feb 20 15:48:15 2009
+++ win-installer/PHPInstallerBase52NTS.wxs     Wed May 27 13:12:01 2009
@@ -336,23 +336,10 @@
       <ComponentRef Id="phprecommendedINI"/>
       <ComponentRef Id="win2003eventlog"/>
       <ComponentRef Id="PHPRegistry"/>
-    
-      <Feature AllowAdvertise="no" 
-        Id="MainProgram" 
-        Title="$(loc.FeatureMainProgramTitle)" 
-        Description="$(loc.FeatureMainProgramDescription)" 
-        TypicalDefault="install" 
-        Level="1">
-        <ComponentRef Id="php5DLL"/>
-        <ComponentRef Id="php5LIB"/>
-        <ComponentRef Id="php5embedLIB"/>
-        <Feature AllowAdvertise="no" 
-          Id="MainExecutable" 
-          Title="$(loc.FeatureMainExecutableTitle)" 
-          Description="$(loc.FeatureMainExecutableDescription)" 
-          Level="1">
-          <ComponentRef Id="phpEXE"/>
-        </Feature>
+      <ComponentRef Id="php5DLL"/>
+      <ComponentRef Id="php5LIB"/>
+      <ComponentRef Id="php5embedLIB"/>
+      <ComponentRef Id="phpEXE"/>
         <Feature AllowAdvertise="no" 
           Id="ScriptExecutable" 
           Title="$(loc.FeatureScriptExecutableTitle)" 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53.wxs?r1=1.20&r2=1.21&diff_format=u
Index: win-installer/PHPInstallerBase53.wxs
diff -u win-installer/PHPInstallerBase53.wxs:1.20 
win-installer/PHPInstallerBase53.wxs:1.21
--- win-installer/PHPInstallerBase53.wxs:1.20   Thu May 21 02:41:06 2009
+++ win-installer/PHPInstallerBase53.wxs        Wed May 27 13:12:01 2009
@@ -337,23 +337,10 @@
       <ComponentRef Id="phprecommendedINI"/>
       <ComponentRef Id="win2003eventlog"/>
       <ComponentRef Id="PHPRegistry"/>
-    
-      <Feature AllowAdvertise="no" 
-        Id="MainProgram" 
-        Title="$(loc.FeatureMainProgramTitle)" 
-        Description="$(loc.FeatureMainProgramDescription)" 
-        TypicalDefault="install" 
-        Level="1">
-        <ComponentRef Id="php5tsDLL"/>
-        <ComponentRef Id="php5tsLIB"/>
-        <ComponentRef Id="php5embedLIB"/>
-        <Feature AllowAdvertise="no" 
-          Id="MainExecutable" 
-          Title="$(loc.FeatureMainExecutableTitle)" 
-          Description="$(loc.FeatureMainExecutableDescription)" 
-          Level="1">
-          <ComponentRef Id="phpEXE"/>
-        </Feature>
+      <ComponentRef Id="php5tsDLL"/>
+      <ComponentRef Id="php5tsLIB"/>
+      <ComponentRef Id="php5embedLIB"/>
+      <ComponentRef Id="phpEXE"/>
         <Feature AllowAdvertise="no" 
           Id="ScriptExecutable" 
           Title="$(loc.FeatureScriptExecutableTitle)" 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase53NTS.wxs?r1=1.17&r2=1.18&diff_format=u
Index: win-installer/PHPInstallerBase53NTS.wxs
diff -u win-installer/PHPInstallerBase53NTS.wxs:1.17 
win-installer/PHPInstallerBase53NTS.wxs:1.18
--- win-installer/PHPInstallerBase53NTS.wxs:1.17        Thu May 21 02:41:06 2009
+++ win-installer/PHPInstallerBase53NTS.wxs     Wed May 27 13:12:01 2009
@@ -315,23 +315,10 @@
       <ComponentRef Id="phprecommendedINI"/>
       <ComponentRef Id="win2003eventlog"/>
       <ComponentRef Id="PHPRegistry"/>
-    
-      <Feature AllowAdvertise="no" 
-        Id="MainProgram" 
-        Title="$(loc.FeatureMainProgramTitle)" 
-        Description="$(loc.FeatureMainProgramDescription)" 
-        TypicalDefault="install" 
-        Level="1">
-        <ComponentRef Id="php5DLL"/>
-        <ComponentRef Id="php5LIB"/>
-        <ComponentRef Id="php5embedLIB"/>
-        <Feature AllowAdvertise="no" 
-          Id="MainExecutable" 
-          Title="$(loc.FeatureMainExecutableTitle)" 
-          Description="$(loc.FeatureMainExecutableDescription)" 
-          Level="1">
-          <ComponentRef Id="phpEXE"/>
-        </Feature>
+      <ComponentRef Id="php5DLL"/>
+      <ComponentRef Id="php5LIB"/>
+      <ComponentRef Id="php5embedLIB"/>
+      <ComponentRef Id="phpEXE"/>
         <Feature AllowAdvertise="no" 
           Id="ScriptExecutable" 
           Title="$(loc.FeatureScriptExecutableTitle)" 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60.wxs?r1=1.33&r2=1.34&diff_format=u
Index: win-installer/PHPInstallerBase60.wxs
diff -u win-installer/PHPInstallerBase60.wxs:1.33 
win-installer/PHPInstallerBase60.wxs:1.34
--- win-installer/PHPInstallerBase60.wxs:1.33   Sat Mar 21 01:58:33 2009
+++ win-installer/PHPInstallerBase60.wxs        Wed May 27 13:12:01 2009
@@ -337,23 +337,10 @@
       <ComponentRef Id="phprecommendedINI"/>
       <ComponentRef Id="win2003eventlog"/>
       <ComponentRef Id="PHPRegistry"/>
-    
-      <Feature AllowAdvertise="no" 
-        Id="MainProgram" 
-        Title="$(loc.FeatureMainProgramTitle)" 
-        Description="$(loc.FeatureMainProgramDescription)" 
-        TypicalDefault="install" 
-        Level="1">
-        <ComponentRef Id="php6tsDLL"/>
-        <ComponentRef Id="php6tsLIB"/>
-        <ComponentRef Id="php6embedLIB"/>
-        <Feature AllowAdvertise="no" 
-          Id="MainExecutable" 
-          Title="$(loc.FeatureMainExecutableTitle)" 
-          Description="$(loc.FeatureMainExecutableDescription)" 
-          Level="1">
-          <ComponentRef Id="phpEXE"/>
-        </Feature>
+      <ComponentRef Id="php6tsDLL"/>
+      <ComponentRef Id="php6tsLIB"/>
+      <ComponentRef Id="php6embedLIB"/>
+      <ComponentRef Id="phpEXE"/>
         <Feature AllowAdvertise="no" 
           Id="ScriptExecutable" 
           Title="$(loc.FeatureScriptExecutableTitle)" 
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase60NTS.wxs?r1=1.17&r2=1.18&diff_format=u
Index: win-installer/PHPInstallerBase60NTS.wxs
diff -u win-installer/PHPInstallerBase60NTS.wxs:1.17 
win-installer/PHPInstallerBase60NTS.wxs:1.18
--- win-installer/PHPInstallerBase60NTS.wxs:1.17        Fri Feb 20 15:48:16 2009
+++ win-installer/PHPInstallerBase60NTS.wxs     Wed May 27 13:12:02 2009
@@ -315,23 +315,10 @@
       <ComponentRef Id="phprecommendedINI"/>
       <ComponentRef Id="win2003eventlog"/>
       <ComponentRef Id="PHPRegistry"/>
-    
-      <Feature AllowAdvertise="no" 
-        Id="MainProgram" 
-        Title="$(loc.FeatureMainProgramTitle)" 
-        Description="$(loc.FeatureMainProgramDescription)" 
-        TypicalDefault="install" 
-        Level="1">
-        <ComponentRef Id="php6DLL"/>
-        <ComponentRef Id="php6LIB"/>
-        <ComponentRef Id="php6embedLIB"/>
-        <Feature AllowAdvertise="no" 
-          Id="MainExecutable" 
-          Title="$(loc.FeatureMainExecutableTitle)" 
-          Description="$(loc.FeatureMainExecutableDescription)" 
-          Level="1">
-          <ComponentRef Id="phpEXE"/>
-        </Feature>
+      <ComponentRef Id="php6DLL"/>
+      <ComponentRef Id="php6LIB"/>
+      <ComponentRef Id="php6embedLIB"/>
+      <ComponentRef Id="phpEXE"/>
         <Feature AllowAdvertise="no" 
           Id="ScriptExecutable" 
           Title="$(loc.FeatureScriptExecutableTitle)" 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to