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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2016-07-26 04:40:33 -0700 (Tue, 26 Jul 2016)
New Revision: 8989

Added:
   trunk/Installer/Support/Web/x64/php-5.6.23-x64-VC11.zip
   trunk/Installer/Support/Web/x86/php-5.6.23-x86-VC11.zip
Removed:
   trunk/Installer/Support/Web/x64/php-5.5.33-x64-VC11.zip
   trunk/Installer/Support/Web/x86/php-5.5.33-x86-VC11.zip
Modified:
   trunk/Installer/
   trunk/Installer/Installers/MapGuide/MapGuide.wxs
   trunk/Installer/build.bat
Log:
Merged revision(s) 8976-8978 from sandbox/jng/php56x_installer:
........
Installer updates for PHP 5.6


Property changes on: trunk/Installer
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/Installer:6987-6988
/branches/3.0/Installer:8611,8688
/sandbox/jng/rfc155_installer:8873-8885
/trunk/Installer:8690-8872
   + /branches/2.4/Installer:6987-6988
/branches/3.0/Installer:8611,8688
/sandbox/jng/php56x_installer:8976-8978
/sandbox/jng/rfc155_installer:8873-8885
/trunk/Installer:8690-8872

Modified: trunk/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- trunk/Installer/Installers/MapGuide/MapGuide.wxs	2016-07-26 11:37:15 UTC (rev 8988)
+++ trunk/Installer/Installers/MapGuide/MapGuide.wxs	2016-07-26 11:40:33 UTC (rev 8989)
@@ -47,7 +47,7 @@
         <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.5.33" />
+        <Property Id="PHP_VERSION" Secure="yes" Value="5.6.23" />
         <Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="3.1" />
         <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide31AppPool">
             <RegistrySearch

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

Copied: trunk/Installer/Support/Web/x64/php-5.6.23-x64-VC11.zip (from rev 8978, sandbox/jng/php56x_installer/Support/Web/x64/php-5.6.23-x64-VC11.zip)
===================================================================
(Binary files differ)

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

Copied: trunk/Installer/Support/Web/x86/php-5.6.23-x86-VC11.zip (from rev 8978, sandbox/jng/php56x_installer/Support/Web/x86/php-5.6.23-x86-VC11.zip)
===================================================================
(Binary files differ)

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2016-07-26 11:37:15 UTC (rev 8988)
+++ trunk/Installer/build.bat	2016-07-26 11:40:33 UTC (rev 8989)
@@ -81,7 +81,7 @@
 rem Web dependencies
 rem ==================================================
 SET HTTPD_VERSION=2.4.18
-SET PHP_VERSION=5.5.33
+SET PHP_VERSION=5.6.23
 SET TOMCAT_VERSION=7.0.68
 SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-VC11.zip
 SET TOMCAT_PACKAGE_NAME=apache-tomcat-%TOMCAT_VERSION%