[mapguide-commits] r5379 - in trunk/MgDev: Oem/LinuxApt
Web/src/ApacheAgent
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Nov 9 04:04:11 EST 2010
Author: hubu
Date: 2010-11-09 01:04:11 -0800 (Tue, 09 Nov 2010)
New Revision: 5379
Added:
trunk/MgDev/Oem/LinuxApt/httpd-2.2.17.tar.gz
Removed:
trunk/MgDev/Oem/LinuxApt/httpd-2.2.15.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
Log:
Upgrade Apache to 2.2.17.
Pass build on Linux and windows(release/debug, win32/x64). And Apache works fine.
Modified: trunk/MgDev/Oem/LinuxApt/build_apt.sh
===================================================================
--- trunk/MgDev/Oem/LinuxApt/build_apt.sh 2010-11-09 08:42:49 UTC (rev 5378)
+++ trunk/MgDev/Oem/LinuxApt/build_apt.sh 2010-11-09 09:04:11 UTC (rev 5379)
@@ -120,8 +120,8 @@
# Notes: none
#**********************************************************
echo Apache Httpd build started
-tar -zxf httpd-2.2.15.tar.gz
-pushd httpd-2.2.15
+tar -zxf httpd-2.2.17.tar.gz
+pushd httpd-2.2.17
./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.15
+pushd httpd-2.2.17
make install
check_apache_install
popd
Modified: trunk/MgDev/Oem/LinuxApt/httpd-2.2-x64.tar.gz
===================================================================
(Binary files differ)
Deleted: trunk/MgDev/Oem/LinuxApt/httpd-2.2.15.tar.gz
===================================================================
(Binary files differ)
Added: trunk/MgDev/Oem/LinuxApt/httpd-2.2.17.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/MgDev/Oem/LinuxApt/httpd-2.2.17.tar.gz
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcproj
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcproj 2010-11-09 08:42:49 UTC (rev 5378)
+++ trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcproj 2010-11-09 09:04:11 UTC (rev 5379)
@@ -28,7 +28,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- 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
"
+ CommandLine="cd ..\..\..\Oem\LinuxApt
if NOT EXIST httpd-2.2.17.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.17.tar.gz
if NOT EXIST httpd-2.2.17 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.17.tar
type .\httpd-2.2.17\srclib\apr\include\apr.hw > .\httpd-2.2.17\srclib\apr\include\apr.h
type .\httpd-2.2.17\srclib\apr-util\include\apu.hw > .\httpd-2.2.17\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.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"
+ AdditionalIncludeDirectories="..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\LinuxApt\httpd-2.2.17\include";"..\..\..\Oem\LinuxApt\httpd-2.2.17\srclib\apr\include";"..\..\..\Oem\LinuxApt\httpd-2.2.17\srclib\apr-util\include";"..\..\..\Oem\LinuxApt\httpd-2.2.17\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"
@@ -67,7 +67,7 @@
AdditionalDependencies="libhttpd.lib libapr-1.lib libaprutil-1.lib ACEd.lib"
OutputFile="$(OutDir)/mod_mgmapagent.so"
LinkIncremental="2"
- AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.15\lib";..\..\..\Oem\ACE\ACE_wrappers\lib"
+ AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.17\lib";..\..\..\Oem\ACE\ACE_wrappers\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_mgmapagent.pdb"
SubSystem="2"
@@ -184,7 +184,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- 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
"
+ CommandLine="cd ..\..\..\Oem\LinuxApt
if NOT EXIST httpd-2.2.17.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.17.tar.gz
if NOT EXIST httpd-2.2.17 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.17.tar
type .\httpd-2.2.17\srclib\apr\include\apr.hw > .\httpd-2.2.17\srclib\apr\include\apr.h
type .\httpd-2.2.17\srclib\apr-util\include\apu.hw > .\httpd-2.2.17\srclib\apr-util\include\apu.h
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -201,7 +201,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- 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"
+ AdditionalIncludeDirectories="..\..\..\Oem\ACE\ACE_wrappers;"..\..\..\Oem\LinuxApt\httpd-2.2.17\include";"..\..\..\Oem\LinuxApt\httpd-2.2.17\srclib\apr\include";"..\..\..\Oem\LinuxApt\httpd-2.2.17\srclib\apr-util\include";"..\..\..\Oem\LinuxApt\httpd-2.2.17\os\win32";..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS"
RuntimeLibrary="2"
WarningLevel="3"
@@ -221,7 +221,7 @@
AdditionalDependencies="libhttpd.lib libapr-1.lib libaprutil-1.lib ACE.lib"
OutputFile="$(OutDir)/mod_mgmapagent.so"
LinkIncremental="1"
- AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.15\lib";..\..\..\Oem\ACE\ACE_wrappers\lib"
+ AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.17\lib";..\..\..\Oem\ACE\ACE_wrappers\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_mgmapagent.pdb"
SubSystem="2"
@@ -329,6 +329,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
+ CommandLine=""
/>
</Configuration>
</Configurations>
More information about the mapguide-commits
mailing list