[mapguide-commits] r8026 - in trunk/MgDev: . Oem/LinuxApt Oem/httpd Oem/httpd/lib Oem/httpd/lib64 Oem/php Oem/php/Release_TS Oem/php/x64/Release_TS

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Wed Apr 9 18:23:58 PDT 2014 

Author: jng
Date: 2014-04-09 18:23:58 -0700 (Wed, 09 Apr 2014)
New Revision: 8026

Added:
   trunk/MgDev/Oem/LinuxApt/httpd-2.4.9.tar.bz2
   trunk/MgDev/Oem/LinuxApt/php-5.5.11.tar.bz2
Removed:
   trunk/MgDev/Oem/LinuxApt/httpd-2.4.6.tar.bz2
   trunk/MgDev/Oem/LinuxApt/php-5.5.3.tar.bz2
Modified:
   trunk/MgDev/Oem/LinuxApt/build_apt.sh
   trunk/MgDev/Oem/httpd/PROVENANCE.TXT
   trunk/MgDev/Oem/httpd/lib/apr-1.lib
   trunk/MgDev/Oem/httpd/lib/aprutil-1.lib
   trunk/MgDev/Oem/httpd/lib/libapr-1.exp
   trunk/MgDev/Oem/httpd/lib/libapr-1.lib
   trunk/MgDev/Oem/httpd/lib/libapriconv-1.exp
   trunk/MgDev/Oem/httpd/lib/libapriconv-1.lib
   trunk/MgDev/Oem/httpd/lib/libaprutil-1.exp
   trunk/MgDev/Oem/httpd/lib/libaprutil-1.lib
   trunk/MgDev/Oem/httpd/lib/libhttpd.exp
   trunk/MgDev/Oem/httpd/lib/libhttpd.lib
   trunk/MgDev/Oem/httpd/lib/mod_dav.exp
   trunk/MgDev/Oem/httpd/lib/mod_dav.lib
   trunk/MgDev/Oem/httpd/lib/xml.lib
   trunk/MgDev/Oem/httpd/lib64/apr-1.lib
   trunk/MgDev/Oem/httpd/lib64/aprutil-1.lib
   trunk/MgDev/Oem/httpd/lib64/libapr-1.exp
   trunk/MgDev/Oem/httpd/lib64/libapr-1.lib
   trunk/MgDev/Oem/httpd/lib64/libapriconv-1.exp
   trunk/MgDev/Oem/httpd/lib64/libapriconv-1.lib
   trunk/MgDev/Oem/httpd/lib64/libaprutil-1.exp
   trunk/MgDev/Oem/httpd/lib64/libaprutil-1.lib
   trunk/MgDev/Oem/httpd/lib64/libhttpd.exp
   trunk/MgDev/Oem/httpd/lib64/libhttpd.lib
   trunk/MgDev/Oem/httpd/lib64/mod_dav.exp
   trunk/MgDev/Oem/httpd/lib64/mod_dav.lib
   trunk/MgDev/Oem/httpd/lib64/xml.lib
   trunk/MgDev/Oem/php/PROVENANCE.TXT
   trunk/MgDev/Oem/php/Release_TS/php5ts.lib
   trunk/MgDev/Oem/php/x64/Release_TS/php5ts.lib
   trunk/MgDev/prepare_webtier_components.bat
   trunk/MgDev/setenvironment.bat
   trunk/MgDev/setenvironment64.bat
Log:
#2425: Update Apache to 2.4.9 and PHP to 5.5.11

Modified: trunk/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- trunk/MgDev/Oem/LinuxApt/build_apt.sh	2014-04-09 15:44:36 UTC (rev 8025)
+++ trunk/MgDev/Oem/LinuxApt/build_apt.sh	2014-04-10 01:23:58 UTC (rev 8026)
@@ -15,6 +15,8 @@
 
 INSTALLDIR=/usr/local/mapguideopensource
 
+HTTPD_VER=2.4.9
+PHP_VER=5.5.11
 PORT=8008
 TOMCAT=0
 TOMCAT_PORT=8009
@@ -140,16 +142,16 @@
 # equivalent library in other Linux distributions
 #**********************************************************
 echo "Apache Httpd build started"
-tar -jxf httpd-2.4.6.tar.bz2
-if [ ! -d "httpd-2.4.6/srclib/apr" ]; then
+tar -jxf httpd-$HTTP_VER.tar.bz2
+if [ ! -d "httpd-$HTTP_VER/srclib/apr" ]; then
 	tar -jxf apr-1.4.8.tar.bz2
-	mv apr-1.4.8 httpd-2.4.6/srclib/apr
+	mv apr-1.4.8 httpd-$HTTP_VER/srclib/apr
 fi
-if [ ! -d "httpd-2.4.6/srclib/aprutil" ]; then
+if [ ! -d "httpd-$HTTP_VER/srclib/aprutil" ]; then
 	tar -jxf apr-util-1.5.2.tar.bz2
-	mv apr-util-1.5.2 httpd-2.4.6/srclib/apr-util
+	mv apr-util-1.5.2 httpd-$HTTP_VER/srclib/apr-util
 fi
-pushd httpd-2.4.6
+pushd httpd-$HTTP_VER
 ./configure --prefix=$INSTALLWEB/apache2 --enable-mods-shared=all \
 --with-included-apr --with-port=$PORT
 check_apache_build
@@ -181,7 +183,7 @@
 # Notes: none
 #**********************************************************
 echo "Apache install started"
-pushd httpd-2.4.6
+pushd httpd-$HTTP_VER
 make install
 check_apache_install
 popd
