[mapguide-commits] r4800 - in trunk/Installer: .
Installers/MapGuide Libraries/MapGuide Web Extensions
Support/Web Support/Web/x86/Php
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Apr 16 11:56:53 EDT 2010
Author: jng
Date: 2010-04-16 11:56:51 -0400 (Fri, 16 Apr 2010)
New Revision: 4800
Added:
trunk/Installer/Support/Web/x86/Php/php5isapi.dll
Removed:
trunk/Installer/Support/Web/Apache2/
trunk/Installer/Support/Web/Php/
Modified:
trunk/Installer/Installers/MapGuide/MapGuide.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
trunk/Installer/build.bat
Log:
#1322: Final fixups.
- Make build.bat prepare from the new location
- Update version numbers (APACHE_VERSION and PHP_VERSION) in installer
- Update httpd.exe file reference in installer
- Add missing ISAPI module. Copied an existing pre-built one from the PHP internal Oem distribution.
- Updated file offsets in wix source.
- Remove old Apache and PHP folders.
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-04-15 16:30:47 UTC (rev 4799)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs 2010-04-16 15:56:51 UTC (rev 4800)
@@ -38,8 +38,8 @@
<Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuideAppPool" />
<Property Id="MGSERVER_IP" Secure="yes" Value="127.0.0.1" />
<Property Id="APACHE_PORT" Secure="yes" Value="8008" />
- <Property Id="APACHE_VERSION" Secure="yes" Value="2.2.4" />
- <Property Id="PHP_VERSION" Secure="yes" Value="5.2.5" />
+ <Property Id="APACHE_VERSION" Secure="yes" Value="2.2.11" />
+ <Property Id="PHP_VERSION" Secure="yes" Value="5.3.2" />
<Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.2" />
<!-- Server Port Settings -->
<Property Id="MG_ADMIN_PORT" Secure="yes" Value="2810" />
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2010-04-15 16:30:47 UTC (rev 4799)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2010-04-16 15:56:51 UTC (rev 4800)
@@ -6,7 +6,7 @@
<CustomAction Id="UpdateApacheConfig" Return="check" BinaryKey="ApacheActions" Execute="deferred" DllEntry="UpdateApacheConfig" />
<CustomAction Id="UpdatePhpIni.SetValues" Property="UpdatePhpIni" Value='[PHPLOCATION];2;[WEBTEMPLOCATION]' />
<CustomAction Id="UpdatePhpIni" Return="check" BinaryKey="ApacheActions" Execute="deferred" DllEntry="UpdatePhpIni" />
- <CustomAction Id="RemoveApacheServiceCA" Execute="immediate" Return="ignore" FileKey="file_APACHEFILES_13" ExeCommand="-k uninstall -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
- <CustomAction Id="InstallApacheServiceCA" Execute="deferred" Return="ignore" FileKey="file_APACHEFILES_13" ExeCommand="-k install -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
+ <CustomAction Id="RemoveApacheServiceCA" Execute="immediate" Return="ignore" FileKey="file_APACHEFILES_18" ExeCommand="-k uninstall -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
+ <CustomAction Id="InstallApacheServiceCA" Execute="deferred" Return="ignore" FileKey="file_APACHEFILES_18" ExeCommand="-k install -n "ApacheMapGuide[MG_VERSION_MAJOR_MINOR]"" />
</Fragment>
</Wix>
\ No newline at end of file
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2010-04-15 16:30:47 UTC (rev 4799)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/IIS.wxs 2010-04-16 15:56:51 UTC (rev 4800)
@@ -42,7 +42,7 @@
<iis:WebVirtualDir Id="IIS5MapGuideVDir" Alias="[VIRTUALDIR]" Directory="WEBROOTLOCATION" WebSite="IISDefaultWebSite">
<iis:WebDirProperties Id="IIS5MapGuideDocuments" DefaultDocuments="index.php,index.html,index.htm,default.aspx,index.aspx,default.htm,default.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no"/>
<iis:WebApplication Id="IIS5MapGuideWebApp" Name="[VIRTUALDIR]">
- <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="[!file_PHPFILES_39]" />
+ <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="[!file_PHPFILES_42]" />
</iis:WebApplication>
<iis:WebVirtualDir Id="IIS5MapAgentVDir" Alias="mapagent" Directory="dir_mapagent_0" >
<iis:WebDirProperties Id="IIS5MapAgentProperties" DefaultDocuments="index.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no"/>
@@ -54,7 +54,7 @@
<iis:WebError ErrorCode="401" SubCode="5" />
<iis:WebApplication Id="IIS5MapAgentWebApp" Name="mapagent" >
<iis:WebApplicationExtension Extension="fcgi" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="[!file_MAPAGENTFILES_98]" />
- <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="[!file_PHPFILES_39]" />
+ <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="[!file_PHPFILES_42]" />
</iis:WebApplication>
</iis:WebVirtualDir>
<iis:WebVirtualDir Id="IIS5MapAdminVDir" Alias="mapadmin" Directory="dir_mapadmin_0" >
@@ -94,13 +94,13 @@
<Condition>MGWEB_CONFIG="IIS" AND IISVERSIONMAJOR="#6"</Condition>
<CreateFolder />
<iis:WebAppPool Id="IIS6MapGuideAppPool" Name="[APP_POOL_NAME]" />
- <iis:WebServiceExtension Id="IIS6PhpWebServiceExt" Allow="yes" Description="MapGuide PHP ISAPI Extension" File="[!file_PHPFILES_39]" />
+ <iis:WebServiceExtension Id="IIS6PhpWebServiceExt" Allow="yes" Description="MapGuide PHP ISAPI Extension" File="[!file_PHPFILES_42]" />
<iis:WebServiceExtension Id="IIS6MapGuideWebServiceExt" Allow="yes" Description="MapGuide MapAgent ISAPI Extension" File="[!file_MAPAGENTFILES_98]" />
<iis:WebVirtualDir Id="IIS6MapGuideVDir" Alias="[VIRTUALDIR]" Directory="WEBROOTLOCATION" WebSite="IISDefaultWebSite" >
<iis:WebDirProperties Id="IIS6MapGuideDocuments" DefaultDocuments="index.php,index.html,index.htm,default.aspx,index.aspx,default.htm,default.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
<iis:MimeMap Id="IIS6JsonMimeType" Type="application/json" Extension =".json" />
<iis:WebApplication Id="IIS6MapGuideWebApp" Name="[VIRTUALDIR]" WebAppPool="IIS6MapGuideAppPool" >
- <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="[!file_PHPFILES_39]" />
+ <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="[!file_PHPFILES_42]" />
</iis:WebApplication>
<iis:WebVirtualDir Id="IIS6MapAgentVDir" Alias="mapagent" Directory="dir_mapagent_0" >
<iis:WebDirProperties Id="IIS6MapAgentProperties" DefaultDocuments="index.html" AnonymousAccess="yes" BasicAuthentication="no" WindowsAuthentication="no" />
@@ -112,7 +112,7 @@
<iis:WebError ErrorCode="401" SubCode="5" />
<iis:WebApplication Id="IIS6MapAgentWebApp" Name="mapagent" WebAppPool="IIS6MapGuideAppPool">
<iis:WebApplicationExtension Extension="fcgi" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="[!file_MAPAGENTFILES_98]" />
- <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="[!file_PHPFILES_39]" />
+ <iis:WebApplicationExtension Extension="php" Script="yes" Verbs="GET,POST" CheckPath="no" Executable="[!file_PHPFILES_42]" />
</iis:WebApplication>
</iis:WebVirtualDir>
<iis:WebVirtualDir Id="IIS6MapAdminVDir" Alias="mapadmin" Directory="dir_mapadmin_0" >
Added: trunk/Installer/Support/Web/x86/Php/php5isapi.dll
===================================================================
(Binary files differ)
Property changes on: trunk/Installer/Support/Web/x86/Php/php5isapi.dll
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2010-04-15 16:30:47 UTC (rev 4799)
+++ trunk/Installer/build.bat 2010-04-16 15:56:51 UTC (rev 4800)
@@ -41,6 +41,7 @@
rem ==================================================
SET TYPEACTION=build
+SET CPUTYPE=x86
SET TYPEBUILD=Release
SET CULTURE=en-US
SET INSTALLER_VERSION_MAJOR_MINOR_REV=2.2.0
@@ -221,11 +222,11 @@
popd
rem copy support files into server and web directories
echo [prepare] Tomcat
-%XCOPY% "%INSTALLER_DEV%\Support\Web\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\Tomcat" "%MG_SOURCE%\Web\Tomcat" /EXCLUDE:svn_excludes.txt
echo [prepare] Php
-%XCOPY% "%INSTALLER_DEV%\Support\Web\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\Php" "%MG_SOURCE%\Web\Php" /EXCLUDE:svn_excludes.txt
echo [prepare] Apache2
-%XCOPY% "%INSTALLER_DEV%\Support\Web\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
+%XCOPY% "%INSTALLER_DEV%\Support\Web\%CPUTYPE%\Apache2" "%MG_SOURCE%\Web\Apache2" /EXCLUDE:svn_excludes.txt
goto quit
More information about the mapguide-commits
mailing list