[mapguide-commits] r4639 - in sandbox/adsk/2.2gp: Oem/LinuxApt
Web/src/ApacheAgent
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Mar 8 22:00:20 EST 2010
Author: liuar
Date: 2010-03-08 22:00:19 -0500 (Mon, 08 Mar 2010)
New Revision: 4639
Added:
sandbox/adsk/2.2gp/Oem/LinuxApt/apache-tomcat-6.0.24.tar.gz
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
Removed:
sandbox/adsk/2.2gp/Oem/LinuxApt/apache-tomcat-6.0.14.tar.gz
sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2.11.tar.gz
sandbox/adsk/2.2gp/Oem/LinuxApt/tomcat-connectors-1.2.25-src.tar.gz
Modified:
sandbox/adsk/2.2gp/Oem/LinuxApt/build_apt.sh
sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2-x64.tar.gz
sandbox/adsk/2.2gp/Web/src/ApacheAgent/ApacheAgent.vcproj
sandbox/adsk/2.2gp/Web/src/ApacheAgent/Makefile.am
Log:
Submit on behalf of Buddy Hu
1. Upgrade Apache to 2.2.14
2. Upgrade Tomcat to 6.0.24
3. Upgrade Apache-tomcat-connector to 1.2.28
Deleted: sandbox/adsk/2.2gp/Oem/LinuxApt/apache-tomcat-6.0.14.tar.gz
===================================================================
(Binary files differ)
Added: sandbox/adsk/2.2gp/Oem/LinuxApt/apache-tomcat-6.0.24.tar.gz
===================================================================
(Binary files differ)
Property changes on: sandbox/adsk/2.2gp/Oem/LinuxApt/apache-tomcat-6.0.24.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: sandbox/adsk/2.2gp/Oem/LinuxApt/build_apt.sh
===================================================================
--- sandbox/adsk/2.2gp/Oem/LinuxApt/build_apt.sh 2010-03-08 21:22:05 UTC (rev 4638)
+++ sandbox/adsk/2.2gp/Oem/LinuxApt/build_apt.sh 2010-03-09 03:00:19 UTC (rev 4639)
@@ -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.14.tar.gz
+pushd httpd-2.2.14
./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.11
+pushd httpd-2.2.14
make install
check_apache_install
popd
@@ -231,10 +231,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: sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2-x64.tar.gz
===================================================================
(Binary files differ)
Deleted: sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2.11.tar.gz
===================================================================
(Binary files differ)
Added: sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2.14.tar.gz
===================================================================
(Binary files differ)
Property changes on: sandbox/adsk/2.2gp/Oem/LinuxApt/httpd-2.2.14.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: sandbox/adsk/2.2gp/Oem/LinuxApt/tomcat-connectors-1.2.25-src.tar.gz
===================================================================
(Binary files differ)
Added: sandbox/adsk/2.2gp/Oem/LinuxApt/tomcat-connectors-1.2.28-src.tar.gz
===================================================================
(Binary files differ)
Property changes on: sandbox/adsk/2.2gp/Oem/LinuxApt/tomcat-connectors-1.2.28-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-08 21:22:05 UTC (rev 4638)
+++ sandbox/adsk/2.2gp/Web/src/ApacheAgent/ApacheAgent.vcproj 2010-03-09 03:00:19 UTC (rev 4639)
@@ -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.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
"
/>
<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.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"
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.14\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"
@@ -126,7 +126,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"
@@ -189,7 +189,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.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
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -206,7 +206,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.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"
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.11\lib""
+ AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.14\lib""
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_mgmapagent.pdb"
SubSystem="2"
@@ -287,7 +287,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: sandbox/adsk/2.2gp/Web/src/ApacheAgent/Makefile.am
===================================================================
--- sandbox/adsk/2.2gp/Web/src/ApacheAgent/Makefile.am 2010-03-08 21:22:05 UTC (rev 4638)
+++ sandbox/adsk/2.2gp/Web/src/ApacheAgent/Makefile.am 2010-03-09 03:00:19 UTC (rev 4639)
@@ -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.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/usr/local/mapguideopensource/webserverextensions/apache2/include\
-I../HttpHandler \
-I../WebSupport \
More information about the mapguide-commits
mailing list