[PHP-CVS] cvs: win-installer / PHPInstallerBase52NTS.wxs

John Mertic Mon, 26 Jan 2009 11:17:24 -0800

jmertic         Mon Jan 26 19:15:23 2009 UTC

  Modified files:              
    /win-installer      PHPInstallerBase52NTS.wxs 
  Log:
  Applied fixes contributed from Kanwaljeet Singla <ksin...@microsoft.com>:
  
  - Changed custom actions to run in ProgramFilesFolder instead of INSTALLDIR. 
When commands are run, on a fresh machine INSTALLDIR is not present and command 
fails.
  - Previously all custom actions were running after=InstallInitialize. Few 
appcmd commands will pass only if they are run after a previous appcmd call. 
Made custom action run one after the other.
  - Appcmd commands had square brackets which were not properly escaped. Fixed 
that. Few start &quot; in appcmd calls didnt end properly. Fixed.
  - Fcgiext.ini has only EnvironmentVars key and all environment variables need 
to set in one call. Did that.
  - IIS7 php handle uninstall command need only keys. Removed other attributes. 
Also moved custom actions to keep install and uninstall custom actions together.

http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerBase52NTS.wxs?r1=1.10&r2=1.11&diff_format=u
Index: win-installer/PHPInstallerBase52NTS.wxs
diff -u win-installer/PHPInstallerBase52NTS.wxs:1.10 
win-installer/PHPInstallerBase52NTS.wxs:1.11
--- win-installer/PHPInstallerBase52NTS.wxs:1.10        Sun Dec 21 04:21:13 2008
+++ win-installer/PHPInstallerBase52NTS.wxs     Mon Jan 26 19:15:22 2009
@@ -447,73 +447,67 @@
       Return="ignore" 
          Execute="deferred"
          Impersonate="no"
-      Directory="INSTALLDIR"/>
-    <CustomAction Id="iis700FastCGIaddremove" 
-      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:system.webServer/fastCGI 
/-&quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]&quot;" 
+      Directory="ProgramFilesFolder"/>
+    <CustomAction Id="iis700FastCGISetInstanceMaxRequests" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:system.webServer/fastCGI 
&quot;/[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].instanceMaxRequests:10000&quot;
 /commit:apphost" 
       Return="ignore" 
          Execute="deferred"
          Impersonate="no"
-      Directory="INSTALLDIR"/>
-    <CustomAction Id="iis700FastCGI" 
-      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/handlers 
/+&quot;[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]&quot;"
 
+      Directory="ProgramFilesFolder"/>
+    <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:system.webServer/fastCGI 
/+&quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHP_FCGI_MAX_REQUESTS',value='10000'[\]]&quot;
 /commit:apphost" 
       Return="ignore" 
          Execute="deferred"
          Impersonate="no"
-      Directory="INSTALLDIR"/>
+      Directory="ProgramFilesFolder"/>
     <CustomAction Id="iis700FastCGISetPHPRC" 
-      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHPRC',value='[INSTALLDIR]']&quot;
 /commit:apphost" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:system.webServer/fastCGI 
/+&quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]].environmentVariables.[\[]name='PHPRC',value='[INSTALLDIR]'[\]]&quot;
 /commit:apphost" 
       Return="ignore" 
          Execute="deferred"
          Impersonate="no"
-      Directory="INSTALLDIR"/>
-    <CustomAction Id="iis700FastCGISetInstanceMaxRequests" 
-      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].instanceMaxRequests:10000 
/commit:apphost" 
+      Directory="ProgramFilesFolder"/>
+    <CustomAction Id="iis700FastCGI" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:system.webServer/handlers 
/+&quot;[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]&quot;"
 
       Return="ignore" 
          Execute="deferred"
          Impersonate="no"
-      Directory="INSTALLDIR"/>
-    <CustomAction Id="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" 
-      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/fastCGI 
/+&quot;[fullPath='[INSTALLDIR]php-cgi.exe'].environmentVariables.[name='PHP_FCGI_MAX_REQUESTS',value='10000']
 /commit:apphost" 
+      Directory="ProgramFilesFolder"/>
+    <CustomAction Id="iis700FastCGIaddremove" 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:system.webServer/fastCGI 
/-&quot;[\[]fullPath='[INSTALLDIR]php-cgi.exe'[\]]&quot;" 
       Return="ignore" 
          Execute="deferred"
          Impersonate="no"
-      Directory="INSTALLDIR"/>
+      Directory="ProgramFilesFolder"/>
     <CustomAction Id="iis700FastCGIremove" 
-      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG /section:system.webServer/handlers 
/-&quot;[\[]name='PHP_via_FastCGI',path='*.php',verb='*',modules='FastCgiModule',scriptProcessor='[INSTALLDIR]php-cgi.exe',resourceType='Either'[\]]&quot;"
 
+      ExeCommand="&quot;[WindowsFolder]system32\inetsrv\APPCMD.EXE&quot; SET 
CONFIG -section:system.webServer/handlers 
/-&quot;[\[]name='PHP_via_FastCGI',path='*.php',verb='*'[\]]&quot;" 
       Return="ignore" 
          Execute="deferred"
          Impersonate="no"
-      Directory="INSTALLDIR"/>
+      Directory="ProgramFilesFolder"/>
     <CustomAction Id="fcgiconfigJSFastCGI" 
       ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -add 
