From 63e1fce4e22747a9c835ce8aff34aec91f8606e3 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Fri, 5 Aug 2011 02:22:56 +0000 Subject: [PATCH] Clean up some settings and add VC project files for plugins project. --- Shibboleth.sln | 11 +++++++++++ adfs/adfs-lite.vcxproj | 2 -- adfs/adfs.vcxproj | 6 +----- apache/mod_shib13.vcxproj | 4 ---- apache/mod_shib20.vcxproj | 2 -- apache/mod_shib22.vcxproj | 2 -- fastcgi/shibauthorizer.vcxproj | 2 -- fastcgi/shibresponder.vcxproj | 2 -- isapi_shib/isapi_shib.vcxproj | 4 ---- memcache-store/memcache-store.vcxproj | 4 ---- nsapi_shib/nsapi_shib.vcxproj | 4 ---- odbc-store/odbc-store.vcxproj | 4 ---- shibd/shibd.vcxproj | 4 ---- shibsp/shibsp-lite.vcxproj | 4 +--- shibsp/shibsp.vcxproj | 8 ++------ util/mdquery.vcxproj | 4 ---- util/resolvertest.vcxproj | 4 ---- 17 files changed, 15 insertions(+), 56 deletions(-) diff --git a/Shibboleth.sln b/Shibboleth.sln index 376bd56..5b07c5b 100644 --- a/Shibboleth.sln +++ b/Shibboleth.sln @@ -129,6 +129,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shibresponder", "fastcgi\sh EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "memcache-store", "memcache-store\memcache-store.vcxproj", "{666A63A7-983F-4C19-8411-207F24305198}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugins", "plugins\plugins.vcxproj", "{A2140D6E-C2C6-4329-84E3-2F530CEBE445}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -257,6 +259,14 @@ Global {666A63A7-983F-4C19-8411-207F24305198}.Release|Win32.ActiveCfg = Release|Win32 {666A63A7-983F-4C19-8411-207F24305198}.Release|Win32.Build.0 = Release|Win32 {666A63A7-983F-4C19-8411-207F24305198}.Release|x64.ActiveCfg = Release|x64 + {A2140D6E-C2C6-4329-84E3-2F530CEBE445}.Debug|Win32.ActiveCfg = Debug|Win32 + {A2140D6E-C2C6-4329-84E3-2F530CEBE445}.Debug|Win32.Build.0 = Debug|Win32 + {A2140D6E-C2C6-4329-84E3-2F530CEBE445}.Debug|x64.ActiveCfg = Debug|x64 + {A2140D6E-C2C6-4329-84E3-2F530CEBE445}.Debug|x64.Build.0 = Debug|x64 + {A2140D6E-C2C6-4329-84E3-2F530CEBE445}.Release|Win32.ActiveCfg = Release|Win32 + {A2140D6E-C2C6-4329-84E3-2F530CEBE445}.Release|Win32.Build.0 = Release|Win32 + {A2140D6E-C2C6-4329-84E3-2F530CEBE445}.Release|x64.ActiveCfg = Release|x64 + {A2140D6E-C2C6-4329-84E3-2F530CEBE445}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -272,6 +282,7 @@ Global {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C} {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C} {666A63A7-983F-4C19-8411-207F24305198} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C} + {A2140D6E-C2C6-4329-84E3-2F530CEBE445} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C} {F13141B6-6C87-40BB-8D4E-5CC56EBB4C5A} = {FED80230-119E-4B2F-9F53-D2660A5F022B} {F13141B6-6C87-40BB-8D4E-5CC56EBB4C59} = {FED80230-119E-4B2F-9F53-D2660A5F022B} {8CF7DDFA-EAA0-416E-853E-3DCB210C4AE0} = {8E1AF2CF-24E1-4983-8681-394D89DF9AD2} diff --git a/adfs/adfs-lite.vcxproj b/adfs/adfs-lite.vcxproj index ad750e3..c8b30ef 100644 --- a/adfs/adfs-lite.vcxproj +++ b/adfs/adfs-lite.vcxproj @@ -60,13 +60,11 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(ProjectName)-$(Configuration)\ true - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ diff --git a/adfs/adfs.vcxproj b/adfs/adfs.vcxproj index 1835f42..f7d4f64 100644 --- a/adfs/adfs.vcxproj +++ b/adfs/adfs.vcxproj @@ -60,14 +60,10 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ @@ -94,12 +90,12 @@ Disabled .;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL true Level3 EditAndContinue + MultiThreadedDebugDLL _DEBUG;%(PreprocessorDefinitions) diff --git a/apache/mod_shib13.vcxproj b/apache/mod_shib13.vcxproj index 93f5453..cb9c5a9 100644 --- a/apache/mod_shib13.vcxproj +++ b/apache/mod_shib13.vcxproj @@ -63,14 +63,10 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/apache/mod_shib20.vcxproj b/apache/mod_shib20.vcxproj index 9fef160..2f2e537 100644 --- a/apache/mod_shib20.vcxproj +++ b/apache/mod_shib20.vcxproj @@ -63,13 +63,11 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(ProjectName)-$(Configuration)\ false - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ diff --git a/apache/mod_shib22.vcxproj b/apache/mod_shib22.vcxproj index 225f037..b6a8e63 100644 --- a/apache/mod_shib22.vcxproj +++ b/apache/mod_shib22.vcxproj @@ -63,13 +63,11 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(ProjectName)-$(Configuration)\ false - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ diff --git a/fastcgi/shibauthorizer.vcxproj b/fastcgi/shibauthorizer.vcxproj index 85dbad5..5cb8de3 100644 --- a/fastcgi/shibauthorizer.vcxproj +++ b/fastcgi/shibauthorizer.vcxproj @@ -62,13 +62,11 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(ProjectName)-$(Configuration)\ false - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ diff --git a/fastcgi/shibresponder.vcxproj b/fastcgi/shibresponder.vcxproj index d9547df..70ceee4 100644 --- a/fastcgi/shibresponder.vcxproj +++ b/fastcgi/shibresponder.vcxproj @@ -63,13 +63,11 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(ProjectName)-$(Configuration)\ false - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ diff --git a/isapi_shib/isapi_shib.vcxproj b/isapi_shib/isapi_shib.vcxproj index e14538c..1995d9b 100644 --- a/isapi_shib/isapi_shib.vcxproj +++ b/isapi_shib/isapi_shib.vcxproj @@ -60,14 +60,10 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/memcache-store/memcache-store.vcxproj b/memcache-store/memcache-store.vcxproj index 1f717c6..3a4681a 100644 --- a/memcache-store/memcache-store.vcxproj +++ b/memcache-store/memcache-store.vcxproj @@ -60,14 +60,10 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/nsapi_shib/nsapi_shib.vcxproj b/nsapi_shib/nsapi_shib.vcxproj index 6f03f7f..19aac86 100644 --- a/nsapi_shib/nsapi_shib.vcxproj +++ b/nsapi_shib/nsapi_shib.vcxproj @@ -62,14 +62,10 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/odbc-store/odbc-store.vcxproj b/odbc-store/odbc-store.vcxproj index ada852a..ad3c067 100644 --- a/odbc-store/odbc-store.vcxproj +++ b/odbc-store/odbc-store.vcxproj @@ -60,14 +60,10 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/shibd/shibd.vcxproj b/shibd/shibd.vcxproj index d701c9c..0ecd40f 100644 --- a/shibd/shibd.vcxproj +++ b/shibd/shibd.vcxproj @@ -59,14 +59,10 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/shibsp/shibsp-lite.vcxproj b/shibsp/shibsp-lite.vcxproj index 6cc5360..d8cb62a 100644 --- a/shibsp/shibsp-lite.vcxproj +++ b/shibsp/shibsp-lite.vcxproj @@ -60,13 +60,11 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(ProjectName)-$(Configuration)\ true - $(SolutionDir)$(Configuration)\ $(ProjectName)-$(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ @@ -294,4 +292,4 @@ - + \ No newline at end of file diff --git a/shibsp/shibsp.vcxproj b/shibsp/shibsp.vcxproj index 84f8b1e..ba83744 100644 --- a/shibsp/shibsp.vcxproj +++ b/shibsp/shibsp.vcxproj @@ -1,4 +1,4 @@ - + @@ -60,14 +60,10 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true - $(SolutionDir)$(Configuration)\ - $(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ @@ -350,4 +346,4 @@ - + \ No newline at end of file diff --git a/util/mdquery.vcxproj b/util/mdquery.vcxproj index 229595c..99c42cf 100644 --- a/util/mdquery.vcxproj +++ b/util/mdquery.vcxproj @@ -59,14 +59,10 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ diff --git a/util/resolvertest.vcxproj b/util/resolvertest.vcxproj index f0215c5..e9c0d15 100644 --- a/util/resolvertest.vcxproj +++ b/util/resolvertest.vcxproj @@ -61,14 +61,10 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(Configuration)\ false $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ true $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ -- 2.1.4