[shibboleth-sp2] 37/82: Some windows VC14 changes

Etienne Dysli Metref edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:23 UTC 2017


This is an automated email from the git hooks/post-receive script.

edm-guest pushed a commit to branch master
in repository shibboleth-sp2.

commit 77df793b1839ce084434703b2bf56dcca915000d
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Sun Jul 2 11:07:25 2017 +0100

    Some windows VC14 changes
    
    - add exemplar vcxproj.user files for remote debugging.  Changes will not get pushed.
    - turn off x64 builds of installers, mod_shib13 and mod_shib20 (in build all)
---
 Projects/vc14/Shibboleth.sln                      |  9 +--------
 Projects/vc14/iis7_shib/iis7_shib.vcxproj.filters |  4 +++-
 Projects/vc14/iis7_shib/iis7_shib.vcxproj.user    | 12 ++++++++++++
 Projects/vc14/isapi_shib/isapi_shib.vcxproj.user  | 12 ++++++++++++
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/Projects/vc14/Shibboleth.sln b/Projects/vc14/Shibboleth.sln
index 388878b..4bf08c9 100644
--- a/Projects/vc14/Shibboleth.sln
+++ b/Projects/vc14/Shibboleth.sln
@@ -323,13 +323,9 @@ Global
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|x64.ActiveCfg = Release|x64
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}.Release|x64.Build.0 = Release|x64
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|Win32.Build.0 = Debug|Win32
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|x64.ActiveCfg = Debug|x64
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Debug|x64.Build.0 = Debug|x64
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|Win32.ActiveCfg = Release|Win32
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|Win32.Build.0 = Release|Win32
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|x64.ActiveCfg = Release|x64
-		{C2B1BB79-C88B-42B4-9AEC-170F91910F70}.Release|x64.Build.0 = Release|x64
 		{303291A1-C542-49E4-80B3-9304B7B6F8BC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{303291A1-C542-49E4-80B3-9304B7B6F8BC}.Debug|Win32.Build.0 = Debug|Win32
 		{303291A1-C542-49E4-80B3-9304B7B6F8BC}.Debug|x64.ActiveCfg = Debug|x64
@@ -341,19 +337,15 @@ Global
 		{D243B43E-728E-4F32-BDFF-B3A897037C6D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D243B43E-728E-4F32-BDFF-B3A897037C6D}.Debug|Win32.Build.0 = Debug|Win32
 		{D243B43E-728E-4F32-BDFF-B3A897037C6D}.Debug|x64.ActiveCfg = Debug|x64
-		{D243B43E-728E-4F32-BDFF-B3A897037C6D}.Debug|x64.Build.0 = Debug|x64
 		{D243B43E-728E-4F32-BDFF-B3A897037C6D}.Release|Win32.ActiveCfg = Release|Win32
 		{D243B43E-728E-4F32-BDFF-B3A897037C6D}.Release|Win32.Build.0 = Release|Win32
 		{D243B43E-728E-4F32-BDFF-B3A897037C6D}.Release|x64.ActiveCfg = Release|x64
-		{D243B43E-728E-4F32-BDFF-B3A897037C6D}.Release|x64.Build.0 = Release|x64
 		{68E9568B-476C-4289-B93C-893432378ADC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{68E9568B-476C-4289-B93C-893432378ADC}.Debug|Win32.Build.0 = Debug|Win32
 		{68E9568B-476C-4289-B93C-893432378ADC}.Debug|x64.ActiveCfg = Debug|x64
-		{68E9568B-476C-4289-B93C-893432378ADC}.Debug|x64.Build.0 = Debug|x64
 		{68E9568B-476C-4289-B93C-893432378ADC}.Release|Win32.ActiveCfg = Release|Win32
 		{68E9568B-476C-4289-B93C-893432378ADC}.Release|Win32.Build.0 = Release|Win32
 		{68E9568B-476C-4289-B93C-893432378ADC}.Release|x64.ActiveCfg = Release|x64
-		{68E9568B-476C-4289-B93C-893432378ADC}.Release|x64.Build.0 = Release|x64
 		{B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Debug|Win32.Build.0 = Debug|Win32
 		{B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Debug|x64.ActiveCfg = Debug|x64
@@ -366,6 +358,7 @@ Global
 		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD}.Debug|Win32.Build.0 = Debug|Win32
 		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD}.Debug|x64.ActiveCfg = Debug|x64
 		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD}.Debug|x64.Build.0 = Debug|x64
+		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD}.Debug|x64.Deploy.0 = Debug|x64
 		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD}.Release|Win32.ActiveCfg = Release|Win32
 		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD}.Release|Win32.Build.0 = Release|Win32
 		{CEE84E04-6A19-4F93-8FE5-98F9D22526DD}.Release|x64.ActiveCfg = Release|x64
