[shibboleth-sp2] 16/82: SSPCPP-727 turn on Apache1.3 and 2.0 in the VC14 build.
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:20 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 8a9bddd48330960214d55fa330f6af5df5fc3ef1
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Fri Feb 24 14:38:36 2017 +0000
SSPCPP-727 turn on Apache1.3 and 2.0 in the VC14 build.
https://issues.shibboleth.net/jira/browse/SSPCPP-727
NSAPI remains off.
---
Projects/vc14/Shibboleth.sln | 33 +++++++++++++++++++++++++++++++++
msi/WiX/Installer.make | 6 ++----
msi/WiX/ShibbolethSP-defs-x86.wxi | 4 ++--
msi/WiX/ShibbolethSP-exe-x64.wxs | 4 ----
msi/WiX/ShibbolethSP-exe-x86.wxs | 4 ----
msi/WiX/ShibbolethSP-main-x64.wxs | 4 ----
6 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/Projects/vc14/Shibboleth.sln b/Projects/vc14/Shibboleth.sln
index fb5e6b4..e143c51 100644
--- a/Projects/vc14/Shibboleth.sln
+++ b/Projects/vc14/Shibboleth.sln
@@ -177,6 +177,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "Wix\Installer.
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "messages", "util\messages.vcxproj", "{303291A1-C542-49E4-80B3-9304B7B6F8BC}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_shib_13", "apache\mod_shib13.vcxproj", "{D243B43E-728E-4F32-BDFF-B3A897037C6D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_shib_20", "apache\mod_shib20.vcxproj", "{68E9568B-476C-4289-B93C-893432378ADC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_shib_22", "apache\mod_shib22.vcxproj", "{B44C0852-83B8-4FB2-A86E-097C9C8256D0}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -325,6 +331,30 @@ Global
{303291A1-C542-49E4-80B3-9304B7B6F8BC}.Release|Win32.Build.0 = Release|Win32
{303291A1-C542-49E4-80B3-9304B7B6F8BC}.Release|x64.ActiveCfg = Release|x64
{303291A1-C542-49E4-80B3-9304B7B6F8BC}.Release|x64.Build.0 = Release|x64
+ {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
+ {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Debug|x64.Build.0 = Debug|x64
+ {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Release|Win32.ActiveCfg = Release|Win32
+ {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Release|Win32.Build.0 = Release|Win32
+ {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Release|x64.ActiveCfg = Release|x64
+ {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -346,5 +376,8 @@ Global
{EFF65B5B-85AB-4FD5-A217-7E6CA4219951} = {BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}
{C2B1BB79-C88B-42B4-9AEC-170F91910F70} = {BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}
{303291A1-C542-49E4-80B3-9304B7B6F8BC} = {FED80230-119E-4B2F-9F53-D2660A5F022B}
+ {D243B43E-728E-4F32-BDFF-B3A897037C6D} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
+ {68E9568B-476C-4289-B93C-893432378ADC} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
+ {B44C0852-83B8-4FB2-A86E-097C9C8256D0} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
EndGlobalSection
EndGlobal
diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
index 7d25db1..8d51397 100644
--- a/msi/WiX/Installer.make
+++ b/msi/WiX/Installer.make
@@ -1,11 +1,9 @@
-!If "$(MsVCVersion)" == "vc14"
-APACHE_MODS_X64=..\..\Build\$(MsVCVersion)\x64\Debug\mod_shib_24.so ..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_24.so
-APACHE_MODS_X86=..\..\Build\$(MsVCVersion)\Debug\mod_shib_24.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_24.so
-!Else
APACHE_MODS_X64=..\..\Build\$(MsVCVersion)\x64\Debug\mod_shib_22.so ..\..\Build\$(MsVCVersion)\x64\Debug\mod_shib_24.so \
..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\x64\Release\mod_shib_24.so
APACHE_MODS_X86=..\..\Build\$(MsVCVersion)\Debug\mod_shib_13.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_20.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_24.so \
..\..\Build\$(MsVCVersion)\Release\mod_shib_20.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_13.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_24.so
+
+!If "$(MsVCVersion)" != "vc14"
NSAPI_DLLS=..\..\Build\$(MsVCVersion)\Debug\nsapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\nsapi_shib.dll
!Endif
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index d8f2840..0ace463 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -49,10 +49,10 @@
<ComponentRef Id="adfs.so" />
<ComponentRef Id="adfs_lite.so" />
<ComponentRef Id="isapi_shib.dll" />
- <?if $(var.MsVCVersion) != "vc14" ?>
<ComponentRef Id="mod_shib_13.so" />
<ComponentRef Id="mod_shib_20.so" />
<ComponentRef Id="mod_shib_22.so" />
+ <?if $(var.MsVCVersion) != "vc14" ?>
<ComponentRef Id="nsapi_shib.dll" />
<?endif?>
<ComponentRef Id="mod_shib_24.so" />
@@ -65,10 +65,10 @@
<ComponentRef Id="adfs.so_debug" />
<ComponentRef Id="adfs_lite.so_debug" />
<ComponentRef Id="isapi_shib.dll_debug" />
- <?if $(var.MsVCVersion) != "vc14" ?>
<ComponentRef Id="mod_shib_13.so_debug" />
<ComponentRef Id="mod_shib_20.so_debug" />
<ComponentRef Id="mod_shib_22.so_debug" />
+ <?if $(var.MsVCVersion) != "vc14" ?>
<ComponentRef Id="nsapi_shib.dll_debug" />
<?endif?>
<ComponentRef Id="mod_shib_24.so_debug" />
diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
index d571ff3..54c11df 100644
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -48,11 +48,9 @@
<Component Id='isapi_shib64.dll' Guid='{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='isapi_shib64.dll' Name='isapi_shib.dll' />
</Component>
- <?if $(var.MsVCVersion) != "vc14" ?>
<Component Id='mod_shib_2264.so' Guid='{3C8F67F5-C7C2-40DB-94AB-A26266C113C8}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_2264.so' Name='mod_shib_22.so' />
</Component>
- <?endif ?>
<Component Id='mod_shib_2464.so' Guid='{6A7EDDE5-9593-4A8D-B767-E171856EEDD4}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_2464.so' Name='mod_shib_24.so' />
</Component>
@@ -81,11 +79,9 @@
<Component Id='isapi_shib64.dll_debug' Guid='{60BC5679-A40E-42E5-9FC0-CCE924E660ED}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='isapi_shib64.dll_debug' Name='isapi_shib.dll' />
</Component>
- <?if $(var.MsVCVersion) != "vc14" ?>
<Component Id='mod_shib_2264.so_debug' Guid='{59FE3C18-1920-48A0-80BC-7ECF8579E441}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_2264.so_debug' Name='mod_shib_22.so' />
</Component>
- <?endif ?>
<Component Id='mod_shib_2464.so_debug' Guid='{38EE87FE-EA2B-41B4-A457-38A8F84B9866}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_2464.so_debug' Name='mod_shib_24.so' />
</Component>
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index f9457ea..a978081 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -48,7 +48,6 @@
<Component Id='isapi_shib.dll' Guid='{716D6F4F-4185-4219-B1BA-1D15F867926E}'>
<File KeyPath='yes' Checksum='yes' Name='isapi_shib.dll' />
</Component>
- <?if $(var.MsVCVersion) != "vc14" ?>
<Component Id='mod_shib_13.so' Guid='{5C85940B-7644-4AA4-9948-9EFFC1729EFB}'>
<File KeyPath='yes' Checksum='yes' Name='mod_shib_13.so' />
</Component>
@@ -58,7 +57,6 @@
<Component Id='mod_shib_22.so' Guid='{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}'>
<File KeyPath='yes' Checksum='yes' Name='mod_shib_22.so' />
</Component>
- <?endif ?>
<Component Id='mod_shib_24.so' Guid='{8CAE4DF0-C8A8-4A48-A213-F4B3AFE6F439}'>
<File KeyPath='yes' Checksum='yes' Name='mod_shib_24.so' />
</Component>
@@ -92,7 +90,6 @@
<Component Id='isapi_shib.dll_debug' Guid='{F8212D30-0BA8-4F02-B595-E8E5D312342B}'>
<File KeyPath='yes' Checksum='yes' Id='isapi_shib.dll_debug' Name='isapi_shib.dll' />
</Component>
- <?if $(var.MsVCVersion) != "vc14" ?>
<Component Id='mod_shib_13.so_debug' Guid='{E8B798AB-D772-428D-8033-2A77CB437CF0}'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_13.so_debug' Name='mod_shib_13.so' />
</Component>
@@ -102,7 +99,6 @@
<Component Id='mod_shib_22.so_debug' Guid='{3DA4492F-C0EA-4286-9C37-13F82342FA67}'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_22.so_debug' Name='mod_shib_22.so' />
</Component>
- <?endif?>
<Component Id='mod_shib_24.so_debug' Guid='{E04003DF-8C61-4C9E-87AB-89223C5E65DC}'>
<File KeyPath='yes' Checksum='yes' Id='mod_shib_24.so_debug' Name='mod_shib_24.so' />
</Component>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 1ac3a72..5195914 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -139,9 +139,7 @@
<ComponentRef Id='adfs64.so'/>
<ComponentRef Id='adfs_lite64.so'/>
<ComponentRef Id='isapi_shib64.dll'/>
- <?if $(var.MsVCVersion) != "vc14" ?>
<ComponentRef Id='mod_shib_2264.so'/>
- <?endif?>
<ComponentRef Id='mod_shib_2464.so'/>
<ComponentRef Id='odbc_store64.so'/>
<ComponentRef Id='plugins64.so'/>
@@ -152,9 +150,7 @@
<ComponentRef Id='adfs64.so_debug'/>
<ComponentRef Id='adfs_lite64.so_debug'/>
<ComponentRef Id='isapi_shib64.dll_debug'/>
- <?if $(var.MsVCVersion) != "vc14" ?>
<ComponentRef Id='mod_shib_2264.so_debug'/>
- <?endif?>
<ComponentRef Id='mod_shib_2464.so_debug'/>
<ComponentRef Id='odbc_store64.so_debug'/>
<ComponentRef Id='plugins64.so_debug'/>
--
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