Streamline link settings, reroute output.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2309 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/apache/mod_shib13.vcproj b/apache/mod_shib13.vcproj
index a60ac29..01f33fc 100644 (file)
--- a/apache/mod_shib13.vcproj
+++ b/apache/mod_shib13.vcproj
@@ -15,8 +15,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory=".\Release"
-                       IntermediateDirectory=".\Release"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="0"
@@ -77,10 +77,10 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="log4cpp.lib xerces-c_2.lib ApacheCore.lib xmltooling-lite1.lib"
-                               OutputFile="Release/mod_shib_13.so"
+                               OutputFile="$(OutDir)\mod_shib_13.so"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\Release&quot;,\Apache\libexec"
+                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\$(ConfigurationName)&quot;;\Apache\libexec"
                                ProgramDatabaseFile=".\Release/mod_shib_13.pdb"
                                ImportLibrary=".\Release/mod_shib_13.lib"
                                TargetMachine="1"
@@ -112,8 +112,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory=".\Debug"
-                       IntermediateDirectory=".\Debug"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="0"
@@ -174,10 +174,10 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="log4cppD.lib xerces-c_2D.lib ApacheCore.lib xmltooling-lite1D.lib"
-                               OutputFile="Debug/mod_shib_13.so"
+                               OutputFile="$(OutDir)\mod_shib_13.so"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\Debug&quot;;\Apache\libexec"
+                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\$(ConfigurationName)&quot;;\Apache\libexec"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\Debug/mod_shib_13.lib"
                                TargetMachine="1"

diff --git a/apache/mod_shib20.vcproj b/apache/mod_shib20.vcproj
index cbf1c08..924ca32 100644 (file)
--- a/apache/mod_shib20.vcproj
+++ b/apache/mod_shib20.vcproj
@@ -15,8 +15,8 @@
        <Configurations>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory=".\mod_shib20___Win32_Release"
-                       IntermediateDirectory=".\mod_shib20___Win32_Release"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory=".\mod_shib20___Win32_$(ConfigurationName)"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="0"
@@ -77,10 +77,10 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="log4cpp.lib xerces-c_2.lib libapr.lib libaprutil.lib libhttpd.lib xmltooling-lite1.lib"
-                               OutputFile="mod_shib20___Win32_Release/mod_shib_20.so"
+                               OutputFile="$(OutDir)\mod_shib_20.so"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\Release&quot;;\Apache2\lib"
+                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\$(ConfigurationName)&quot;;\Apache2\lib"
                                ProgramDatabaseFile=".\mod_shib20___Win32_Release/mod_shib_20.pdb"
                                ImportLibrary=".\mod_shib20___Win32_Release/mod_shib_20.lib"
                                TargetMachine="1"
@@ -112,8 +112,8 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory=".\mod_shib20___Win32_Debug"
-                       IntermediateDirectory=".\mod_shib20___Win32_Debug"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory=".\mod_shib20___Win32_$(ConfigurationName)"
                        ConfigurationType="2"
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
                        UseOfMFC="0"
@@ -174,10 +174,10 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="log4cppD.lib xerces-c_2D.lib libapr.lib libaprutil.lib libhttpd.lib xmltooling-lite1D.lib"
-                               OutputFile="mod_shib20___Win32_Debug/mod_shib_20.so"
+                               OutputFile="$(OutDir)\mod_shib_20.so"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\Debug&quot;;\Apache2\lib"
+                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\$(ConfigurationName)&quot;;\Apache2\lib"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\mod_shib20___Win32_Debug/mod_shib_20.lib"
                                TargetMachine="1"

diff --git a/apache/mod_shib22.vcproj b/apache/mod_shib22.vcproj
index bdc3b69..ffd590f 100644 (file)
--- a/apache/mod_shib22.vcproj
+++ b/apache/mod_shib22.vcproj
@@ -15,8 +15,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory=".\mod_shib22___Win32_Release"\r
-                       IntermediateDirectory=".\mod_shib22___Win32_Release"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory=".\mod_shib22___Win32_$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
@@ -76,10 +76,10 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="log4cpp.lib xerces-c_2.lib xmltooling-lite1.lib libapr-1.lib libaprutil-1.lib libhttpd.lib"\r
-                               OutputFile="mod_shib22___Win32_Release/mod_shib_22.so"\r
+                               OutputFile="$(OutDir)\mod_shib_22.so"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\Release&quot;;\Apache2.2\lib"\r
+                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\$(ConfigurationName)&quot;;\Apache2.2\lib"\r
                                ProgramDatabaseFile=".\mod_shib22___Win32_Release/mod_shib_22.pdb"\r
                                ImportLibrary=".\mod_shib22___Win32_Release/mod_shib_22.lib"\r
                                TargetMachine="1"\r
