[mapguide-commits] r6150 - trunk/MgDev/Web/src/ApacheAgent
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Sep 27 04:52:08 EDT 2011
Author: liuar
Date: 2011-09-27 01:52:08 -0700 (Tue, 27 Sep 2011)
New Revision: 6150
Modified:
trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj
trunk/MgDev/Web/src/ApacheAgent/Makefile.am
Log:
Submit on behalf of Mars Wu
Implement RFC 121. Ticket: http://trac.osgeo.org/mapguide/ticket/1818
Adding the missing files for WebTier
Modified: trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj 2011-09-27 03:47:36 UTC (rev 6149)
+++ trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj 2011-09-27 08:52:08 UTC (rev 6150)
@@ -94,15 +94,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>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
+if NOT EXIST httpd-2.2.21.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.21.tar.gz
+if NOT EXIST httpd-2.2.21 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.21.tar
+type .\httpd-2.2.21\srclib\apr\include\apr.hw > .\httpd-2.2.21\srclib\apr\include\apr.h
+type .\httpd-2.2.21\srclib\apr-util\include\apu.hw > .\httpd-2.2.21\srclib\apr-util\include\apu.h
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\LinuxApt\httpd-2.2.21\include;..\..\..\Oem\LinuxApt\httpd-2.2.21\srclib\apr\include;..\..\..\Oem\LinuxApt\httpd-2.2.21\srclib\apr-util\include;..\..\..\Oem\LinuxApt\httpd-2.2.21\os\win32;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -113,7 +113,7 @@
<Link>
<AdditionalDependencies>libhttpd.lib;libapr-1.lib;libaprutil-1.lib;ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mod_mgmapagent.so</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\LinuxApt\httpd-2.2.17\lib;..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Oem\LinuxApt\httpd-2.2.21\lib;..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mod_mgmapagent.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -158,15 +158,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>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
+if NOT EXIST httpd-2.2.21.tar ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.21.tar.gz
+if NOT EXIST httpd-2.2.21 ..\..\BuildTools\WebTools\7-Zip\7z.exe x httpd-2.2.21.tar
+type .\httpd-2.2.21\srclib\apr\include\apr.hw > .\httpd-2.2.21\srclib\apr\include\apr.h
+type .\httpd-2.2.21\srclib\apr-util\include\apu.hw > .\httpd-2.2.21\srclib\apr-util\include\apu.h
</Command>
</PreBuildEvent>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
- <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;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\LinuxApt\httpd-2.2.21\include;..\..\..\Oem\LinuxApt\httpd-2.2.21\srclib\apr\include;..\..\..\Oem\LinuxApt\httpd-2.2.21\srclib\apr-util\include;..\..\..\Oem\LinuxApt\httpd-2.2.21\os\win32;..\..\..\Common\MapGuideCommon;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\Foundation;..\..\..\Common\MdfModel;..\WebSupport;..\HttpHandler;..\MapAgentCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;APACHEAGENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
@@ -175,7 +175,7 @@
<Link>
<AdditionalDependencies>libhttpd.lib;libapr-1.lib;libaprutil-1.lib;ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)mod_mgmapagent.so</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\LinuxApt\httpd-2.2.17\lib;..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\Oem\LinuxApt\httpd-2.2.21\lib;..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)mod_mgmapagent.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/MgDev/Web/src/ApacheAgent/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/Makefile.am 2011-09-27 03:47:36 UTC (rev 6149)
+++ trunk/MgDev/Web/src/ApacheAgent/Makefile.am 2011-09-27 08:52:08 UTC (rev 6150)
@@ -10,10 +10,10 @@
-I../../../Common/MapGuideCommon \
-I../../../Common/MdfModel \
-I../../../Oem/ACE/ACE_wrappers \
- -I../../../Oem/LinuxApt/httpd-2.2.17/include \
- -I../../../Oem/LinuxApt/httpd-2.2.17/srclib/apr/include \
- -I../../../Oem/LinuxApt/httpd-2.2.17/srclib/apr-util/include \
- -I../../../Oem/LinuxApt/httpd-2.2.17/os/unix \
+ -I../../../Oem/LinuxApt/httpd-2.2.21/include \
+ -I../../../Oem/LinuxApt/httpd-2.2.21/srclib/apr/include \
+ -I../../../Oem/LinuxApt/httpd-2.2.21/srclib/apr-util/include \
+ -I../../../Oem/LinuxApt/httpd-2.2.21/os/unix \
-I/usr/local/mapguideopensource/webserverextensions/apache2/include\
-I../HttpHandler \
-I../WebSupport \
More information about the mapguide-commits
mailing list