[mapguide-commits] r8890 - in trunk/Installer: Installers/MapGuide Libraries/MapGuide Server

[svn_mapguide at osgeo.org]

Author: jng
Date: 2016-03-16 04:23:08 -0700 (Wed, 16 Mar 2016)
New Revision: 8890

Modified:
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/Libraries/MapGuide Server/FDO.wxs
Log:
Update installer version numbers for 3.1

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2016-03-15 14:12:12 UTC (rev 8889)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2016-03-16 11:23:08 UTC (rev 8890)
@@ -48,8 +48,8 @@
         <Property Id="APACHE_PORT" Secure="yes" Value="8008" />
         <Property Id="APACHE_VERSION" Secure="yes" Value="2.4.18" />
         <Property Id="PHP_VERSION" Secure="yes" Value="5.5.33" />
-        <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="3.0" />
-        <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide30AppPool">
+        <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="3.1" />
+        <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide31AppPool">
             <RegistrySearch
             Id="MgAppPoolNameRs"
             Type="raw"
@@ -68,8 +68,8 @@
         <!-- 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.0_PHP_via_FastCGI" />
-        <Property Id="MAPAGENT_ISAPI_NAME" Value="MapGuide 3.0 MapAgent ISAPI handler" />
+        <Property Id="PHP_FCGI_HANDLER_NAME" Value="MapGuide_3.1_PHP_via_FastCGI" />
+        <Property Id="MAPAGENT_ISAPI_NAME" Value="MapGuide 3.1 MapAgent ISAPI handler" />
 
         <!-- 
         These are currently static, though there is opportunity in the future for these

Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs	2016-03-15 14:12:12 UTC (rev 8889)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs	2016-03-16 11:23:08 UTC (rev 8890)
@@ -88,10 +88,10 @@
           <!-- FDO Core -->
           <Component Id="FdoCoreCompnent" Win64="$(var.Win64)" Guid="90F4CB26-524F-499B-AA22-BD17036B167D">
               <File Id="FdoRegUtil" Checksum="yes" Source="$(var.MgSource)\Server\FDO\FdoRegUtil.exe" />
-              <File Id="FdoBoostChrono" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_chrono-vc110-mt-1_54.dll" />
-              <File Id="FdoBoostSystem" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_system-vc110-mt-1_54.dll" />
-              <File Id="FdoBoostDateTime" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_date_time-vc110-mt-1_54.dll" />
-              <File Id="FdoBoostThread" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_thread-vc110-mt-1_54.dll" />
+              <File Id="FdoBoostChrono" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_chrono-vc140-mt-1_59.dll" />
+              <File Id="FdoBoostSystem" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_system-vc140-mt-1_59.dll" />
+              <File Id="FdoBoostDateTime" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_date_time-vc140-mt-1_59.dll" />
+              <File Id="FdoBoostThread" Checksum="yes" Source="$(var.MgSource)\Server\FDO\boost_thread-vc140-mt-1_59.dll" />
               <File Id="XalanLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\Xalan-C_1_11.dll" />
               <File Id="XalanMessagesLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\XalanMessages_1_11.dll" />
               <File Id="XercesLib" Checksum="yes" Source="$(var.MgSource)\Server\FDO\xerces-c_3_1.dll" />