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

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Mon Mar 14 09:48:17 PDT 2016


Author: jng
Date: 2016-03-14 09:48:17 -0700 (Mon, 14 Mar 2016)
New Revision: 8885

Added:
   trunk/MgDev/Oem/LinuxApt/apache-tomcat-7.0.68.tar.gz
   trunk/MgDev/Oem/LinuxApt/apr-1.5.2.tar.bz2
   trunk/MgDev/Oem/LinuxApt/httpd-2.4.18.tar.bz2
   trunk/MgDev/Oem/LinuxApt/php-5.5.33.tar.bz2
   trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.41-src.tar.gz
Removed:
   trunk/MgDev/Oem/LinuxApt/apache-tomcat-7.0.56.tar.gz
   trunk/MgDev/Oem/LinuxApt/apr-1.5.1.tar.bz2
   trunk/MgDev/Oem/LinuxApt/httpd-2.4.10.tar.bz2
   trunk/MgDev/Oem/LinuxApt/php-5.5.17.tar.bz2
   trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.40-src.tar.gz
Modified:
   trunk/MgDev/
   trunk/MgDev/Oem/LinuxApt/
   trunk/MgDev/Oem/LinuxApt/build_apt.sh
   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/Release_TS/php5ts.lib
   trunk/MgDev/Oem/php/x64/Release_TS/php5ts.lib
   trunk/MgDev/configure.in
   trunk/MgDev/csmap_excludes.txt
   trunk/MgDev/prepare_webtier_components.bat
   trunk/MgDev/setenvironment.bat
   trunk/MgDev/setenvironment64.bat
Log:
Merged revision(s) 8869-8884 from sandbox/jng/rfc155:
RFC 155 sandbox
........
RFC 155 sandbox for installer
........
LinuxApt updates
 - PHP 5.5.11 -> 5.5.33
 - HTTPD 2.4.10 -> 2.4.18
 - Tomcat 7.0.56 -> 7.0.68
 - apr 1.5.1 -> 1.5.2
 - Tomcat Connectors 1.2.40 -> 1.2.41
