[mapguide-commits] r8430 - in trunk/MgDev: . Oem/LinuxApt

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Oct 21 08:23:53 PDT 2014 

Author: jng
Date: 2014-10-21 08:23:52 -0700 (Tue, 21 Oct 2014)
New Revision: 8430

Added:
   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/apr-util-1.5.4.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
Removed:
   trunk/MgDev/Oem/LinuxApt/apache-tomcat-7.0.42.tar.gz
   trunk/MgDev/Oem/LinuxApt/apr-1.4.8.tar.bz2
   trunk/MgDev/Oem/LinuxApt/apr-util-1.5.2.tar.bz2
   trunk/MgDev/Oem/LinuxApt/httpd-2.4.9.tar.bz2
   trunk/MgDev/Oem/LinuxApt/php-5.5.11.tar.bz2
   trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.37-src.tar.gz
Modified:
   trunk/MgDev/Oem/LinuxApt/build_apt.sh
   trunk/MgDev/prepare_webtier_components.bat
   trunk/MgDev/setenvironment.bat
   trunk/MgDev/setenvironment64.bat
Log:
RFC 147: Update Apache, Tomcat and PHP tarballs in LinuxApt. Update our windows batch files to match these updated versions. This may or may not break the linux build. Will follow up after this submission.

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

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


Property changes on: trunk/MgDev/Oem/LinuxApt/apache-tomcat-7.0.56.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

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

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


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

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

Added: trunk/MgDev/Oem/LinuxApt/apr-util-1.5.4.tar.bz2
===================================================================
(Binary files differ)


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

Modified: trunk/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- trunk/MgDev/Oem/LinuxApt/build_apt.sh	2014-10-21 15:09:59 UTC (rev 8429)
+++ trunk/MgDev/Oem/LinuxApt/build_apt.sh	2014-10-21 15:23:52 UTC (rev 8430)
@@ -15,8 +15,8 @@
 
 INSTALLDIR=/usr/local/mapguideopensource
 
-HTTPD_VER=2.4.9
-PHP_VER=5.5.11
+HTTPD_VER=2.4.10
+PHP_VER=5.5.17
 PORT=8008
 TOMCAT=0
 TOMCAT_PORT=8009
@@ -144,12 +144,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.4.8.tar.bz2
-	mv apr-1.4.8 httpd-$HTTPD_VER/srclib/apr
+	tar -jxf apr-1.5.1.tar.bz2
+	mv apr-1.5.1 httpd-$HTTPD_VER/srclib/apr
 fi
 if [ ! -d "httpd-$HTTPD_VER/srclib/aprutil" ]; then
-	tar -jxf apr-util-1.5.2.tar.bz2
-	mv apr-util-1.5.2 httpd-$HTTPD_VER/srclib/apr-util
+	tar -jxf apr-util-1.5.4.tar.bz2
+	mv apr-util-1.5.4 httpd-$HTTPD_VER/srclib/apr-util
 fi
 pushd httpd-$HTTPD_VER
 ./configure --prefix=$INSTALLWEB/apache2 --enable-mods-shared=all \
@@ -255,8 +255,8 @@
 #**********************************************************
 if [ "$TOMCAT" = "1" ]; then
 echo "Tomcat connector build/install started"
-tar -zxf tomcat-connectors-1.2.37-src.tar.gz
-pushd tomcat-connectors-1.2.37-src/native
+tar -zxf tomcat-connectors-1.2.40-src.tar.gz
+pushd tomcat-connectors-1.2.40-src/native
 
 ./configure --with-apxs=$INSTALLWEB/apache2/bin/apxs
 check_tomcat_build
@@ -274,10 +274,10 @@
 #**********************************************************
 if [ "$TOMCAT" = "1" ]; then
 echo "Tomcat install started"
-tar -zxf apache-tomcat-7.0.42.tar.gz -C $INSTALLWEB
+tar -zxf apache-tomcat-7.0.56.tar.gz -C $INSTALLWEB
 check_tomcat_install
 pushd $INSTALLWEB
-mv apache-tomcat-7.0.42 tomcat
+mv apache-tomcat-7.0.56 tomcat
 check_tomcat_install
 popd
 echo "Tomcat install completed"

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


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

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

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

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


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

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

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


Property changes on: trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.40-src.tar.gz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/MgDev/prepare_webtier_components.bat
===================================================================
--- trunk/MgDev/prepare_webtier_components.bat	2014-10-21 15:09:59 UTC (rev 8429)
+++ trunk/MgDev/prepare_webtier_components.bat	2014-10-21 15:23:52 UTC (rev 8430)
@@ -1,7 +1,7 @@
 @echo off
 SET SEVENZ=%CD%\BuildTools\WebTools\7-zip\7z.exe
-SET HTTPD_VER=2.4.9
-SET PHP_VER=5.5.11
+SET HTTPD_VER=2.4.10
+SET PHP_VER=5.5.17
 pushd Oem\LinuxApt
 :check_httpd
 if not exist httpd-%HTTPD_VER% goto unpack_httpd

Modified: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat	2014-10-21 15:09:59 UTC (rev 8429)
+++ trunk/MgDev/setenvironment.bat	2014-10-21 15:23:52 UTC (rev 8430)
@@ -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.11
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.17
 SET PHP_LIB=%MG_OEM%\php\Release_TS
-SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.9
+SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.10
 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-10-21 15:09:59 UTC (rev 8429)
+++ trunk/MgDev/setenvironment64.bat	2014-10-21 15:23:52 UTC (rev 8430)
@@ -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.11
+SET PHP_SRC=%MG_OEM%\LinuxApt\php-5.5.17
 SET PHP_LIB=%MG_OEM%\php\x64\Release_TS
-SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.9
+SET HTTPD_SRC=%MG_OEM%\LinuxApt\httpd-2.4.10
 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