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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-01-02 12:03:14 -0800 (Fri, 02 Jan 2015)
New Revision: 8490

Modified:
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
   trunk/Installer/build.bat
Log:
Update installer version numbers for MGOS 3.0

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2014-12-30 14:19:44 UTC (rev 8489)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2015-01-02 20:03:14 UTC (rev 8490)
@@ -46,10 +46,10 @@
         </Property>
         <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.4.6" />
-        <Property Id="PHP_VERSION" Secure="yes" Value="5.5.3" />
-        <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.6" />
-        <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide26AppPool">
+        <Property Id="APACHE_VERSION" Secure="yes" Value="2.4.10" />
+        <Property Id="PHP_VERSION" Secure="yes" Value="5.5.17" />
+        <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="3.0" />
+        <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide30AppPool">
             <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_2.6_PHP_via_FastCGI" />
-        <Property Id="MAPAGENT_ISAPI_NAME" Value="MapGuide 2.6 MapAgent ISAPI handler" />
+        <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" />
 
         <!-- 
         These are currently static, though there is opportunity in the future for these

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs	2014-12-30 14:19:44 UTC (rev 8489)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs	2015-01-02 20:03:14 UTC (rev 8490)
@@ -11,7 +11,7 @@
   <Fragment>
     <DirectoryRef Id="ProgramMenuFolder">
       <!-- HACK: For some reason the MG_VERSION_MAJOR_MINOR property doesn't evaluate, so hardcode it for now -->
-      <Directory Id="MapGuideOpenSourceMenuLocation" Name="MapGuide Open Source 2.6">
+      <Directory Id="MapGuideOpenSourceMenuLocation" Name="MapGuide Open Source 3.0">
         <Component Id="GenericShortcutComponent" Win64="$(var.Win64)" Guid="243CE0F3-D6BC-476B-910E-6F34DA54A2E2">
           <CreateFolder />
           <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\GenericShortcut">

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2014-12-30 14:19:44 UTC (rev 8489)
+++ trunk/Installer/build.bat	2015-01-02 20:03:14 UTC (rev 8490)
@@ -40,7 +40,7 @@
 
 SET TYPEACTION=build
 SET CULTURE=en-US
-SET INSTALLER_VERSION_MAJOR_MINOR=2.6
+SET INSTALLER_VERSION_MAJOR_MINOR=3.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