diff --git a/Projects/vc14/iis7_shib/iis7_shib.vcxproj.filters b/Projects/vc14/iis7_shib/iis7_shib.vcxproj.filters
index 6705a27..1e3cdcd 100644
--- a/Projects/vc14/iis7_shib/iis7_shib.vcxproj.filters
+++ b/Projects/vc14/iis7_shib/iis7_shib.vcxproj.filters
@@ -21,7 +21,9 @@
     <ClCompile Include="..\..\..\iis7_shib\ShibHttpModule.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\util\RegistrySignature.cpp" />
+    <ClCompile Include="..\..\..\util\RegistrySignature.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\..\Iis7_Shib\iis7_shib.rc">
diff --git a/Projects/vc14/iis7_shib/iis7_shib.vcxproj.user b/Projects/vc14/iis7_shib/iis7_shib.vcxproj.user
new file mode 100644
index 0000000..422ec7f
--- /dev/null
+++ b/Projects/vc14/iis7_shib/iis7_shib.vcxproj.user
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <RemoteDebuggerCommand>C:\Windows\System32\inetsrv\w3wp.exe</RemoteDebuggerCommand>
+    <RemoteDebuggerCommandArguments>-debug</RemoteDebuggerCommandArguments>
+    <RemoteDebuggerWorkingDirectory>C:\opt\shibboleth-sp\lib64\shibboleth</RemoteDebuggerWorkingDirectory>
+    <RemoteDebuggerServerName>iis.steadingsoftware.net:4020</RemoteDebuggerServerName>
+    <RemoteDebuggerDebuggerType>Mixed</RemoteDebuggerDebuggerType>
+    <DeploymentDirectory>C:\opt\shibboleth-sp\lib64\shibboleth</DeploymentDirectory>
+    <DebuggerFlavor>WindowsRemoteDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>
diff --git a/Projects/vc14/isapi_shib/isapi_shib.vcxproj.user b/Projects/vc14/isapi_shib/isapi_shib.vcxproj.user
new file mode 100644
index 0000000..422ec7f
--- /dev/null
+++ b/Projects/vc14/isapi_shib/isapi_shib.vcxproj.user
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <RemoteDebuggerCommand>C:\Windows\System32\inetsrv\w3wp.exe</RemoteDebuggerCommand>
+    <RemoteDebuggerCommandArguments>-debug</RemoteDebuggerCommandArguments>
+    <RemoteDebuggerWorkingDirectory>C:\opt\shibboleth-sp\lib64\shibboleth</RemoteDebuggerWorkingDirectory>
+    <RemoteDebuggerServerName>iis.steadingsoftware.net:4020</RemoteDebuggerServerName>
+    <RemoteDebuggerDebuggerType>Mixed</RemoteDebuggerDebuggerType>
+    <DeploymentDirectory>C:\opt\shibboleth-sp\lib64\shibboleth</DeploymentDirectory>
+    <DebuggerFlavor>WindowsRemoteDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git



More information about the Pkg-shibboleth-devel mailing list