-section:&quot;PHP&quot; -extension:php 
-path:&quot;[INSTALLDIR]php-cgi.exe&quot;"
       Return="ignore" 
       Execute="deferred"
          Impersonate="no"
-      Directory="INSTALLDIR"/>
-    <CustomAction Id="fcgiconfigJSFastCGISetPHPRC" 
-      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHPRC:&quot;[INSTALLDIR]&quot;"
-      Return="ignore" 
-      Execute="deferred"
-         Impersonate="no"
-      Directory="INSTALLDIR"/>
+      Directory="ProgramFilesFolder"/>
     <CustomAction Id="fcgiconfigJSFastCGISetInstanceMaxRequests" 
       ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -InstanceMaxRequests:10000"
       Return="ignore" 
       Execute="deferred"
          Impersonate="no"
-      Directory="INSTALLDIR"/>
-    <CustomAction Id="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
-      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; -EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000"
+      Directory="ProgramFilesFolder"/>
+    <CustomAction Id="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" 
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -set 
-section:&quot;PHP&quot; 
-EnvironmentVars:PHP_FCGI_MAX_REQUESTS:10000,PHPRC:&quot;[INSTALLDIR]&quot;"
       Return="ignore" 
       Execute="deferred"
          Impersonate="no"
-      Directory="INSTALLDIR"/>
+      Directory="ProgramFilesFolder"/>
     <CustomAction Id="fcgiconfigJSFastCGIremove" 
-      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;Ã"
+      ExeCommand="cscript 
&quot;[WindowsFolder]system32\inetsrv\fcgiconfig.js&quot; -remove 
-section:&quot;PHP&quot;"
       Return="ignore" 
       Execute="deferred"
          Impersonate="no"
-      Directory="INSTALLDIR"/>
+      Directory="ProgramFilesFolder"/>
     <CustomAction Id="configIIS4" 
       BinaryKey="PHPInstallerScripts" 
       Return="check" 
@@ -522,50 +516,47 @@
       BinaryKey="PHPInstallerScripts" 
       Return="check" 
       VBScriptCall="unconfigIIS4" />
-  
+ 
     <InstallExecuteSequence>
       <Custom Action="iis700FastCGIadd" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
       </Custom>
-      <Custom Action="iis700FastCGIaddremove" After="InstallInitialize">
-        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]>
-      </Custom>
-      <Custom Action="iis700FastCGI" After="InstallInitialize">
+      <Custom Action="iis700FastCGISetInstanceMaxRequests" 
After="iis700FastCGIadd">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
       </Custom>
-      <Custom Action="iis700FastCGISetPHPRC" After="InstallInitialize">
+      <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" 
After="iis700FastCGISetInstanceMaxRequests">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
       </Custom>
-      <Custom Action="iis700FastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+      <Custom Action="iis700FastCGISetPHPRC" 
After="iis700FastCGISetPHP_FCGI_MAX_REQUESTS">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
       </Custom>
-      <Custom Action="iis700FastCGISetPHP_FCGI_MAX_REQUESTS" 
After="InstallInitialize">
+      <Custom Action="iis700FastCGI" After="iis700FastCGISetPHPRC">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 3]]>
       </Custom>
       <Custom Action="iis700FastCGIremove" After="InstallInitialize">
         <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]>
       </Custom>
+      <Custom Action="iis700FastCGIaddremove" After="iis700FastCGIremove">
+        <![CDATA[VersionNT >= 600 AND &iis4FastCGI = 2]]>
+      </Custom>
       <Custom Action="fcgiconfigJSFastCGI" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
       </Custom>
-      <Custom Action="fcgiconfigJSFastCGISetPHPRC" After="InstallInitialize">
+      <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" 
After="fcgiconfigJSFastCGI">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
       </Custom>
-      <Custom Action="fcgiconfigJSFastCGISetInstanceMaxRequests" 
After="InstallInitialize">
+      <Custom Action="fcgiconfigJSFastCGISetPHPRCAndMAX_REQUESTS" 
After="fcgiconfigJSFastCGISetInstanceMaxRequests">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
       </Custom>
-      <Custom Action="fcgiconfigJSFastCGISetPHP_FCGI_MAX_REQUESTS" 
After="InstallInitialize">
-        <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 3]]>
+      <Custom Action="configIIS4" After="InstallFinalize">
+        <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]>
       </Custom>
       <Custom Action="fcgiconfigJSFastCGIremove" After="InstallInitialize">
         <![CDATA[((VersionNT = 501 AND ServicePackLevel >= 2) OR (VersionNT = 
502 AND ServicePackLevel >= 2)) AND &iis4FastCGI = 2]]>
       </Custom>
-      <Custom Action="unconfigIIS4" After="InstallValidate">
+      <Custom Action="unconfigIIS4" After="fcgiconfigJSFastCGIremove">
         <![CDATA[VersionNT < 600 AND &iis4FastCGI = 2]]>
       </Custom>
-      <Custom Action="configIIS4" After="InstallFinalize">
-        <![CDATA[VersionNT < 600 AND &iis4FastCGI = 3]]>
-      </Custom>
       <RemoveExistingProducts After="InstallValidate" />
     </InstallExecuteSequence>

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

[PHP-CVS] cvs: win-installer / PHPInstallerBase52NTS.wxs

Reply via email to