[mapguide-commits] r8917 - in branches/2.6/Installer: . Installers/MapGuide Support/Web/x64 Support/Web/x86
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Apr 13 06:14:27 PDT 2016
Author: jng
Date: 2016-04-13 06:14:27 -0700 (Wed, 13 Apr 2016)
New Revision: 8917
Added:
branches/2.6/Installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip
branches/2.6/Installer/Support/Web/x64/php-5.5.33-x64-VC11.zip
branches/2.6/Installer/Support/Web/x86/httpd-2.4.18-x86-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/Support/Web/x64/mod_jk.so
branches/2.6/Installer/Support/Web/x86/mod_jk.so
branches/2.6/Installer/build.bat
Log:
Merged revision(s) 8877 from sandbox/jng/rfc155_installer:
Update windows installer binaries
- PHP 5.5.17 -> 5.5.33
- httpd 2.4.10 -> 2.4.18
- mod_jk.so 1.2.40 -> 1.2.41
........
Tweaked merge commit to exclude the MSVC 2015 changes
Property changes on: branches/2.6/Installer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/Installer:6987-6988
+ /branches/2.4/Installer:6987-6988
/sandbox/jng/rfc155_installer:8877
Modified: branches/2.6/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- branches/2.6/Installer/Installers/MapGuide/MapGuide.wxs 2016-04-13 13:10:12 UTC (rev 8916)
+++ branches/2.6/Installer/Installers/MapGuide/MapGuide.wxs 2016-04-13 13:14:27 UTC (rev 8917)
@@ -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.6" />
- <Property Id="PHP_VERSION" Secure="yes" Value="5.5.3" />
+ <Property Id="APACHE_VERSION" Secure="yes" Value="2.4.18" />
+ <Property Id="PHP_VERSION" Secure="yes" Value="5.5.33" />
<Property Id="MG_VERSION_MAJOR_MINOR" Secure="yes" Value="2.6" />
<Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide26AppPool">
<RegistrySearch
Copied: branches/2.6/Installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip (from rev 8877, sandbox/jng/rfc155_installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip)
===================================================================
(Binary files differ)
Modified: branches/2.6/Installer/Support/Web/x64/mod_jk.so
===================================================================
(Binary files differ)
Copied: branches/2.6/Installer/Support/Web/x64/php-5.5.33-x64-VC11.zip (from rev 8877, sandbox/jng/rfc155_installer/Support/Web/x64/php-5.5.33-x64-VC11.zip)
===================================================================
(Binary files differ)
Copied: branches/2.6/Installer/Support/Web/x86/httpd-2.4.18-x86-VC11.zip (from rev 8877, sandbox/jng/rfc155_installer/Support/Web/x86/httpd-2.4.18-x86-VC11.zip)
===================================================================
(Binary files differ)
Modified: branches/2.6/Installer/Support/Web/x86/mod_jk.so
===================================================================
(Binary files differ)
Copied: branches/2.6/Installer/Support/Web/x86/php-5.5.33-x86-VC11.zip (from rev 8877, sandbox/jng/rfc155_installer/Support/Web/x86/php-5.5.33-x86-VC11.zip)
===================================================================
(Binary files differ)
Modified: branches/2.6/Installer/build.bat
===================================================================
--- branches/2.6/Installer/build.bat 2016-04-13 13:10:12 UTC (rev 8916)
+++ branches/2.6/Installer/build.bat 2016-04-13 13:14:27 UTC (rev 8917)
@@ -80,9 +80,9 @@
rem ==================================================
rem Web dependencies
rem ==================================================
-SET HTTPD_VERSION=2.4.9
-SET PHP_VERSION=5.5.11
-SET TOMCAT_VERSION=7.0.42
+SET HTTPD_VERSION=2.4.18
+SET PHP_VERSION=5.5.33
+SET TOMCAT_VERSION=7.0.68
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