........
- Windows .lib file updates for PHP and httpd
- Update version numbers in prepare_webtier_components.bat
........
Update configure.in
........
Update versions in setenvironment[64].bat
........
Merged revision(s) 8658 from branches/3.0/MgDev:
I am committing this updated CS-Map ignore list based on the theory that the big, compression-unfriendly USA grid files are not actually being used by the CS-MAP API surface that is exposed to MapGuide. Running our Coordinate System test suite with Process Monitor watching for any access operations to these specific files backs up this theory (no test failures and .

A discussion about reducing CS-Map installation footprint (http://osgeo-org.1560.x6.nabble.com/Slimming-down-the-CS-Map-distribution-td3853427.html) is what motivated this submission.

With this change, our buildpack archives that were weighing in at around 250MB has been reduced down to 75-95MB. I'm expecting similar size reductions in the installers that would be produced from this work.
........

........
Update prepare_webtier_components.bat to copy patched headers under \zend
........
Update ignore list
........



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:8705,8710
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/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/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
   + /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/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


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.9
php-5.5.11
*.tar
php-5.5.17
httpd-2.4.10
httpd-2.4.18
php-5.5.33


Deleted: trunk/MgDev/Oem/LinuxApt/apache-tomcat-7.0.56.tar.gz
===================================================================
(Binary files differ)

Copied: trunk/MgDev/Oem/LinuxApt/apache-tomcat-7.0.68.tar.gz (from rev 8884, sandbox/jng/rfc155/Oem/LinuxApt/apache-tomcat-7.0.68.tar.gz)
===================================================================
(Binary files differ)

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

Copied: trunk/MgDev/Oem/LinuxApt/apr-1.5.2.tar.bz2 (from rev 8884, sandbox/jng/rfc155/Oem/LinuxApt/apr-1.5.2.tar.bz2)
===================================================================
(Binary files differ)

Modified: trunk/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- trunk/MgDev/Oem/LinuxApt/build_apt.sh	2016-03-14 16:36:52 UTC (rev 8884)
+++ trunk/MgDev/Oem/LinuxApt/build_apt.sh	2016-03-14 16:48:17 UTC (rev 8885)
@@ -15,8 +15,12 @@
 
 INSTALLDIR=/usr/local/mapguideopensource
 
-HTTPD_VER=2.4.10
-PHP_VER=5.5.17
+HTTPD_VER=2.4.18
+PHP_VER=5.5.33
+TOMCAT_VER=7.0.68
+CONNECTOR_VER=1.2.41
+APR_VER=1.5.2
+APR_UTIL_VER=1.5.4
 PORT=8008
 TOMCAT=0
 TOMCAT_PORT=8009
@@ -144,12 +148,12 @@
 echo "Apache Httpd build started"
 tar -jxf httpd-$HTTPD_VER.tar.bz2
 if [ ! -d "httpd-$HTTPD_VER/srclib/apr" ]; then
-	tar -jxf apr-1.5.1.tar.bz2
-	mv apr-1.5.1 httpd-$HTTPD_VER/srclib/apr
+	tar -jxf apr-$APR_VER.tar.bz2
+	mv apr-$APR_VER httpd-$HTTPD_VER/srclib/apr
 fi
 if [ ! -d "httpd-$HTTPD_VER/srclib/aprutil" ]; then
-	tar -jxf apr-util-1.5.4.tar.bz2
-	mv apr-util-1.5.4 httpd-$HTTPD_VER/srclib/apr-util
+	tar -jxf apr-util-$APR_UTIL_VER.tar.bz2
+	mv apr-util-$APR_UTIL_VER httpd-$HTTPD_VER/srclib/apr-util
 fi
 pushd httpd-$HTTPD_VER
 ./configure --prefix=$INSTALLWEB/apache2 --enable-mods-shared=all \
@@ -255,8 +259,8 @@
 #**********************************************************
 if [ "$TOMCAT" = "1" ]; then
 echo "Tomcat connector build/install started"
-tar -zxf tomcat-connectors-1.2.40-src.tar.gz
-pushd tomcat-connectors-1.2.40-src/native
+tar -zxf tomcat-connectors-$CONNECTOR_VER-src.tar.gz
+pushd tomcat-connectors-$CONNECTOR_VER-src/native
 
 ./configure --with-apxs=$INSTALLWEB/apache2/bin/apxs
 check_tomcat_build
@@ -274,10 +278,10 @@
 #**********************************************************
 if [ "$TOMCAT" = "1" ]; then
 echo "Tomcat install started"
-tar -zxf apache-tomcat-7.0.56.tar.gz -C $INSTALLWEB
+tar -zxf apache-tomcat-$TOMCAT_VER.tar.gz -C $INSTALLWEB
 check_tomcat_install
 pushd $INSTALLWEB
-mv apache-tomcat-7.0.56 tomcat
+mv apache-tomcat-$TOMCAT_VER tomcat
 check_tomcat_install
 popd
 echo "Tomcat install completed"

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

Copied: trunk/MgDev/Oem/LinuxApt/httpd-2.4.18.tar.bz2 (from rev 8884, sandbox/jng/rfc155/Oem/LinuxApt/httpd-2.4.18.tar.bz2)
===================================================================
(Binary files differ)

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

Copied: trunk/MgDev/Oem/LinuxApt/php-5.5.33.tar.bz2 (from rev 8884, sandbox/jng/rfc155/Oem/LinuxApt/php-5.5.33.tar.bz2)
===================================================================
(Binary files differ)

Deleted: trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.40-src.tar.gz
===================================================================
(Binary files differ)

Copied: trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.41-src.tar.gz (from rev 8884, sandbox/jng/rfc155/Oem/LinuxApt/tomcat-connectors-1.2.41-src.tar.gz)
===================================================================
(Binary files differ)

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/Release_TS/php5ts.lib
===================================================================
(Binary files differ)

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

Modified: trunk/MgDev/configure.in
===================================================================
--- trunk/MgDev/configure.in	2016-03-14 16:36:52 UTC (rev 8884)
+++ trunk/MgDev/configure.in	2016-03-14 16:48:17 UTC (rev 8885)
@@ -39,7 +39,7 @@
 map_opt_oem_distsubdirs=""
 
 dnl *******************************************************
-dnl PHP 5.5.17 Configuration
+dnl PHP 5.5.33 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.17 from included Oem Directory])
-	php_src=`pwd`/Oem/LinuxApt/php-5.5.17
+    AC_MSG_NOTICE([Using php 5.5.33 from included Oem Directory])
+	php_src=`pwd`/Oem/LinuxApt/php-5.5.33
 else
     AC_MSG_NOTICE([Using custom PHP source directory])
 	php_src=$with_php
