[mapguide-commits] r4640 - in sandbox/adsk/2.2gp: . Oem/LinuxApt
Web/src/ApacheAgent
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Mar 9 04:39:32 EST 2010
Author: liuar
Date: 2010-03-09 04:39:15 -0500 (Tue, 09 Mar 2010)
New Revision: 4640
Added:
sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2.15.tar.gz
sandbox/adsk/2.2gp/Oem/LinuxApt/tomcat-connectors-1.2.30-src.tar.gz
Removed:
sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2.14.tar.gz
sandbox/adsk/2.2gp/Oem/LinuxApt/tomcat-connectors-1.2.28-src.tar.gz
Modified:
sandbox/adsk/2.2gp/Oem/LinuxApt/build_apt.sh
sandbox/adsk/2.2gp/Web/src/ApacheAgent/ApacheAgent.vcproj
sandbox/adsk/2.2gp/Web/src/ApacheAgent/Makefile.am
sandbox/adsk/2.2gp/build_oem.sh
sandbox/adsk/2.2gp/configure
sandbox/adsk/2.2gp/configure.in
Log:
Submit on behalf of Buddy Hu
1. Upgrade Apache to 2.2.15 on win32 and Linux
2. Upgrade Apache-tomcat-connector to 1.2.30 on win32 and Linux
Modified: sandbox/adsk/2.2gp/Oem/LinuxApt/build_apt.sh
===================================================================
--- sandbox/adsk/2.2gp/Oem/LinuxApt/build_apt.sh 2010-03-09 03:00:19 UTC (rev 4639)
+++ sandbox/adsk/2.2gp/Oem/LinuxApt/build_apt.sh 2010-03-09 09:39:15 UTC (rev 4640)
@@ -120,8 +120,8 @@
# Notes: none
#**********************************************************
echo Apache Httpd build started
-tar -zxf httpd-2.2.14.tar.gz
-pushd httpd-2.2.14
+tar -zxf httpd-2.2.15.tar.gz
+pushd httpd-2.2.15
./configure --prefix=$INSTALLWEB/apache2 --enable-mods-shared=all \
--with-included-apr --with-port=$PORT
check_apache_build
@@ -150,7 +150,7 @@
# Notes: none
#**********************************************************
echo Apache install started
-pushd httpd-2.2.14
+pushd httpd-2.2.15
make install
check_apache_install
popd
Deleted: sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2.14.tar.gz
===================================================================
(Binary files differ)
Added: sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2.15.tar.gz
===================================================================
(Binary files differ)
Property changes on: sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2.15.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/adsk/2.2gp/Oem/LinuxApt/tomcat-connectors-1.2.28-src.tar.gz
===================================================================
(Binary files differ)
Added: sandbox/adsk/2.2gp/Oem/LinuxApt/tomcat-connectors-1.2.30-src.tar.gz
===================================================================
(Binary files differ)
Property changes on: sandbox/adsk/2.2gp/Oem/LinuxApt/tomcat-connectors-1.2.30-src.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: sandbox/adsk/2.2gp/Web/src/ApacheAgent/ApacheAgent.vcproj
===================================================================
--- sandbox/adsk/2.2gp/Web/src/ApacheAgent/ApacheAgent.vcproj 2010-03-09 03:00:19 UTC (rev 4639)
+++ sandbox/adsk/2.2gp/Web/src/ApacheAgent/ApacheAgent.vcproj 2010-03-09 09:39:15 UTC (rev 4640)
@@ -28,7 +28,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\..\..\Oem\LinuxApt
if NOT EXIST httpd-2.2.14.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.14.tar.gz
if NOT EXIST httpd-2.2.14 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.14.tar
type .\httpd-2.2.14\srclib\apr\include\apr.hw > .\httpd-2.2.14\srclib\apr\include\apr.h
type .\httpd-2.2.14\srclib\apr-util\include\apu.hw > .\httpd-2.2.14\srclib\apr-util\include\apu.h
"
+ CommandLine="cd ..\..\..\Oem\LinuxApt
if NOT EXIST httpd-2.2.15.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.15.tar.gz
if NOT EXIST httpd-2.2.15 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.15.tar
type .\httpd-2.2.15\srclib\apr\include\apr.hw > .\httpd-2.2.15\srclib\apr\include\apr.h
type .\httpd-2.2.15\srclib\apr-util\include\apu.hw > .\httpd-2.2.15\srclib\apr-util\include\apu.h
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\LinuxApt\httpd-2.2.14\include";"..\..\..\Oem\LinuxApt\httpd-2.2.14\srclib\apr\include";"..\..\..\Oem\LinuxApt\httpd-2.2.14\srclib\apr-util\include";"..\..\..\Oem\LinuxApt\httpd-2.2.14\os\win32";..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon"
+ AdditionalIncludeDirectories="..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\LinuxApt\httpd-2.2.15\include";"..\..\..\Oem\LinuxApt\httpd-2.2.15\srclib\apr\include";"..\..\..\Oem\LinuxApt\httpd-2.2.15\srclib\apr-util\include";"..\..\..\Oem\LinuxApt\httpd-2.2.15\os\win32";..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -68,7 +68,7 @@
AdditionalDependencies="libhttpd.lib libapr-1.lib libaprutil-1.lib"
OutputFile="$(OutDir)/mod_mgmapagent.so"
LinkIncremental="2"
- AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.14\lib""
+ AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.15\lib""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_mgmapagent.pdb"
SubSystem="2"
@@ -189,7 +189,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\..\..\Oem\LinuxApt
if NOT EXIST httpd-2.2.14.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.14.tar.gz
if NOT EXIST httpd-2.2.14 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.14.tar
type .\httpd-2.2.14\srclib\apr\include\apr.hw > .\httpd-2.2.14\srclib\apr\include\apr.h
type .\httpd-2.2.14\srclib\apr-util\include\apu.hw > .\httpd-2.2.14\srclib\apr-util\include\apu.h
"
+ CommandLine="cd ..\..\..\Oem\LinuxApt
if NOT EXIST httpd-2.2.15.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.15.tar.gz
if NOT EXIST httpd-2.2.15 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.15.tar
type .\httpd-2.2.15\srclib\apr\include\apr.hw > .\httpd-2.2.15\srclib\apr\include\apr.h
type .\httpd-2.2.15\srclib\apr-util\include\apu.hw > .\httpd-2.2.15\srclib\apr-util\include\apu.h"
/>
<Tool
Name="VCCustomBuildTool"
@@ -206,7 +206,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\LinuxApt\httpd-2.2.14\include";"..\..\..\Oem\LinuxApt\httpd-2.2.14\srclib\apr\include";"..\..\..\Oem\LinuxApt\httpd-2.2.14\srclib\apr-util\include";"..\..\..\Oem\LinuxApt\httpd-2.2.14\os\win32";..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon"
+ AdditionalIncludeDirectories="..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\LinuxApt\httpd-2.2.15\include";"..\..\..\Oem\LinuxApt\httpd-2.2.15\srclib\apr\include";"..\..\..\Oem\LinuxApt\httpd-2.2.15\srclib\apr-util\include";"..\..\..\Oem\LinuxApt\httpd-2.2.15\os\win32";..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -227,7 +227,7 @@
AdditionalDependencies="libhttpd.lib libapr-1.lib libaprutil-1.lib"
OutputFile="$(OutDir)/mod_mgmapagent.so"
LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.14\lib""
+ AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.15\lib""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_mgmapagent.pdb"
SubSystem="2"
Modified: sandbox/adsk/2.2gp/Web/src/ApacheAgent/Makefile.am
===================================================================
--- sandbox/adsk/2.2gp/Web/src/ApacheAgent/Makefile.am 2010-03-09 03:00:19 UTC (rev 4639)
+++ sandbox/adsk/2.2gp/Web/src/ApacheAgent/Makefile.am 2010-03-09 09:39:15 UTC (rev 4640)
@@ -10,10 +10,10 @@
-I../../../Common/MapGuideCommon \
-I../../../Common/MdfModel \
-I../../../Oem/ACE/ACE_wrappers \
- -I../../../Oem/LinuxApt/httpd-2.2.14/include \
- -I../../../Oem/LinuxApt/httpd-2.2.14/srclib/apr/include \
- -I../../../Oem/LinuxApt/httpd-2.2.14/srclib/apr-util/include \
- -I../../../Oem/LinuxApt/httpd-2.2.14/os/unix \
+ -I../../../Oem/LinuxApt/httpd-2.2.15/include \
+ -I../../../Oem/LinuxApt/httpd-2.2.15/srclib/apr/include \
+ -I../../../Oem/LinuxApt/httpd-2.2.15/srclib/apr-util/include \
+ -I../../../Oem/LinuxApt/httpd-2.2.15/os/unix \
-I/usr/local/mapguideopensource/webserverextensions/apache2/include\
-I../HttpHandler \
-I../WebSupport \
Modified: sandbox/adsk/2.2gp/build_oem.sh
===================================================================
--- sandbox/adsk/2.2gp/build_oem.sh 2010-03-09 03:00:19 UTC (rev 4639)
+++ sandbox/adsk/2.2gp/build_oem.sh 2010-03-09 09:39:15 UTC (rev 4640)
@@ -213,13 +213,13 @@
}
#**********************************************************
-# Build PHP 5.2.5
+# Build PHP 5.3.1
# Notes: Configure PHP source tree for building PHP extension
#**********************************************************
init_php()
{
- LIB_NAME="PHP 5.2.5"
+ LIB_NAME="PHP 5.3.1"
}
build_php()
Modified: sandbox/adsk/2.2gp/configure
===================================================================
--- sandbox/adsk/2.2gp/configure 2010-03-09 03:00:19 UTC (rev 4639)
+++ sandbox/adsk/2.2gp/configure 2010-03-09 09:39:15 UTC (rev 4640)
@@ -20068,13 +20068,13 @@
fi;
if test $with_php = "no"; then
- { echo "$as_me:$LINENO: Using php 5.2.5 from included Oem Directory" >&5
-echo "$as_me: Using php 5.2.5 from included Oem Directory" >&6;}
+ { echo "$as_me:$LINENO: Using php 5.3.1 from included Oem Directory" >&5
+echo "$as_me: Using php 5.3.1 from included Oem Directory" >&6;}
else
{ echo "$as_me:$LINENO: \"WARNING!!: Using custom specified php include dir is not supported in this release.\"" >&5
echo "$as_me: \"WARNING!!: Using custom specified php include dir is not supported in this release.\"" >&6;}
- { echo "$as_me:$LINENO: Using php 5.2.5 from included Oem Directory" >&5
-echo "$as_me: Using php 5.2.5 from included Oem Directory" >&6;}
+ { echo "$as_me:$LINENO: Using php 5.3.1 from included Oem Directory" >&5
+echo "$as_me: Using php 5.3.1 from included Oem Directory" >&6;}
fi
# custom Fdo path specification
Modified: sandbox/adsk/2.2gp/configure.in
===================================================================
--- sandbox/adsk/2.2gp/configure.in 2010-03-09 03:00:19 UTC (rev 4639)
+++ sandbox/adsk/2.2gp/configure.in 2010-03-09 09:39:15 UTC (rev 4640)
@@ -36,7 +36,7 @@
map_opt_oem_distsubdirs=""
dnl *******************************************************
-dnl PHP 5.2.5 Configuration
+dnl PHP 5.3.1 Configuration
dnl *******************************************************
# Check for php
# Note : Not yet implemented
@@ -47,10 +47,10 @@
[with_php=no])
if test $with_php = "no"; then
- AC_MSG_NOTICE([Using php 5.2.5 from included Oem Directory])
+ AC_MSG_NOTICE([Using php 5.3.1 from included Oem Directory])
else
AC_MSG_NOTICE(["WARNING!!: Using custom specified php include dir is not supported in this release."])
- AC_MSG_NOTICE([Using php 5.2.5 from included Oem Directory])
+ AC_MSG_NOTICE([Using php 5.3.1 from included Oem Directory])
fi
dnl *******************************************************
More information about the mapguide-commits
mailing list