@@ -113,8 +113,8 @@
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory=".\mod_shib22___Win32_Debug"\r
-                       IntermediateDirectory=".\mod_shib22___Win32_Debug"\r
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
+                       IntermediateDirectory=".\mod_shib22___Win32_$(ConfigurationName)"\r
                        ConfigurationType="2"\r
                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"\r
                        UseOfMFC="0"\r
@@ -175,10 +175,10 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="log4cppD.lib xerces-c_2D.lib xmltooling-lite1D.lib libapr-1.lib libaprutil-1.lib libhttpd.lib"\r
-                               OutputFile="mod_shib22___Win32_Debug/mod_shib_22.so"\r
+                               OutputFile="$(OutDir)\mod_shib_22.so"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\Debug&quot;;\Apache2.2\lib"\r
+                               AdditionalLibraryDirectories="&quot;..\..\cpp-xmltooling\$(ConfigurationName)&quot;;\Apache2.2\lib"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile=".\mod_shib22___Win32_Debug/mod_shib_22.pdb"\r
                                ImportLibrary=".\mod_shib22___Win32_Debug/mod_shib_22.lib"\r

diff --git a/isapi_shib/isapi_shib.vcproj b/isapi_shib/isapi_shib.vcproj
index 589df07..2af5fab 100644 (file)
--- a/isapi_shib/isapi_shib.vcproj
+++ b/isapi_shib/isapi_shib.vcproj
@@ -81,7 +81,7 @@
                                AdditionalDependencies="log4cpp.lib xerces-c_2.lib xmltooling-lite1.lib"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\cpp-xmltooling\Release"
+                               AdditionalLibraryDirectories=""..\..\cpp-xmltooling\$(ConfigurationName)""
                                ProgramDatabaseFile=".\Release/isapi_shib.pdb"
                                ImportLibrary=".\Release/isapi_shib.lib"
                                TargetMachine="1"
@@ -178,7 +178,7 @@
                                AdditionalDependencies="log4cppD.lib xerces-c_2D.lib xmltooling-lite1D.lib"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""..\..\cpp-xmltooling\Debug""
+                               AdditionalLibraryDirectories=""..\..\cpp-xmltooling\$(ConfigurationName)""
                                GenerateDebugInformation="true"
                                ImportLibrary=".\Debug/isapi_shib.lib"
                                TargetMachine="1"

diff --git a/nsapi_shib/nsapi_shib.vcproj b/nsapi_shib/nsapi_shib.vcproj
index 0b62d28..4925839 100644 (file)
--- a/nsapi_shib/nsapi_shib.vcproj
+++ b/nsapi_shib/nsapi_shib.vcproj
@@ -79,7 +79,7 @@
                                AdditionalDependencies="log4cpp.lib xerces-c_2.lib xmltooling-lite1.lib ns-httpd30.lib"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""..\..\cpp-xmltooling\Release""
+                               AdditionalLibraryDirectories=""..\..\cpp-xmltooling\$(ConfigurationName)""
                                ProgramDatabaseFile=".\Release/nsapi_shib.pdb"
                                ImportLibrary=".\Release/nsapi_shib.lib"
                                TargetMachine="1"
@@ -175,7 +175,7 @@
                                AdditionalDependencies="log4cppD.lib xerces-c_2D.lib xmltooling-lite1D.lib ns-httpd30.lib"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""..\..\cpp-xmltooling\Debug""
+                               AdditionalLibraryDirectories=""..\..\cpp-xmltooling\$(ConfigurationName)""
                                GenerateDebugInformation="true"
                                ImportLibrary=".\Debug/nsapi_shib.lib"
                                TargetMachine="1"

