[mapguide-commits] r8994 - in branches/2.6/MgDev: . Oem/LinuxApt Oem/php/Release_TS Oem/php/main Oem/php/x64/Release_TS

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Jul 26 08:56:23 PDT 2016 

Author: jng
Date: 2016-07-26 08:56:22 -0700 (Tue, 26 Jul 2016)
New Revision: 8994

Added:
   branches/2.6/MgDev/Oem/LinuxApt/php-5.6.23.tar.bz2
Removed:
   branches/2.6/MgDev/Oem/LinuxApt/php-5.5.33.tar.bz2
Modified:
   branches/2.6/MgDev/
   branches/2.6/MgDev/Oem/LinuxApt/
   branches/2.6/MgDev/Oem/LinuxApt/build_apt.sh
   branches/2.6/MgDev/Oem/php/Release_TS/php5ts.lib
   branches/2.6/MgDev/Oem/php/main/win95nt.h
   branches/2.6/MgDev/Oem/php/x64/Release_TS/php5ts.lib
   branches/2.6/MgDev/configure.in
   branches/2.6/MgDev/prepare_webtier_components.bat
   branches/2.6/MgDev/setenvironment.bat
   branches/2.6/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: branches/2.6/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/3.0/MgDev:8658,8958-8959
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625
/sandbox/adsk/3.1n:8871,8912,8921-8922,8942
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/rfc155:8874-8884
/sandbox/rfc94:5099-5163
/trunk/MgDev:8209-8210,8230,8313,8333,8359,8388,8392,8423,8433,8439,8443-8444,8518-8519,8567-8568,8571,8588-8589,8595,8616-8618,8626,8682,8728,8844,8956,8980
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/3.0/MgDev:8658,8958-8959
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625
/sandbox/adsk/3.1n:8871,8912,8921-8922,8942
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8874-8884
/sandbox/rfc94:5099-5163
/trunk/MgDev:8209-8210,8230,8313,8333,8359,8388,8392,8423,8433,8439,8443-8444,8518-8519,8567-8568,8571,8588-8589,8595,8616-8618,8626,8682,8728,8844,8956,8980


Property changes on: branches/2.6/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: branches/2.6/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- branches/2.6/MgDev/Oem/LinuxApt/build_apt.sh	2016-07-26 12:26:27 UTC (rev 8993)
+++ branches/2.6/MgDev/Oem/LinuxApt/build_apt.sh	2016-07-26 15:56:22 UTC (rev 8994)
@@ -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: branches/2.6/MgDev/Oem/LinuxApt/php-5.5.33.tar.bz2
===================================================================
(Binary files differ)

Copied: branches/2.6/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: branches/2.6/MgDev/Oem/php/Release_TS/php5ts.lib
===================================================================
(Binary files differ)

Modified: branches/2.6/MgDev/Oem/php/main/win95nt.h
===================================================================
--- branches/2.6/MgDev/Oem/php/main/win95nt.h	2016-07-26 12:26:27 UTC (rev 8993)
+++ branches/2.6/MgDev/Oem/php/main/win95nt.h	2016-07-26 15:56:22 UTC (rev 8994)
@@ -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: branches/2.6/MgDev/Oem/php/x64/Release_TS/php5ts.lib
===================================================================
(Binary files differ)

Modified: branches/2.6/MgDev/configure.in
===================================================================
--- branches/2.6/MgDev/configure.in	2016-07-26 12:26:27 UTC (rev 8993)
+++ branches/2.6/MgDev/configure.in	2016-07-26 15:56:22 UTC (rev 8994)
@@ -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: branches/2.6/MgDev/prepare_webtier_components.bat
===================================================================
--- branches/2.6/MgDev/prepare_webtier_components.bat	2016-07-26 12:26:27 UTC (rev 8993)
+++ branches/2.6/MgDev/prepare_webtier_components.bat	2016-07-26 15:56:22 UTC (rev 8994)
@@ -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: branches/2.6/MgDev/setenvironment.bat
===================================================================
--- branches/2.6/MgDev/setenvironment.bat	2016-07-26 12:26:27 UTC (rev 8993)
+++ branches/2.6/MgDev/setenvironment.bat	2016-07-26 15:56:22 UTC (rev 8994)
@@ -99,7 +99,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: branches/2.6/MgDev/setenvironment64.bat
===================================================================
--- branches/2.6/MgDev/setenvironment64.bat	2016-07-26 12:26:27 UTC (rev 8993)
+++ branches/2.6/MgDev/setenvironment64.bat	2016-07-26 15:56:22 UTC (rev 8994)
@@ -104,7 +104,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