[mapguide-commits] r8977 - in sandbox/jng/php56x: . Oem/LinuxApt Oem/jsoncpp/src/lib_json 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
Mon Jul 11 10:07:34 PDT 2016 

Author: jng
Date: 2016-07-11 10:07:34 -0700 (Mon, 11 Jul 2016)
New Revision: 8977

Added:
   sandbox/jng/php56x/Oem/LinuxApt/php-5.6.23.tar.bz2
Removed:
   sandbox/jng/php56x/Oem/LinuxApt/php-5.5.33.tar.bz2
Modified:
   sandbox/jng/php56x/Oem/LinuxApt/build_apt.sh
   sandbox/jng/php56x/Oem/jsoncpp/src/lib_json/lib_json.vcxproj
   sandbox/jng/php56x/Oem/php/Release_TS/php5ts.lib
   sandbox/jng/php56x/Oem/php/Zend/zend_config.w32.h
   sandbox/jng/php56x/Oem/php/main/win95nt.h
   sandbox/jng/php56x/Oem/php/x64/Release_TS/php5ts.lib
   sandbox/jng/php56x/configure.in
   sandbox/jng/php56x/prepare_webtier_components.bat
   sandbox/jng/php56x/setenvironment.bat
   sandbox/jng/php56x/setenvironment64.bat
Log:
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

Modified: sandbox/jng/php56x/Oem/LinuxApt/build_apt.sh
===================================================================
--- sandbox/jng/php56x/Oem/LinuxApt/build_apt.sh	2016-07-11 13:28:46 UTC (rev 8976)
+++ sandbox/jng/php56x/Oem/LinuxApt/build_apt.sh	2016-07-11 17:07:34 UTC (rev 8977)
@@ -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: sandbox/jng/php56x/Oem/LinuxApt/php-5.5.33.tar.bz2
===================================================================
(Binary files differ)

Added: sandbox/jng/php56x/Oem/LinuxApt/php-5.6.23.tar.bz2
===================================================================
(Binary files differ)


Property changes on: sandbox/jng/php56x/Oem/LinuxApt/php-5.6.23.tar.bz2
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: sandbox/jng/php56x/Oem/jsoncpp/src/lib_json/lib_json.vcxproj
===================================================================
--- sandbox/jng/php56x/Oem/jsoncpp/src/lib_json/lib_json.vcxproj	2016-07-11 13:28:46 UTC (rev 8976)
+++ sandbox/jng/php56x/Oem/jsoncpp/src/lib_json/lib_json.vcxproj	2016-07-11 17:07:34 UTC (rev 8977)
@@ -187,7 +187,6 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

Modified: sandbox/jng/php56x/Oem/php/Release_TS/php5ts.lib
===================================================================
(Binary files differ)

Modified: sandbox/jng/php56x/Oem/php/Zend/zend_config.w32.h
===================================================================
--- sandbox/jng/php56x/Oem/php/Zend/zend_config.w32.h	2016-07-11 13:28:46 UTC (rev 8976)
+++ sandbox/jng/php56x/Oem/php/Zend/zend_config.w32.h	2016-07-11 17:07:34 UTC (rev 8977)
@@ -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: sandbox/jng/php56x/Oem/php/main/win95nt.h
===================================================================
--- sandbox/jng/php56x/Oem/php/main/win95nt.h	2016-07-11 13:28:46 UTC (rev 8976)
+++ sandbox/jng/php56x/Oem/php/main/win95nt.h	2016-07-11 17:07:34 UTC (rev 8977)
@@ -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: sandbox/jng/php56x/Oem/php/x64/Release_TS/php5ts.lib
===================================================================
(Binary files differ)

Modified: sandbox/jng/php56x/configure.in
===================================================================
--- sandbox/jng/php56x/configure.in	2016-07-11 13:28:46 UTC (rev 8976)
+++ sandbox/jng/php56x/configure.in	2016-07-11 17:07:34 UTC (rev 8977)
@@ -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: sandbox/jng/php56x/prepare_webtier_components.bat
===================================================================
--- sandbox/jng/php56x/prepare_webtier_components.bat	2016-07-11 13:28:46 UTC (rev 8976)
+++ sandbox/jng/php56x/prepare_webtier_components.bat	2016-07-11 17:07:34 UTC (rev 8977)
@@ -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: sandbox/jng/php56x/setenvironment.bat
===================================================================
--- sandbox/jng/php56x/setenvironment.bat	2016-07-11 13:28:46 UTC (rev 8976)
+++ sandbox/jng/php56x/setenvironment.bat	2016-07-11 17:07:34 UTC (rev 8977)
@@ -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: sandbox/jng/php56x/setenvironment64.bat
===================================================================
--- sandbox/jng/php56x/setenvironment64.bat	2016-07-11 13:28:46 UTC (rev 8976)
+++ sandbox/jng/php56x/setenvironment64.bat	2016-07-11 17:07:34 UTC (rev 8977)
@@ -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