[mapguide-commits] r8918 - in branches/3.0/Installer: . Installers/MapGuide Support/Web/x64 Support/Web/x86

[svn_mapguide at osgeo.org]

Author: jng
Date: 2016-04-13 06:15:49 -0700 (Wed, 13 Apr 2016)
New Revision: 8918

Added:
   branches/3.0/Installer/Support/Web/x64/httpd-2.4.18-x64-VC11.zip
   branches/3.0/Installer/Support/Web/x64/php-5.5.33-x64-VC11.zip
   branches/3.0/Installer/Support/Web/x86/httpd-2.4.18-x86-VC11.zip
   branches/3.0/Installer/Support/Web/x86/php-5.5.33-x86-VC11.zip
Removed:
   branches/3.0/Installer/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
   branches/3.0/Installer/Support/Web/x64/php-5.5.17-x64-VC11.zip
   branches/3.0/Installer/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
   branches/3.0/Installer/Support/Web/x86/php-5.5.17-x86-VC11.zip
Modified:
   branches/3.0/Installer/
   branches/3.0/Installer/Installers/MapGuide/MapGuide.wxs
   branches/3.0/Installer/Support/Web/x64/mod_jk.so
   branches/3.0/Installer/Support/Web/x86/mod_jk.so
   branches/3.0/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
........

Merge commit tweaked to exclude MSVC 2015 changes


Property changes on: branches/3.0/Installer
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/Installer:6987-6988
   + /branches/2.4/Installer:6987-6988
/sandbox/jng/rfc155_installer:8877

Modified: branches/3.0/Installer/Installers/MapGuide/MapGuide.wxs
===================================================================
--- branches/3.0/Installer/Installers/MapGuide/MapGuide.wxs	2016-04-13 13:14:27 UTC (rev 8917)
+++ branches/3.0/Installer/Installers/MapGuide/MapGuide.wxs	2016-04-13 13:15:49 UTC (rev 8918)
@@ -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.10" />
-        <Property Id="PHP_VERSION" Secure="yes" Value="5.5.17" />
+        <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="3.0" />
         <Property Id="APP_POOL_NAME" Secure="yes" Value="MapGuide30AppPool">
             <RegistrySearch

Deleted: branches/3.0/Installer/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
===================================================================
(Binary files differ)

Copied: branches/3.0/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/3.0/Installer/Support/Web/x64/mod_jk.so
===================================================================
(Binary files differ)

Deleted: branches/3.0/Installer/Support/Web/x64/php-5.5.17-x64-VC11.zip
===================================================================
(Binary files differ)

Copied: branches/3.0/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)

Deleted: branches/3.0/Installer/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
===================================================================
(Binary files differ)

Copied: branches/3.0/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/3.0/Installer/Support/Web/x86/mod_jk.so
===================================================================
(Binary files differ)

Deleted: branches/3.0/Installer/Support/Web/x86/php-5.5.17-x86-VC11.zip
===================================================================
(Binary files differ)

Copied: branches/3.0/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/3.0/Installer/build.bat
===================================================================
--- branches/3.0/Installer/build.bat	2016-04-13 13:14:27 UTC (rev 8917)
+++ branches/3.0/Installer/build.bat	2016-04-13 13:15:49 UTC (rev 8918)
@@ -80,9 +80,9 @@
 rem ==================================================
 rem Web dependencies
 rem ==================================================
-SET HTTPD_VERSION=2.4.10
-SET PHP_VERSION=5.5.17
-SET TOMCAT_VERSION=7.0.56
+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