[mapguide-commits] r4993 - in trunk/MgDev: Oem/LinuxApt
Web/src/ApacheAgent
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jul 6 03:43:04 EDT 2010
Author: liuar
Date: 2010-07-06 07:43:04 +0000 (Tue, 06 Jul 2010)
New Revision: 4993
Added:
trunk/MgDev/Oem/LinuxApt/apache-tomcat-6.0.24.tar.gz
trunk/MgDev/Oem/LinuxApt/httpd-2.2.15.tar.gz
trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.30-src.tar.gz
Removed:
trunk/MgDev/Oem/LinuxApt/apache-tomcat-6.0.14.tar.gz
trunk/MgDev/Oem/LinuxApt/httpd-2.2.11.tar.gz
trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.25-src.tar.gz
Modified:
trunk/MgDev/Oem/LinuxApt/build_apt.sh
trunk/MgDev/Oem/LinuxApt/httpd-2.2-x64.tar.gz
trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcproj
trunk/MgDev/Web/src/ApacheAgent/Makefile.am
Log:
Submit on behalf of Buddy Hu.
This submission implement the RFC 91 - Upgrade Apache/Tomcat to the latest version
- Upgrade Apache to 2.2.15
- Upgrade Tomcat to 6.0.24
Deleted: trunk/MgDev/Oem/LinuxApt/apache-tomcat-6.0.14.tar.gz
===================================================================
(Binary files differ)
Copied: trunk/MgDev/Oem/LinuxApt/apache-tomcat-6.0.24.tar.gz (from rev 4639, sandbox/adsk/2.2gp/Oem/LinuxApt/apache-tomcat-6.0.24.tar.gz)
===================================================================
(Binary files differ)
Modified: trunk/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- trunk/MgDev/Oem/LinuxApt/build_apt.sh 2010-07-05 21:56:45 UTC (rev 4992)
+++ trunk/MgDev/Oem/LinuxApt/build_apt.sh 2010-07-06 07:43:04 UTC (rev 4993)
@@ -120,8 +120,8 @@
# Notes: none
#**********************************************************
echo Apache Httpd build started
-tar -zxf httpd-2.2.11.tar.gz
-pushd httpd-2.2.11
+tar -zxf httpd-2.2.15.tar.gz
+pushd httpd-2.2.15
./configure --prefix=$INSTALLWEB/apache2 --enable-mods-shared=all \
--enable-ldap --with-ldap --enable-authnz-ldap --with-included-apr --with-port=$PORT
check_apache_build
@@ -153,7 +153,7 @@
# Notes: none
#**********************************************************
echo Apache install started
-pushd httpd-2.2.11
+pushd httpd-2.2.15
make install
check_apache_install
popd
@@ -243,10 +243,10 @@
#**********************************************************
if [ "$TOMCAT" = "1" ]; then
echo Tomcat install started
-tar -zxf apache-tomcat-6.0.14.tar.gz -C $INSTALLWEB
+tar -zxf apache-tomcat-6.0.24.tar.gz -C $INSTALLWEB
check_tomcat_install
pushd $INSTALLWEB
-mv apache-tomcat-6.0.14 tomcat
+mv apache-tomcat-6.0.24 tomcat
check_tomcat_install
popd
echo Tomcat install completed
Modified: trunk/MgDev/Oem/LinuxApt/httpd-2.2-x64.tar.gz
===================================================================
(Binary files differ)
Deleted: trunk/MgDev/Oem/LinuxApt/httpd-2.2.11.tar.gz
===================================================================
(Binary files differ)
Copied: trunk/MgDev/Oem/LinuxApt/httpd-2.2.15.tar.gz (from rev 4640, sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2.15.tar.gz)
===================================================================
(Binary files differ)
Deleted: trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.25-src.tar.gz
===================================================================
(Binary files differ)
Copied: trunk/MgDev/Oem/LinuxApt/tomcat-connectors-1.2.30-src.tar.gz (from rev 4640, sandbox/adsk/2.2gp/Oem/LinuxApt/tomcat-connectors-1.2.30-src.tar.gz)
===================================================================
(Binary files differ)
Modified: trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcproj
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcproj 2010-07-05 21:56:45 UTC (rev 4992)
+++ trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcproj 2010-07-06 07:43:04 UTC (rev 4993)
@@ -28,7 +28,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\..\..\Oem\LinuxApt
if NOT EXIST httpd-2.2.11.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.11.tar.gz
if NOT EXIST httpd-2.2.11 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.11.tar
type .\httpd-2.2.11\srclib\apr\include\apr.hw > .\httpd-2.2.11\srclib\apr\include\apr.h
type .\httpd-2.2.11\srclib\apr-util\include\apu.hw > .\httpd-2.2.11\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.11\include";"..\..\..\Oem\LinuxApt\httpd-2.2.11\srclib\apr\include";"..\..\..\Oem\LinuxApt\httpd-2.2.11\srclib\apr-util\include";"..\..\..\Oem\LinuxApt\httpd-2.2.11\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.11\lib""
+ AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.15\lib""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_mgmapagent.pdb"
SubSystem="2"
@@ -108,7 +108,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\..\..\Oem\LinuxApt
if NOT EXIST httpd-2.2-x64.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2-x64.tar.gz
if NOT EXIST httpd-2.2-x64 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2-x64.tar
"
+ CommandLine="cd ..\..\..\Oem\LinuxApt
if NOT EXIST httpd-2.2-x64.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2-x64.tar.gz
if NOT EXIST httpd-2.2-x64 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2-x64.tar


