[cpp-sp COMMIT] in /branches/REL_2: .gitignore apache/mod_shib13.vcxproj apache/mod_shib20.vcxproj apache/mod_shib22....

[noreply at shibboleth.net]

Author: scantor
Date: Thu Oct 25 23:04:13 2012
New Revision: 3802

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3802&view=rev
Log:
Factor out Apache paths

Modified:
    branches/REL_2/.gitignore
    branches/REL_2/apache/mod_shib13.vcxproj
    branches/REL_2/apache/mod_shib20.vcxproj
    branches/REL_2/apache/mod_shib22.vcxproj
    branches/REL_2/apache/mod_shib24.vcxproj

Modified: branches/REL_2/.gitignore
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/.gitignore?rev=3802&r1=3801&r2=3802&view=diff
==============================================================================
--- branches/REL_2/.gitignore (original)
+++ branches/REL_2/.gitignore Thu Oct 25 23:04:13 2012
@@ -135,12 +135,16 @@
 /msi/WiX/*.wixobj
 /msi/WiX/*.wixpdb
 /msi/WiX/*.msi
+/msi/WiX/Debug
+/msi/WiX/Release
 
 # /msi/WiX/MergeModules
 /msi/WiX/MergeModules/*.wixobj
 /msi/WiX/MergeModules/*.wixpdb
 /msi/WiX/MergeModules/*.msm
-/msi/Wix/MergeModules/*.msi
+/msi/WiX/MergeModules/*.msi
+/msi/WiX/MergeModules/Debug
+/msi/WiX/MergeModules/Release
 
 # /nsapi_shib/
 /nsapi_shib/*.plg

Modified: branches/REL_2/apache/mod_shib13.vcxproj
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/apache/mod_shib13.vcxproj?rev=3802&r1=3801&r2=3802&view=diff
==============================================================================
--- branches/REL_2/apache/mod_shib13.vcxproj (original)
+++ branches/REL_2/apache/mod_shib13.vcxproj Thu Oct 25 23:04:13 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -104,7 +104,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;\Apache\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;$(Apache13Root)\include;..\..\cpp-xmltooling;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;EAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -117,7 +117,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;ApacheCore.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);\Apache\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(Apache13Root)\libexec;$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -136,7 +136,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;\Apache\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\..\cpp-xmltooling;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;EAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -149,7 +149,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;ApacheCore.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);\Apache\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);$(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -167,7 +167,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;\Apache\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;$(Apache13Root)\include;..\..\cpp-xmltooling;$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDOWS;EAPI;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -181,7 +181,7 @@
     </ResourceCompile>
     <Link>

[... 301 lines stripped ...]