[mapguide-commits] r9566 - in trunk/Installer: . Installers/MapGuide Support/Web/x64

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-07-04 05:37:39 -0700 (Thu, 04 Jul 2019)
New Revision: 9566

Added:
   trunk/Installer/Support/Web/x64/httpd-2.4.37-x64-VC11.zip
   trunk/Installer/Support/Web/x64/php-5.6.40-x64-VC11.zip
Removed:
   trunk/Installer/Support/Web/x64/httpd-2.4.29-x64-VC11.zip
   trunk/Installer/Support/Web/x64/php-5.6.33-x64-VC11.zip
Modified:
   trunk/Installer/
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/build.bat
Log:
Merged revision(s) 9427, 9429, 9454 from branches/3.1/Installer:
RFC 168: Update windows installer binary artifacts

........
RFC 168: Update httpd/PHP version numbers for installer
........
Installer: Update PHP to 5.6.40
........


Index: trunk/Installer
===================================================================
--- trunk/Installer	2019-07-04 12:33:58 UTC (rev 9565)
+++ trunk/Installer	2019-07-04 12:37:39 UTC (rev 9566)

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,9325,9327-9328,9330,9373
+/branches/3.1/Installer:9025,9325,9327-9328,9330,9373,9427,9429,9454
 /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	2019-07-04 12:33:58 UTC (rev 9565)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2019-07-04 12:37:39 UTC (rev 9566)
@@ -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.29" />
-        <Property Id="PHP_VERSION" Secure="yes" Value="5.6.33" />
+        <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">
             <RegistrySearch

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

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

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

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

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2019-07-04 12:33:58 UTC (rev 9565)
+++ trunk/Installer/build.bat	2019-07-04 12:37:39 UTC (rev 9566)
@@ -80,9 +80,9 @@
 rem ==================================================
 rem Web dependencies
 rem ==================================================
-SET HTTPD_VERSION=2.4.29
-SET PHP_VERSION=5.6.33
-SET TOMCAT_VERSION=7.0.82
+SET HTTPD_VERSION=2.4.37
+SET PHP_VERSION=5.6.40
+SET TOMCAT_VERSION=7.0.92
 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