[mapguide-commits] r8995 - in branches/2.6/Installer: . Installers/MapGuide Support/Web/x64 Support/Web/x86
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jul 26 08:56:42 PDT 2016
Author: jng
Date: 2016-07-26 08:56:42 -0700 (Tue, 26 Jul 2016)
New Revision: 8995
Added:
branches/2.6/Installer/Support/Web/x64/php-5.6.23-x64-VC11.zip
branches/2.6/Installer/Support/Web/x86/php-5.6.23-x86-VC11.zip
Removed:
branches/2.6/Installer/Support/Web/x64/php-5.5.33-x64-VC11.zip
branches/2.6/Installer/Support/Web/x86/php-5.5.33-x86-VC11.zip
Modified:
branches/2.6/Installer/
branches/2.6/Installer/Installers/MapGuide/MapGuide.wxs
branches/2.6/Installer/build.bat
Log:
Merged revision(s) 8976-8978 from sandbox/jng/php56x_installer:
........
Installer updates for PHP 5.6
Property changes on: branches/2.6/Installer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/Installer:6987-6988
/sandbox/jng/rfc155_installer:8877
+ /branches/2.4/Installer:6987-6988
/sandbox/jng/php56x_installer:8976-8978
/sandbox/jng/rfc155_installer:8877
Modified: branches/2.6/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- branches/2.6/Installer/Installers/MapGuide/MapGuide.wxs 2016-07-26 15:56:22 UTC (rev 8994)
+++ branches/2.6/Installer/Installers/MapGuide/MapGuide.wxs 2016-07-26 15:56:42 UTC (rev 8995)
@@ -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="2.6" />
<Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide26AppPool">
<RegistrySearch
Deleted: branches/2.6/Installer/Support/Web/x64/php-5.5.33-x64-VC11.zip
===================================================================
(Binary files differ)
Copied: branches/2.6/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: branches/2.6/Installer/Support/Web/x86/php-5.5.33-x86-VC11.zip
===================================================================
(Binary files differ)
Copied: branches/2.6/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: branches/2.6/Installer/build.bat
===================================================================
--- branches/2.6/Installer/build.bat 2016-07-26 15:56:22 UTC (rev 8994)
+++ branches/2.6/Installer/build.bat 2016-07-26 15:56:42 UTC (rev 8995)
@@ -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%
More information about the mapguide-commits
mailing list