[mapguide-commits] r6152 - trunk/MgDev/Web/src/ApacheAgent
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Sep 29 14:15:09 EDT 2011
Author: waltweltonlair
Date: 2011-09-29 11:15:09 -0700 (Thu, 29 Sep 2011)
New Revision: 6152
Modified:
trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcproj
Log:
Additional fix for ticket #1818 (Implement RFC 121 - Upgrade PHP, Apache and Tomcat to latest version)
Update the Visual Studio 2008 project file to account for new version of Apache.
Modified: trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcproj
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcproj 2011-09-27 10:24:45 UTC (rev 6151)
+++ trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcproj 2011-09-29 18:15:09 UTC (rev 6152)
@@ -28,7 +28,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- 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
"
+ CommandLine="cd ..\..\..\Oem\LinuxApt
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
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -45,7 +45,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- 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="..\..\..\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"
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.17\lib";..\..\..\Oem\ACE\ACE_wrappers\lib"
+ AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.21\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.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
"
+ CommandLine="cd ..\..\..\Oem\LinuxApt
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
"
/>
<Tool
Name="VCCustomBuildTool"
@@ -201,7 +201,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="2"
- 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="..\..\..\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"
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.17\lib";..\..\..\Oem\ACE\ACE_wrappers\lib"
+ AdditionalLibraryDirectories=""..\..\..\Oem\LinuxApt\httpd-2.2.21\lib";..\..\..\Oem\ACE\ACE_wrappers\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/mod_mgmapagent.pdb"
SubSystem="2"
More information about the mapguide-commits
mailing list