@@ -62,7 +62,7 @@
 AC_SUBST(php_src)
 
 dnl *******************************************************
-dnl httpd 2.4.10 Configuration
+dnl httpd 2.4.18 Configuration
 dnl *******************************************************
 AC_ARG_WITH([httpd],
 		MAP_HELP_STRING([--with-httpd],
@@ -71,8 +71,8 @@
 		[with_httpd=no])
 
 if test $with_httpd = "no"; then
-    AC_MSG_NOTICE([Using httpd 2.4.10 from included Oem Directory])
-	httpd_src=`pwd`/Oem/LinuxApt/httpd-2.4.10
+    AC_MSG_NOTICE([Using httpd 2.4.18 from included Oem Directory])
+	httpd_src=`pwd`/Oem/LinuxApt/httpd-2.4.18
 else
     AC_MSG_NOTICE([Using custom httpd source directory])
 	httpd_src=$with_httpd

Modified: trunk/MgDev/csmap_excludes.txt
===================================================================
--- trunk/MgDev/csmap_excludes.txt	2016-03-14 16:36:52 UTC (rev 8884)
+++ trunk/MgDev/csmap_excludes.txt	2016-03-14 16:48:17 UTC (rev 8885)
@@ -11,4 +11,10 @@
 JGD2011V100.par
 .MRT
 compiler.
-cs-map.
\ No newline at end of file
+cs-map.
+Usa\Geoid96
+Usa\Geoid99
+Usa\Geoid03
+Usa\NSRS2007
+Usa\NSRS2011
+WW15MGH.GRD
\ No newline at end of file

Modified: trunk/MgDev/prepare_webtier_components.bat
===================================================================
--- trunk/MgDev/prepare_webtier_components.bat	2016-03-14 16:36:52 UTC (rev 8884)
+++ trunk/MgDev/prepare_webtier_components.bat	2016-03-14 16:48:17 UTC (rev 8885)
@@ -1,7 +1,7 @@
 @echo off
 SET SEVENZ=%CD%\BuildTools\WebTools\7-zip\7z.exe
-SET HTTPD_VER=2.4.10
-SET PHP_VER=5.5.17
+SET HTTPD_VER=2.4.18
+SET PHP_VER=5.5.33
 pushd Oem\LinuxApt
 :check_httpd
 if not exist httpd-%HTTPD_VER% goto unpack_httpd
@@ -49,6 +49,7 @@
 echo Patching PHP headers
 copy /Y ..\php\main\*.h php-%PHP_VER%\main\
 copy /Y ..\php\TSRM\*.h php-%PHP_VER%\TSRM\
+copy /Y ..\php\Zend\*.h php-%PHP_VER%\Zend\
 :patch_httpd_headers
 echo Patching HTTPD headers
 copy /Y ..\httpd\include\*.h httpd-%HTTPD_VER%\include\

Modified: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat	2016-03-14 16:36:52 UTC (rev 8884)
+++ trunk/MgDev/setenvironment.bat	2016-03-14 16:48:17 UTC (rev 8885)
@@ -101,9 +101,9 @@
 call prepare_webtier_components.bat
 
 rem Set the env vars that VS will reference
-SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.17
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.33
 SET PHP_LIB=%MG_OEM%\php\Release_TS
-SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.10
+SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.18
 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	2016-03-14 16:36:52 UTC (rev 8884)
+++ trunk/MgDev/setenvironment64.bat	2016-03-14 16:48:17 UTC (rev 8885)
@@ -106,9 +106,9 @@
 call prepare_webtier_components.bat
 
 rem Set the env vars that VS will reference
-SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.17
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.33
 SET PHP_LIB=%MG_OEM%\php\x64\Release_TS
-SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.10
+SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.18
 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