[mapguide-commits] r8988 - in trunk/MgDev: . Oem/LinuxApt Oem/php/Release_TS Oem/php/Zend Oem/php/main Oem/php/x64/Release_TS

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Jul 26 04:37:15 PDT 2016 

Author: jng
Date: 2016-07-26 04:37:15 -0700 (Tue, 26 Jul 2016)
New Revision: 8988

Added:
   trunk/MgDev/Oem/LinuxApt/php-5.6.23.tar.bz2
Removed:
   trunk/MgDev/Oem/LinuxApt/php-5.5.33.tar.bz2
Modified:
   trunk/MgDev/
   trunk/MgDev/Oem/LinuxApt/
   trunk/MgDev/Oem/LinuxApt/build_apt.sh
   trunk/MgDev/Oem/php/Release_TS/php5ts.lib
   trunk/MgDev/Oem/php/Zend/zend_config.w32.h
   trunk/MgDev/Oem/php/main/win95nt.h
   trunk/MgDev/Oem/php/x64/Release_TS/php5ts.lib
   trunk/MgDev/configure.in
   trunk/MgDev/prepare_webtier_components.bat
   trunk/MgDev/setenvironment.bat
   trunk/MgDev/setenvironment64.bat
Log:
Merged revision(s) 8975-8985 from sandbox/jng/php56x:
........
PHP 5.6 updates
 - Update tarball in LinuxApt?
 - Update import libs
 - Update PHP versions in
    - build_apt.sh
    - configure.in
    - prepare_webtier_components.bat
    - setenvironment[64].bat



Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8869-8871
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8869-8871


Property changes on: trunk/MgDev/Oem/LinuxApt
___________________________________________________________________
Modified: svn:ignore
   - httpd-2.4.9
php-5.5.11
*.tar
php-5.5.17
httpd-2.4.10
httpd-2.4.18
php-5.5.33

   + httpd-2.4.9
php-5.5.11
*.tar
php-5.5.17
httpd-2.4.10
httpd-2.4.18
php-5.5.33
php-5.6.23


Modified: trunk/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- trunk/MgDev/Oem/LinuxApt/build_apt.sh	2016-07-13 13:20:04 UTC (rev 8987)
+++ trunk/MgDev/Oem/LinuxApt/build_apt.sh	2016-07-26 11:37:15 UTC (rev 8988)
@@ -16,7 +16,7 @@
 INSTALLDIR=/usr/local/mapguideopensource
 
 HTTPD_VER=2.4.18
-PHP_VER=5.5.33
+PHP_VER=5.6.23
 TOMCAT_VER=7.0.68
 CONNECTOR_VER=1.2.41
 APR_VER=1.5.2

Deleted: trunk/MgDev/Oem/LinuxApt/php-5.5.33.tar.bz2
===================================================================
(Binary files differ)

Copied: trunk/MgDev/Oem/LinuxApt/php-5.6.23.tar.bz2 (from rev 8985, sandbox/jng/php56x/Oem/LinuxApt/php-5.6.23.tar.bz2)
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/php/Release_TS/php5ts.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/php/Zend/zend_config.w32.h
===================================================================
--- trunk/MgDev/Oem/php/Zend/zend_config.w32.h	2016-07-13 13:20:04 UTC (rev 8987)
+++ trunk/MgDev/Oem/php/Zend/zend_config.w32.h	2016-07-26 11:37:15 UTC (rev 8988)
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
+   | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -15,6 +15,8 @@
    | Authors: Andi Gutmans <andi at zend.com>                                |
    |          Zeev Suraski <zeev at zend.com>                                |
    +----------------------------------------------------------------------+
+   | MapGuide Changes: MSVC 2015 #ifdef guard for snprintf
+   +----------------------------------------------------------------------
 */
 
 /* $Id$ */

Modified: trunk/MgDev/Oem/php/main/win95nt.h
===================================================================
--- trunk/MgDev/Oem/php/main/win95nt.h	2016-07-13 13:20:04 UTC (rev 8987)
+++ trunk/MgDev/Oem/php/main/win95nt.h	2016-07-26 11:37:15 UTC (rev 8988)
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2013 The PHP Group                                |
+  | Copyright (c) 1997-2016 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |

Modified: trunk/MgDev/Oem/php/x64/Release_TS/php5ts.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/configure.in
===================================================================
--- trunk/MgDev/configure.in	2016-07-13 13:20:04 UTC (rev 8987)
+++ trunk/MgDev/configure.in	2016-07-26 11:37:15 UTC (rev 8988)
@@ -39,7 +39,7 @@
 map_opt_oem_distsubdirs=""
 
 dnl *******************************************************
-dnl PHP 5.5.33 Configuration
+dnl PHP 5.6.23 Configuration
 dnl *******************************************************
 AC_ARG_WITH([php],
         MAP_HELP_STRING([--with-php],
@@ -48,8 +48,8 @@
         [with_php=no])
 
 if test $with_php = "no"; then
-    AC_MSG_NOTICE([Using php 5.5.33 from included Oem Directory])
-	php_src=`pwd`/Oem/LinuxApt/php-5.5.33
+    AC_MSG_NOTICE([Using php 5.6.23 from included Oem Directory])
+	php_src=`pwd`/Oem/LinuxApt/php-5.6.23
 else
     AC_MSG_NOTICE([Using custom PHP source directory])
 	php_src=$with_php

Modified: trunk/MgDev/prepare_webtier_components.bat
===================================================================
--- trunk/MgDev/prepare_webtier_components.bat	2016-07-13 13:20:04 UTC (rev 8987)
+++ trunk/MgDev/prepare_webtier_components.bat	2016-07-26 11:37:15 UTC (rev 8988)
@@ -1,7 +1,7 @@
 @echo off
 SET SEVENZ=%CD%\BuildTools\WebTools\7-zip\7z.exe
 SET HTTPD_VER=2.4.18
-SET PHP_VER=5.5.33
+SET PHP_VER=5.6.23
 pushd Oem\LinuxApt
 :check_httpd
 if not exist httpd-%HTTPD_VER% goto unpack_httpd

Modified: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat	2016-07-13 13:20:04 UTC (rev 8987)
+++ trunk/MgDev/setenvironment.bat	2016-07-26 11:37:15 UTC (rev 8988)
@@ -101,7 +101,7 @@
 call prepare_webtier_components.bat
 
 rem Set the env vars that VS will reference
-SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.33
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.6.23
 SET PHP_LIB=%MG_OEM%\php\Release_TS
 SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.18
 SET HTTPD_LIB=%MG_OEM%\httpd\lib

Modified: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat	2016-07-13 13:20:04 UTC (rev 8987)
+++ trunk/MgDev/setenvironment64.bat	2016-07-26 11:37:15 UTC (rev 8988)
@@ -106,7 +106,7 @@
 call prepare_webtier_components.bat
 
 rem Set the env vars that VS will reference
-SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.33
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.6.23
 SET PHP_LIB=%MG_OEM%\php\x64\Release_TS
 SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.18
 SET HTTPD_LIB=%MG_OEM%\httpd\lib64

More information about the mapguide-commits mailing list