[mapguide-commits] r9337 - in trunk/Installer: . Installers/MapGuide Libraries/MapGuide Web Extensions Libraries/MapGuide Web Extensions/Lang Support/Web/x64

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Sat Mar 3 04:26:00 PST 2018 

Author: jng
Date: 2018-03-03 04:25:59 -0800 (Sat, 03 Mar 2018)
New Revision: 9337

Added:
   trunk/Installer/Support/Web/x64/httpd-2.4.29-x64-VC11.zip
   trunk/Installer/Support/Web/x64/php-5.6.33-x64-VC11.zip
Removed:
   trunk/Installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip
   trunk/Installer/Support/Web/x64/php-5.6.23-x64-VC11.zip
Modified:
   trunk/Installer/
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
   trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
   trunk/Installer/Support/Web/x64/mod_jk.so
   trunk/Installer/build.bat
Log:
Merged revision(s) 9325, 9327-9328, 9330 from branches/3.1/Installer:
#2774: Update 64-bit windows installer artifacts
........
#2774: Update installer version numbers and remove dead shortcuts
........
#2774: Remove unused strings
........
#2774: Fix naming on the 64-bit windows installer artifacts
........


Index: trunk/Installer
===================================================================
--- trunk/Installer	2018-03-03 12:22:48 UTC (rev 9336)
+++ trunk/Installer	2018-03-03 12:25:59 UTC (rev 9337)

Property changes on: trunk/Installer
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,6 ##
 /branches/2.4/Installer:6987-6988
 /branches/3.0/Installer:8611,8688
-/branches/3.1/Installer:9025
+/branches/3.1/Installer:9025,9325,9327-9328,9330
 /sandbox/jng/php56x_installer:8976-8978
 /sandbox/jng/rfc155_installer:8873-8885
 /trunk/Installer:8690-8872
\ No newline at end of property
Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2018-03-03 12:22:48 UTC (rev 9336)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2018-03-03 12:25:59 UTC (rev 9337)
@@ -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.3" />
         <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide33AppPool">
             <RegistrySearch

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl	2018-03-03 12:22:48 UTC (rev 9336)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Lang/MapGuideWebExtensions_en-US.wxl	2018-03-03 12:25:59 UTC (rev 9337)
@@ -62,6 +62,4 @@
     <String Id="Shortcut_GetMaestro">Get MapGuide Maestro</String>
     <String Id="Shortcut_MapGuide">MapGuide Project Home</String>
     <String Id="Shortcut_Trac">MapGuide Trac</String>
-    <String Id="Shortcut_BestPractices">MapGuide Best Practices</String>
-    <String Id="Shortcut_MapGuideCentral">MapGuide Central</String>
 </WixLocalization>
\ No newline at end of file

Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs	2018-03-03 12:22:48 UTC (rev 9336)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Shortcuts.wxs	2018-03-03 12:25:59 UTC (rev 9337)
@@ -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"

Deleted: trunk/Installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip
===================================================================
(Binary files differ)

Copied: trunk/Installer/Support/Web/x64/httpd-2.4.29-x64-VC11.zip (from rev 9330, branches/3.1/Installer/Support/Web/x64/httpd-2.4.29-x64-VC11.zip)
===================================================================
(Binary files differ)

Modified: trunk/Installer/Support/Web/x64/mod_jk.so
===================================================================
(Binary files differ)

Deleted: trunk/Installer/Support/Web/x64/php-5.6.23-x64-VC11.zip
===================================================================
(Binary files differ)

Copied: trunk/Installer/Support/Web/x64/php-5.6.33-x64-VC11.zip (from rev 9330, branches/3.1/Installer/Support/Web/x64/php-5.6.33-x64-VC11.zip)
===================================================================
(Binary files differ)

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2018-03-03 12:22:48 UTC (rev 9336)
+++ trunk/Installer/build.bat	2018-03-03 12:25:59 UTC (rev 9337)
@@ -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

More information about the mapguide-commits mailing list