@@ -225,8 +227,8 @@
 # Notes: none
 #**********************************************************
 echo "Php build started"
-tar -jxf php-5.5.3.tar.bz2
-pushd php-5.5.3
+tar -jxf php-$PHP_VER.tar.bz2
+pushd php-$PHP_VER
 ./configure --prefix=$INSTALLWEB/php --with-apxs2=$INSTALLWEB/apache2/bin/apxs --with-openssl \
 --with-curl --enable-xml --enable-wddx --enable-shared  \
 --enable-safe-mode --with-zlib --enable-zip --enable-mbstring=all --with-xsl=/usr/lib --with-gd --with-png --with-jpeg --with-freetype
@@ -241,7 +243,7 @@
 # Notes: none
 #**********************************************************
 echo "Php install started"
-pushd php-5.5.3
+pushd php-$PHP_VER
 make install
 check_php_install
 popd

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

Added: trunk/MgDev/Oem/LinuxApt/httpd-2.4.9.tar.bz2
===================================================================
(Binary files differ)


Property changes on: trunk/MgDev/Oem/LinuxApt/httpd-2.4.9.tar.bz2
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

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


Property changes on: trunk/MgDev/Oem/LinuxApt/php-5.5.11.tar.bz2
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

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

Modified: trunk/MgDev/Oem/httpd/PROVENANCE.TXT
===================================================================
--- trunk/MgDev/Oem/httpd/PROVENANCE.TXT	2014-04-09 15:44:36 UTC (rev 8025)
+++ trunk/MgDev/Oem/httpd/PROVENANCE.TXT	2014-04-10 01:23:58 UTC (rev 8026)
@@ -1,7 +1,7 @@
 lib
 lib64
 	
-	Extracted from httpd-2.4.6 win32 and win64 binaries from http://www.apachelounge.com/download/
+	Extracted from httpd-2.4.9 win32 and win64 binaries from http://www.apachelounge.com/download/
 
 include
 

Modified: trunk/MgDev/Oem/httpd/lib/apr-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/aprutil-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/libapr-1.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/libapr-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/libapriconv-1.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/libapriconv-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/libaprutil-1.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/libaprutil-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/libhttpd.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/libhttpd.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/mod_dav.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/mod_dav.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib/xml.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/apr-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/aprutil-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libapr-1.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libapr-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libapriconv-1.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libapriconv-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libaprutil-1.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libaprutil-1.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libhttpd.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/libhttpd.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/mod_dav.exp
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/mod_dav.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/httpd/lib64/xml.lib
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/php/PROVENANCE.TXT
===================================================================
--- trunk/MgDev/Oem/php/PROVENANCE.TXT	2014-04-09 15:44:36 UTC (rev 8025)
+++ trunk/MgDev/Oem/php/PROVENANCE.TXT	2014-04-10 01:23:58 UTC (rev 8026)
@@ -5,7 +5,7 @@
 Release_TS
 x64\Release_TS
 
-	php5ts.lib extracted from official VC11 binary distribution of PHP 5.5.3 (http://windows.php.net/download/)
+	php5ts.lib extracted from official VC11 binary distribution of PHP 5.5.11 (http://windows.php.net/download/)
 
 main\win95nt.h
 

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

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

Modified: trunk/MgDev/prepare_webtier_components.bat
===================================================================
--- trunk/MgDev/prepare_webtier_components.bat	2014-04-09 15:44:36 UTC (rev 8025)
+++ trunk/MgDev/prepare_webtier_components.bat	2014-04-10 01:23:58 UTC (rev 8026)
@@ -1,7 +1,7 @@
 @echo off
 SET SEVENZ=%CD%\BuildTools\WebTools\7-zip\7z.exe
-SET HTTPD_VER=2.4.6
-SET PHP_VER=5.5.3
+SET HTTPD_VER=2.4.9
+SET PHP_VER=5.5.11
 pushd Oem\LinuxApt
 if exist httpd-%HTTPD_VER% (
     echo httpd already unpacked. Nothing to do here.

Modified: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat	2014-04-09 15:44:36 UTC (rev 8025)
+++ trunk/MgDev/setenvironment.bat	2014-04-10 01:23:58 UTC (rev 8026)
@@ -99,9 +99,9 @@
 call prepare_webtier_components.bat
 
 rem Set the env vars that VS will reference
-SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.3
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.11
 SET PHP_LIB=%MG_OEM%\php\Release_TS
-SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.6
+SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.9
 SET HTTPD_LIB=%MG_OEM%\httpd\lib
 rem Sanity checks
 if not exist "%PHP_SRC%" echo Environment variable PHP_SRC does not point to a valid directory (%PHP_SRC%). Please edit setenvironment64.bat to ensure PHP_SRC points to a valid directory

Modified: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat	2014-04-09 15:44:36 UTC (rev 8025)
+++ trunk/MgDev/setenvironment64.bat	2014-04-10 01:23:58 UTC (rev 8026)
@@ -104,9 +104,9 @@
 call prepare_webtier_components.bat
 
 rem Set the env vars that VS will reference
-SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.3
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.11
 SET PHP_LIB=%MG_OEM%\php\x64\Release_TS
-SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.6
+SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.9
 SET HTTPD_LIB=%MG_OEM%\httpd\lib64
 rem Sanity checks
 if not exist "%PHP_SRC%" echo Environment variable PHP_SRC does not point to a valid directory (%PHP_SRC%). Please edit setenvironment64.bat to ensure PHP_SRC points to a valid directory

More information about the mapguide-commits mailing list