[mapguide-commits] r9580 - in trunk/Installer: . Installers/MapGuide

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-07-18 09:00:59 -0700 (Thu, 18 Jul 2019)
New Revision: 9580

Modified:
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/build.bat
Log:
Installer: Left out some 4.0 version updates. Also bump FDO version to 4.2.

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2019-07-18 10:17:40 UTC (rev 9579)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2019-07-18 16:00:59 UTC (rev 9580)
@@ -48,8 +48,8 @@
         <Property Id="APACHE_PORT" Secure="yes" Value="8008" />
         <Property Id="APACHE_VERSION" Secure="yes" Value="2.4.37" />
         <Property Id="PHP_VERSION" Secure="yes" Value="5.6.40" />
-        <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="3.3" />
-        <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide33AppPool">
+        <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="4.0" />
+        <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide40AppPool">
             <RegistrySearch
             Id="MgAppPoolNameRs"
             Type="raw"
@@ -63,13 +63,13 @@
         <Property Id="MG_CLIENT_PORT" Secure="yes" Value="2811" />
         <Property Id="MG_SITE_PORT" Secure="yes" Value="2812" />
         <!-- Used by FdoRegUtil.exe -->
-        <Property Id="FDO_VERSION_SMALL" Secure="yes" Value="4.1" />
-        <Property Id="FDO_VERSION" Secure="yes" Value="4.1.0.0" />
+        <Property Id="FDO_VERSION_SMALL" Secure="yes" Value="4.2" />
+        <Property Id="FDO_VERSION" Secure="yes" Value="4.2.0.0" />
         <!-- IIS vars -->
         <Property Id="ASPNETVERSION" Value="v4.0" />
         <!-- Don't try to use MG_VERSION_MAJOR_MINOR here. I tried. Just accept it and hardcode the number -->
-        <Property Id="PHP_FCGI_HANDLER_NAME" Value="MapGuide_3.3_PHP_via_FastCGI" />
-        <Property Id="MAPAGENT_ISAPI_NAME" Value="MapGuide 3.3 MapAgent ISAPI handler" />
+        <Property Id="PHP_FCGI_HANDLER_NAME" Value="MapGuide_4.0_PHP_via_FastCGI" />
+        <Property Id="MAPAGENT_ISAPI_NAME" Value="MapGuide 4.0 MapAgent ISAPI handler" />
 
         <!-- 
         These are currently static, though there is opportunity in the future for these

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2019-07-18 10:17:40 UTC (rev 9579)
+++ trunk/Installer/build.bat	2019-07-18 16:00:59 UTC (rev 9580)
@@ -40,7 +40,7 @@
 
 SET TYPEACTION=build
 SET CULTURE=en-US
-SET INSTALLER_VERSION_MAJOR_MINOR=3.3
+SET INSTALLER_VERSION_MAJOR_MINOR=4.0
 SET INSTALLER_VERSION_MAJOR_MINOR_REV=%INSTALLER_VERSION_MAJOR_MINOR%.0
 SET INSTALLER_NAME=MapGuideOpenSource-%INSTALLER_VERSION_MAJOR_MINOR_REV%-Trunk-%CULTURE%-%TYPEBUILD%-%PLATFORM_CLR%
 SET INSTALLER_VERSION=%INSTALLER_VERSION_MAJOR_MINOR_REV%.0