[mapguide-commits] r6370 - in trunk/Installer: Installers/MapGuide Libraries/MapGuide Web Extensions

[svn_mapguide at osgeo.org]

Author: jng
Date: 2011-12-28 21:44:34 -0800 (Wed, 28 Dec 2011)
New Revision: 6370

Modified:
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
   trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
Log:
#1805: Installer updates for IIS 7.x

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2011-12-29 02:58:14 UTC (rev 6369)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2011-12-29 05:44:34 UTC (rev 6370)
@@ -773,7 +773,7 @@
                 After="UpdatePhpIni.SetValues">&amp;WebExtPhpFeature&gt;2</Custom>
             <Custom
                 Action="UpdatePhpIni.SetValues"
-                After="UpdateApacheConfig">&amp;WebExtPhpFeature&gt;2</Custom>
+                Before="InstallFinalize">&amp;WebExtPhpFeature&gt;2</Custom>
             <Custom
                 Action="InstallApacheServiceCA"
                 Before="InstallFinalize">MGWEB_CONFIG=&quot;APACHE&quot; AND &amp;WebExtApacheFeature&gt;2</Custom>

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs	2011-12-29 02:58:14 UTC (rev 6369)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs	2011-12-29 05:44:34 UTC (rev 6370)
@@ -11,7 +11,7 @@
     <?endif ?>
 	<!-- isapi_MapAgent.dll -->
     <?define FCGI_MAP = "[!file_MAPAGENTFILES_100]" ?>
-	<!-- php5isapi.dll -->
+	<!-- fcgiext.dll -->
     <?define PHP_MAP = "[WindowsFolder]system32\inetsrv\fcgiext.dll" ?>
     <?define PHP_CGI_EXE = "[!file_PHPFILES_41]" ?>
     <Fragment>

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs	2011-12-29 02:58:14 UTC (rev 6369)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS7.wxs	2011-12-29 05:44:34 UTC (rev 6370)
@@ -17,7 +17,7 @@
 
     <!-- Set up FastCGI -->
     <CustomAction Id="MapGuideIIS7_I_CreateFastCgi_Cmd" Property="MapGuideIIS7_I_CreateFastCgi" Execute="immediate"
-            Value="[AppCmd] add apppool set config /section:system.webServer/fastCGI /+[\[]fullPath=&quot;[PHPLOCATION]\php-cgi.exe&quot;[\]]" />
+            Value="[AppCmd] add apppool set config /section:system.webServer/fastCGI /+[\[]fullPath=&quot;[PHPLOCATION]php-cgi.exe&quot;[\]]" />
     <CustomAction Id="MapGuideIIS7_I_CreateFastCgi" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
 
     <!-- Set the application pool's properties -->
@@ -42,7 +42,7 @@
 
     <!-- Set up the PHP script mapping to FastCGI -->
     <CustomAction Id="MapGuideIIS7_I_CreatePhpScriptMapping_Cmd" Property="MapGuideIIS7_I_CreatePhpScriptMapping" Execute="immediate"
-        Value="[AppCmd] set config &quot;[MG_WEBSITE]/[VIRTUALDIR]&quot; /section:handlers /+[\[]name='&quot;PHP_via_FastCGI&quot;',path='*.php',verb='*',scriptProcessor='&quot;[PHPLOCATION]\php-cgi.exe&quot;',modules='FastCgiModule',resourceType='Unspecified'[\]]" />
+        Value="[AppCmd] set config &quot;[MG_WEBSITE]/[VIRTUALDIR]&quot; /section:handlers /+[\[]name='&quot;PHP_via_FastCGI&quot;',path='*.php',verb='*',scriptProcessor='&quot;[PHPLOCATION]php-cgi.exe&quot;',modules='FastCgiModule',resourceType='Unspecified'[\]]" />
     <CustomAction Id="MapGuideIIS7_I_CreatePhpScriptMapping" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
 
     <!-- Create the MapAgent application -->