[mapguide-commits] r9327 - in branches/3.1/Installer: . Installers/MapGuide Libraries/MapGuide Web Extensions

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-02-28 07:24:01 -0800 (Wed, 28 Feb 2018)
New Revision: 9327

Modified:
   branches/3.1/Installer/Installers/MapGuide/MapGuide.wxs
   branches/3.1/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
   branches/3.1/Installer/build.bat
Log:
#2774: Update installer version numbers and remove dead shortcuts

Modified: branches/3.1/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- branches/3.1/Installer/Installers/MapGuide/MapGuide.wxs	2018-02-28 15:03:51 UTC (rev 9326)
+++ branches/3.1/Installer/Installers/MapGuide/MapGuide.wxs	2018-02-28 15:24:01 UTC (rev 9327)
@@ -46,8 +46,8 @@
         </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.18" />
-        <Property Id="PHP_VERSION" Secure="yes" Value="5.6.23" />
+        <Property Id="APACHE_VERSION" Secure="yes" Value="2.4.29" />
+        <Property Id="PHP_VERSION" Secure="yes" Value="5.6.33" />
         <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="3.1" />
         <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide31AppPool">
             <RegistrySearch

Modified: branches/3.1/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- branches/3.1/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs	2018-02-28 15:03:51 UTC (rev 9326)
+++ branches/3.1/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs	2018-02-28 15:24:01 UTC (rev 9327)
@@ -231,18 +231,10 @@
               Directory="WebResourcesLocation"
               Name="!(loc.Shortcut_Trac)"
               Target="http://trac.osgeo.org/mapguide" />
-            <util:InternetShortcut Id="MapGuideBestPractices"
-              Directory="WebResourcesLocation"
-              Name="!(loc.Shortcut_BestPractices)"
-              Target="http://sandbox.mapguide.com" />
             <util:InternetShortcut Id="AutodeskWikiHelp"
               Directory="WebResourcesLocation"
               Name="!(loc.Shortcut_WikiHelp)"
-              Target="http://wikihelp.autodesk.com/Infr._Map_Server/enu/2013" />
-            <util:InternetShortcut Id="MapGuideCentral"
-              Directory="WebResourcesLocation"
-              Name="!(loc.Shortcut_MapGuideCentral)"
-              Target="http://ennoble.dreamhosters.com/mapguide-central" />
+              Target="http://help.autodesk.com/view/AIMS/2017/ENU/" />
             <RegistryKey Root="HKCU" Key="$(var.MgRegKey)\ProgramMenuShortcut">
               <RegistryValue
                 Value="Installed"

Modified: branches/3.1/Installer/build.bat
===================================================================
--- branches/3.1/Installer/build.bat	2018-02-28 15:03:51 UTC (rev 9326)
+++ branches/3.1/Installer/build.bat	2018-02-28 15:24:01 UTC (rev 9327)
@@ -80,9 +80,9 @@
 rem ==================================================
 rem Web dependencies
 rem ==================================================
-SET HTTPD_VERSION=2.4.18
-SET PHP_VERSION=5.6.23
-SET TOMCAT_VERSION=7.0.68
+SET HTTPD_VERSION=2.4.29
+SET PHP_VERSION=5.6.33
+SET TOMCAT_VERSION=7.0.82
 SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-VC11.zip
 SET TOMCAT_PACKAGE_NAME=apache-tomcat-%TOMCAT_VERSION%
 SET TOMCAT_PACKAGE=%MG_OEM%\LinuxApt\%TOMCAT_PACKAGE_NAME%.tar.gz