diff --git a/shibd/shibd.vcproj b/shibd/shibd.vcproj
index 039e5ae..8efc825 100644 (file)
--- a/shibd/shibd.vcproj
+++ b/shibd/shibd.vcproj
@@ -70,7 +70,7 @@
                                AdditionalDependencies="wsock32.lib log4cpp.lib xmltooling1.lib xerces-c_2.lib"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""..\..\cpp-opensaml2\Release";"..\..\cpp-xmltooling\Release""
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
                                SubSystem="1"
                                TargetMachine="1"
                        />
@@ -155,7 +155,7 @@
                                AdditionalDependencies="wsock32.lib log4cppD.lib xmltooling1D.lib"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""..\..\cpp-opensaml2\Debug";"..\..\cpp-xmltooling\Debug""
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"

diff --git a/shibsp/shibsp-lite.vcproj b/shibsp/shibsp-lite.vcproj
index 3f93de9..c59c2c3 100644 (file)
--- a/shibsp/shibsp-lite.vcproj
+++ b/shibsp/shibsp-lite.vcproj
@@ -64,7 +64,7 @@
                                AdditionalDependencies="log4cppD.lib xerces-c_2D.lib xmltooling-lite1D.lib wsock32.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="..\..\cpp-xmltooling\Debug"\r
+                               AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                ImportLibrary="$(TargetDir)$(ProjectName)1D.lib"\r
@@ -141,7 +141,7 @@
                                AdditionalDependencies="log4cpp.lib xerces-c_2.lib xmltooling-lite1.lib wsock32.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName)1_0.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="..\..\cpp-xmltooling\Release"\r
+                               AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/shibsp/shibsp.vcproj b/shibsp/shibsp.vcproj
index 6970ed6..c07f175 100644 (file)
--- a/shibsp/shibsp.vcproj
+++ b/shibsp/shibsp.vcproj
@@ -64,7 +64,7 @@
                                AdditionalDependencies="log4cppD.lib xerces-c_2D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"\r
                                LinkIncremental="2"\r
-                               AdditionalLibraryDirectories=""..\..\cpp-opensaml1\saml\Debug";"..\..\cpp-opensaml2\Debug";"..\..\cpp-xmltooling\Debug""\r
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                ImportLibrary="$(TargetDir)$(ProjectName)1D.lib"\r
@@ -141,7 +141,7 @@
                                AdditionalDependencies="log4cpp.lib xerces-c_2.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName)1_0.dll"\r
                                LinkIncremental="1"\r
-                               AdditionalLibraryDirectories=""..\..\cpp-opensaml1\saml\Release";"..\..\cpp-opensaml2\Release";"..\..\cpp-xmltooling\Release""\r
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                OptimizeReferences="2"\r

diff --git a/util/samlquery.vcproj b/util/samlquery.vcproj
index 0dbaf19..a6085fb 100644 (file)
--- a/util/samlquery.vcproj
+++ b/util/samlquery.vcproj
@@ -70,7 +70,7 @@
                                AdditionalDependencies="wsock32.lib log4cpp.lib saml2.lib xmltooling1.lib xerces-c_2.lib"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=""..\..\cpp-opensaml2\Release";"..\..\cpp-xmltooling\Release""\r
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r
                        />\r
@@ -156,7 +156,7 @@
                                AdditionalDependencies="wsock32.lib log4cppD.lib saml2D.lib xmltooling1D.lib xerces-c_2D.lib"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories=""..\..\cpp-opensaml2\Debug";"..\..\cpp-xmltooling\Debug""\r
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="1"\r
                                TargetMachine="1"\r

diff --git a/util/siterefresh.vcproj b/util/siterefresh.vcproj
index 27dd547..773bd95 100644 (file)
--- a/util/siterefresh.vcproj
+++ b/util/siterefresh.vcproj
@@ -75,7 +75,7 @@
                                AdditionalDependencies="log4cpp.lib xerces-c_2.lib xsec_1.lib saml2.lib xmltooling1.lib"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\cpp-opensaml2\Release;..\..\cpp-xmltooling\Release"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
                                ProgramDatabaseFile=".\Release/siterefresh.pdb"
                                SubSystem="1"
                                TargetMachine="1"
@@ -167,7 +167,7 @@
                                AdditionalDependencies="log4cppD.lib xerces-c_2D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\cpp-opensaml2\Debug;..\..\cpp-xmltooling\Debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"