"
/>
<Tool
Name="VCCustomBuildTool"
@@ -125,7 +125,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\LinuxApt\httpd-2.2-x64\include";"..\..\..\Oem\LinuxApt\httpd-2.2-x64\srclib\apr\include";"..\..\..\Oem\LinuxApt\httpd-2.2-x64\srclib\apr-util\include";"..\..\..\Oem\LinuxApt\httpd-2.2-x64\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-x64\include";..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -188,7 +188,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\..\..\Oem\LinuxApt
if NOT EXIST httpd-2.2.11.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.11.tar.gz
if NOT EXIST httpd-2.2.11 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.11.tar
type .\httpd-2.2.11\srclib\apr\include\apr.hw > .\httpd-2.2.11\srclib\apr\include\apr.h
type .\httpd-2.2.11\srclib\apr-util\include\apu.hw > .\httpd-2.2.11\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"
@@ -205,7 +205,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\LinuxApt\httpd-2.2.11\include";"..\..\..\Oem\LinuxApt\httpd-2.2.11\srclib\apr\include";"..\..\..\Oem\LinuxApt\httpd-2.2.11\srclib\apr-util\include";"..\..\..\Oem\LinuxApt\httpd-2.2.11\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"
@@ -226,7 +226,7 @@
AdditionalDependencies="libhttpd.lib libapr-1.lib libaprutil-1.lib"
OutputFile="$(OutDir)/mod_mgmapagent.so"
LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.11\lib""
+ AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.15\lib""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_mgmapagent.pdb"
SubSystem="2"
@@ -285,7 +285,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- AdditionalIncludeDirectories="..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\LinuxApt\httpd-2.2-x64\include";"..\..\..\Oem\LinuxApt\httpd-2.2-x64\srclib\apr\include";"..\..\..\Oem\LinuxApt\httpd-2.2-x64\srclib\apr-util\include";"..\..\..\Oem\LinuxApt\httpd-2.2-x64\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-x64\include";..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
Modified: trunk/MgDev/Web/src/ApacheAgent/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/Makefile.am 2010-07-05 21:56:45 UTC (rev 4992)
+++ trunk/MgDev/Web/src/ApacheAgent/Makefile.am 2010-07-06 07:43:04 UTC (rev 4993)
@@ -10,10 +10,10 @@
-I../../../Common/MapGuideCommon \
-I../../../Common/MdfModel \
-I../../../Oem/ACE/ACE_wrappers \
- -I../../../Oem/LinuxApt/httpd-2.2.11/include \
- -I../../../Oem/LinuxApt/httpd-2.2.11/srclib/apr/include \
- -I../../../Oem/LinuxApt/httpd-2.2.11/srclib/apr-util/include \
- -I../../../Oem/LinuxApt/httpd-2.2.11/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 \
More information about the mapguide-commits
mailing list