[shibboleth-sp2] 60/82: SSPCPP-689 Installer work for VC15
Etienne Dysli Metref
edm-guest at moszumanska.debian.org
Thu Nov 16 08:16:26 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 2a6ce076964d65f0016388b34ce1132a03d198e9
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date: Tue Sep 5 10:12:31 2017 +0100
SSPCPP-689 Installer work for VC15
https://issues.shibboleth.net/jira/browse/SSPCPP-689
- Only Build with OpenSSL1 (removing shedloads of conditionals)
- Conditionalize NSAPI and FastCGI
- Remove Mod_Shib 1.3 and 2.0
- The merge modules are not installed to the default place
by VS so they need to be pointed to. Pop their location into
the Versions.props.
---
Projects/vc15/Shibboleth.sln | 18 ---
Projects/vc15/apache/mod_shib13.vcxproj | 15 ++-
Projects/vc15/wix/Installer.vcxproj | 8 +-
Projects/vc15/wix/MergeModules.vcxproj | 8 +-
msi/WiX/Installer.make | 40 ++++--
msi/WiX/MergeModules/Curl-x64.wxs | 18 +--
msi/WiX/MergeModules/Curl-x86.wxs | 19 +--
msi/WiX/MergeModules/MergeModules.make | 224 ++++++++++++++++++++++----------
msi/WiX/MergeModules/OpenSSL-x64.wxs | 13 --
msi/WiX/MergeModules/OpenSSL-x86.wxs | 13 --
msi/WiX/ShibbolethSP-defs-x86.wxi | 12 +-
msi/WiX/ShibbolethSP-exe-x64.wxs | 4 +
msi/WiX/ShibbolethSP-exe-x86.wxs | 20 +--
msi/WiX/ShibbolethSP-main-x64.wxs | 20 ++-
msi/WiX/ShibbolethSP-main-x86.wxs | 10 +-
15 files changed, 250 insertions(+), 192 deletions(-)
diff --git a/Projects/vc15/Shibboleth.sln b/Projects/vc15/Shibboleth.sln
index 1162755..bca884e 100644
--- a/Projects/vc15/Shibboleth.sln
+++ b/Projects/vc15/Shibboleth.sln
@@ -171,10 +171,6 @@ 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
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iis7_shib", "iis7_shib\iis7_shib.vcxproj", "{CEE84E04-6A19-4F93-8FE5-98F9D22526DD}"
@@ -316,18 +312,6 @@ 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}.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
- {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}.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
{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
@@ -364,8 +348,6 @@ 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}
{CEE84E04-6A19-4F93-8FE5-98F9D22526DD} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
EndGlobalSection
diff --git a/Projects/vc15/apache/mod_shib13.vcxproj b/Projects/vc15/apache/mod_shib13.vcxproj
index 7f87a2d..67a56f8 100644
--- a/Projects/vc15/apache/mod_shib13.vcxproj
+++ b/Projects/vc15/apache/mod_shib13.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -21,6 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{D243B43E-728E-4F32-BDFF-B3A897037C6D}</ProjectGuid>
<ProjectName>mod_shib_13</ProjectName>
+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -75,10 +76,10 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC15\$(Platform)\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC15\\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC15\\$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
@@ -97,6 +98,12 @@
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.so</TargetExt>
<TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.so</TargetExt>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <IntDir>$(ProjectName)-$(Configuration)\</IntDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <IntDir>$(ProjectName)-$(Configuration)\</IntDir>
+ </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -258,4 +265,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Projects/vc15/wix/Installer.vcxproj b/Projects/vc15/wix/Installer.vcxproj
index e608bb2..6155ec7 100644
--- a/Projects/vc15/wix/Installer.vcxproj
+++ b/Projects/vc15/wix/Installer.vcxproj
@@ -48,26 +48,26 @@ nmake /f Installer.make clean</NMakeBuildCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\
-nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) all32</NMakeBuildCommandLine>
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" all32</NMakeBuildCommandLine>
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\
del *86.wixobj
del *86.msi
del *.wixlib
del *x86.wixpdb</NMakeCleanCommandLine>
- <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) rebuild32</NMakeReBuildCommandLine>
+ <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" rebuild32</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>
</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\
-nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) MsVCVersion=$(MsVCVersion) all64</NMakeBuildCommandLine>
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" all64</NMakeBuildCommandLine>
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\
del *64.wixobj
del *64.msmi
del *.wixlib
del *64.wixpdb</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\
-nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) MsVCVersion=$(MsVCVersion) rebuild64</NMakeReBuildCommandLine>
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) MsVCVersion=$(MsVCVersion) CppMmDir="$(CppMmDir)" rebuild64</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<ItemDefinitionGroup>
diff --git a/Projects/vc15/wix/MergeModules.vcxproj b/Projects/vc15/wix/MergeModules.vcxproj
index 141c07e..a2e95fd 100644
--- a/Projects/vc15/wix/MergeModules.vcxproj
+++ b/Projects/vc15/wix/MergeModules.vcxproj
@@ -50,7 +50,7 @@ nmake /f MergeModules.make clean</NMakeReBuildCommandLine>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(X [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(X [...]
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
del *86.wixobj
del *86.msm
@@ -59,14 +59,14 @@ del OpenSAML-schemas.wixpdb
del OpenSAML-schemas.wixobj
del OpenSAML-schemas.msm</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32= [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32= [...]
<NMakePreprocessorDefinitions>
</NMakePreprocessorDefinitions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<NMakeBuildCommandLine>
cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$( [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$( [...]
<NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
del *64.wixobj
del *64.msm
@@ -75,7 +75,7 @@ del OpenSAML-schemas.wixpdb
del OpenSAML-schemas.wixobj
del OpenSAML-schemas.msm</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
-nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(X [...]
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(X [...]
<NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
</PropertyGroup>
<ItemDefinitionGroup>
diff --git a/msi/WiX/Installer.make b/msi/WiX/Installer.make
index 8d51397..4691c07 100644
--- a/msi/WiX/Installer.make
+++ b/msi/WiX/Installer.make
@@ -1,10 +1,28 @@
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"
+APACHE_MODS_X86=..\..\Build\$(MsVCVersion)\Debug\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Debug\mod_shib_24.so \
+ ..\..\Build\$(MsVCVersion)\Release\mod_shib_22.so ..\..\Build\$(MsVCVersion)\Release\mod_shib_24.so
+
+!If "$(MsVCVersion)" == "vc10"
NSAPI_DLLS=..\..\Build\$(MsVCVersion)\Debug\nsapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\nsapi_shib.dll
+FCGI86=MergeModules\FastCGI-x86.msm
+FCGI64=MergeModules\FastCGI-x64.msm
+FCGI_AUTH_RESP86= ..\..\Build\$(MsVCVersion)\Release\shibauthorizer.exe\
+ ..\..\Build\$(MsVCVersion)\Release\shibresponder.exe\
+ ..\..\Build\$(MsVCVersion)\Debug\shibauthorizer.exe\
+ ..\..\Build\$(MsVCVersion)\Debug\shibresponder.exe
+FCGI_AUTH_RESP64=..\..\Build\$(MsVCVersion)\x64\Release\shibauthorizer.exe\
+ ..\..\Build\$(MsVCVersion)\x64\Release\shibresponder.exe\
+ ..\..\Build\$(MsVCVersion)\x64\Debug\shibauthorizer.exe\
+ ..\..\Build\$(MsVCVersion)\x64\Debug\shibresponder.exe\
+!else
+
+!Endif
+
+!If "$(CppMmDir)" == ""
+CppMmDir=C:\Program Files (x86)\Common Files\Merge Modules
+!else
!Endif
all: all32 all64
@@ -44,9 +62,9 @@ Shibboleth.wixlib: ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj Shibbo
#
# Individual files
#
-ShibbolethSP-exe-x64.wixobj: ShibbolethSP-exe-x64.wxs ..\..\Build\$(MsVCVersion)\x64\Release\shibd.exe ..\..\Build\$(MsVCVersion)\x64\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\x64\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\x64\Release\adfs.so ..\..\Build\$(MsVCVersion)\x64\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\x64\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\x64\Release\odbc-store.so ..\..\Build\$(MsVCVersion)\x64\Release\plugins.so ..\..\Build\$(MsVCVersion) [...]
+ShibbolethSP-exe-x64.wixobj: ShibbolethSP-exe-x64.wxs ..\..\Build\$(MsVCVersion)\x64\Release\shibd.exe ..\..\Build\$(MsVCVersion)\x64\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\x64\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\x64\Release\adfs.so ..\..\Build\$(MsVCVersion)\x64\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\x64\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\x64\Release\odbc-store.so ..\..\Build\$(MsVCVersion)\x64\Release\plugins.so ..\..\Build\$(MsVCVersion) [...]
wixcop -indent:2 ShibbolethSP-exe-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x64.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x64.wxs -dFCGI="$(FCGI_AUTH_RESP64)"
ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs
wixcop -indent:2 ShibbolethSP-registry-x64.wxs
@@ -56,9 +74,9 @@ ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs ..\scripts\shib_install_isap
wixcop -indent:2 ShibbolethSP-noarch.wxs
candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-noarch.wxs
-ShibbolethSP-exe-x86.wixobj: ShibbolethSP-exe-x86.wxs ..\..\Build\$(MsVCVersion)\Release\shibd.exe ..\..\Build\$(MsVCVersion)\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\Release\adfs.so ..\..\Build\$(MsVCVersion)\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\odbc-store.so ..\..\Build\$(MsVCVersion)\Release\plugins.so ..\..\Build\$(MsVCVersion)\Release\plugins-lite.so ..\..\ [...]
+ShibbolethSP-exe-x86.wixobj: ShibbolethSP-exe-x86.wxs ..\..\Build\$(MsVCVersion)\Release\shibd.exe ..\..\Build\$(MsVCVersion)\Release\resolvertest.exe ..\..\Build\$(MsVCVersion)\Release\mdquery.exe ..\..\Build\$(MsVCVersion)\Release\adfs.so ..\..\Build\$(MsVCVersion)\Release\adfs-lite.so ..\..\Build\$(MsVCVersion)\Release\isapi_shib.dll ..\..\Build\$(MsVCVersion)\Release\odbc-store.so ..\..\Build\$(MsVCVersion)\Release\plugins.so ..\..\Build\$(MsVCVersion)\Release\plugins-lite.so $(FCGI [...]
wixcop -indent:2 ShibbolethSP-exe-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x86.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dMsVCVersion=$(MsVCVersion) ShibbolethSP-exe-x86.wxs -dNSApi="$(NSAPI_DLLS)" -dFCGI="$(FCGI_AUTH_RESP86)"
ShibbolethSP-registry-x86.wixobj: ShibbolethSP-registry-x86.wxs
wixcop -indent:2 ShibbolethSP-registry-x86.wxs
@@ -76,10 +94,10 @@ ShibbolethSP-install-dlg.wixobj: ShibbolethSP-install-dlg.wxs
wixcop -indent:2 ShibbolethSP-install-dlg.wxs
candle ShibbolethSP-install-dlg.wxs
-ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm MergeModules\FastCGI-x64.msm [...]
+ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm $(FCGI86) MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm MergeModules\Curl-x64.msm $(FCGI64) MergeModules\Log4Shib-x64.msm MergeMo [...]
wixcop -indent:2 ShibbolethSP-main-x64.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x64.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)"
-ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm MergeModules\FastCGI-x86.msm MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
+ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs ShibbolethSP-properties.wxi ShibbolethSP-defs-x86.wxi MergeModules\Curl-x86.msm $(FCGI86) MergeModules\Log4Shib-x86.msm MergeModules\OpenSAML-x86.msm MergeModules\OpenSAML-schemas.msm MergeModules\OpenSSL-x86.msm MergeModules\Shibboleth-x86.msm MergeModules\Shibboleth-schemas.msm MergeModules\Xerces-x86.msm MergeModules\XmlSec-x86.msm MergeModules\Zlib-x86.msm
wixcop -indent:2 ShibbolethSP-main-x86.wxs
- candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs
+ candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethPatchVersion=$(ShibbolethPatchVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) -dMsVCVersion=$(MsVCVersion) ShibbolethSP-main-x86.wxs -dFCGI="$(FCGI64)" -dNSApi="$(NSAPI_DLLS)" -dCppMmDir="$(CppMmDir)"
diff --git a/msi/WiX/MergeModules/Curl-x64.wxs b/msi/WiX/MergeModules/Curl-x64.wxs
index e4a6230..804b1c4 100644
--- a/msi/WiX/MergeModules/Curl-x64.wxs
+++ b/msi/WiX/MergeModules/Curl-x64.wxs
@@ -16,21 +16,11 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<?if $(var.OpenSSLV1Libs) = "1" ?>
+<?define ReleaseDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define ReleaseExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define DebugDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define DebugExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define ReleaseDllDir="builds\libcurl-vc14-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define ReleaseExeDir="builds\libcurl-vc14-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define DebugDllDir="builds\libcurl-vc14-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define DebugExeDir="builds\libcurl-vc14-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-
-<?else ?>
-
-<?define ReleaseDllDir="lib\release-dll-ssl-dll-zlib-dll.x64"?>
-<?define DebugDllDir="lib\debug-dll-ssl-dll-zlib-dll.x64"?>
-<?define ReleaseExeDir="src\release.x64"?>
-<?define DebugExeDir="src\debug"?>
-
-<?endif ?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Module Id='CurlMergeModule_x64' Language='1033' Version='$(var.CurlVersion)'>
diff --git a/msi/WiX/MergeModules/Curl-x86.wxs b/msi/WiX/MergeModules/Curl-x86.wxs
index 811a618..a3a9001 100644
--- a/msi/WiX/MergeModules/Curl-x86.wxs
+++ b/msi/WiX/MergeModules/Curl-x86.wxs
@@ -16,21 +16,10 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<?if $(var.OpenSSLV1Libs) = "1" ?>
-
-<?define ReleaseDllDir="builds\libcurl-vc14-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define ReleaseExeDir="builds\libcurl-vc14-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define DebugDllDir="builds\libcurl-vc14-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-<?define DebugExeDir="builds\libcurl-vc14-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
-
-<?else ?>
-
-<?define ReleaseDllDir="lib\release-dll-ssl-dll-zlib-dll"?>
-<?define DebugDllDir="lib\debug-dll-ssl-dll-zlib-dll"?>
-<?define ReleaseExeDir="src\release"?>
-<?define DebugExeDir="src\debug"?>
-
-<?endif ?>
+<?define ReleaseDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define ReleaseExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define DebugDllDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
+<?define DebugExeDir="builds\libcurl-$(var.ShibbolethMsVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\bin"?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
diff --git a/msi/WiX/MergeModules/MergeModules.make b/msi/WiX/MergeModules/MergeModules.make
index 05e817e..d586317 100644
--- a/msi/WiX/MergeModules/MergeModules.make
+++ b/msi/WiX/MergeModules/MergeModules.make
@@ -1,13 +1,17 @@
all: all32 all64
-all32: Curl-x86.msm FastCGI-x86.msm Log4shib-x86.msm OpenSAML-x86.msm OpenSAML-schemas.msm OpenSSL-x86.msm Shibboleth-x86.msm Shibboleth-schemas.msm Xerces-x86.msm XmlSec-x86.msm Zlib-x86.msm
+all32: Curl-x86.msm Log4shib-x86.msm OpenSAML-x86.msm OpenSAML-schemas.msm\
+ OpenSSL-x86.msm Shibboleth-x86.msm Shibboleth-schemas.msm Xerces-x86.msm\
+ XmlSec-x86.msm Zlib-x86.msm
-all64: Curl-x64.msm FastCGI-x64.msm Log4shib-x64.msm OpenSAML-x64.msm OpenSAML-schemas.msm OpenSSL-x64.msm Shibboleth-x64.msm Shibboleth-schemas.msm Xerces-x64.msm XmlSec-x64.msm Zlib-x64.msm
+all64: Curl-x64.msm Log4shib-x64.msm OpenSAML-x64.msm OpenSAML-schemas.msm\
+ OpenSSL-x64.msm Shibboleth-x64.msm Shibboleth-schemas.msm Xerces-x64.msm\
+ XmlSec-x64.msm Zlib-x64.msm
-clean32:
+clean32:
del *-x86.msm *-x86.wixobj *-x86.wixpdb *schemas.wixobj *schemas.msm
-clean64:
+clean64:
del *-x64.wixobj *-x64.msm *-x64.wixpdb *schemas.wixobj *schemas.msm
clean: clean32 clean64
@@ -17,42 +21,49 @@ rebuild32: clean32 all32
rebuild64: clean64 all64
#
-# CURL
+# CURL
#
-Curl-x64.msm: Curl-x64.wixobj
+Curl-x64.msm: Curl-x64.wixobj
light Curl-x64.wixobj
del ..\*64*.msi
Curl-x64.wixobj: Curl-x64.wxs
- wixcop -indent:2 Curl-x64.wxs
- candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
+ wixcop -indent:2 Curl-x64.wxs
+ candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\
+ -dShibbolethMsVersion=$(MsVCVersion)
-Curl-x86.msm: Curl-x86.wixobj
+Curl-x86.msm: Curl-x86.wixobj
light Curl-x86.wixobj
del ..\*32*.msi
Curl-x86.wixobj: Curl-x86.wxs
- wixcop -indent:2 Curl-x86.wxs
- candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
+ wixcop -indent:2 Curl-x86.wxs
+ candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\
+ -dShibbolethMsVersion=$(MsVCVersion)
#
# FastCGI
#
-FastCGI-x86.msm: FastCGI-x86.wixobj
- light FastCGI-x86.wixobj
- del ..\*32*.msi
+FastCGI-x86.msm: FastCGI-x86.wixobj
+ light FastCGI-x86.wixobj
-FastCGI-x86.wixobj: FastCGI-x86.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\Release\libfcgi.dll $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\Debug\libfcgid.dll
- wixcop -indent:2 FastCGI-x86.wxs
- candle FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion) -dShibbolethMsVersion=$(MsVCVersion)
+FastCGI-x86.wixobj: FastCGI-x86.wxs\
+ $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\Release\libfcgi.dll \
+ $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\Debug\libfcgid.dll
+ wixcop -indent:2 FastCGI-x86.wxs
+ candle FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\
+ -dShibbolethMsVersion=$(MsVCVersion)
-FastCGI-x64.msm: FastCGI-x64.wixobj
+FastCGI-x64.msm: FastCGI-x64.wixobj
light FastCGI-x64.wixobj
- del ..\*64*.msi
-FastCGI-x64.wixobj: FastCGI-x64.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\x64\Release\libfcgi.dll $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\x64\Debug\libfcgid.dll
- wixcop -indent:2 FastCGI-x64.wxs
- candle FastCGI-x64.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion) -dShibbolethMsVersion=$(MsVCVersion)
+
+FastCGI-x64.wixobj: FastCGI-x64.wxs\
+ $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\x64\Release\libfcgi.dll
+ $(BuildSP)\fcgi-$(FastCGIVersion)-$(MsVCVersion)\Win32\x64\Debug\libfcgid.dll
+ wixcop -indent:2 FastCGI-x64.wxs
+ candle FastCGI-x64.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\
+ -dShibbolethMsVersion=$(MsVCVersion)
#
# Log 4 shib. More complicated since it has a version and a file version (and hence 2 components per architecture)
@@ -65,13 +76,21 @@ Log4Shib-x86.msm: Log4Shib-x86.wixobj
light Log4Shib-x86.wixobj
del ..\*32*.msi
-Log4Shib-x86.wixobj: Log4Shib-x86.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\Release\log4shib$(Log4ShibFileVersion).dll
- wixcop -indent:2 Log4Shib-x86.wxs
- candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d) -dShibbolethMsVersion=$(MsVCVersion)
-
-Log4Shib-x64.wixobj: Log4Shib-x64.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\x64\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\x64\Release\log4shib$(Log4ShibFileVersion).dll
- wixcop -indent:2 Log4Shib-x64.wxs
- candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent64=$(Log4ShibComponent64) -dLog4ShibComponent64d=$(Log4ShibComponent64d) -dShibbolethMsVersion=$(MsVCVersion)
+Log4Shib-x86.wixobj: Log4Shib-x86.wxs\
+ $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\Debug\log4shib$(Log4ShibFileVersion)D.dll\
+ $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\Release\log4shib$(Log4ShibFileVersion).dll
+ wixcop -indent:2 Log4Shib-x86.wxs
+ candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion)\
+ -dLog4ShibFileVersion=$(Log4ShibFileVersion)\
+ -dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d)\
+ -dShibbolethMsVersion=$(MsVCVersion)
+
+Log4Shib-x64.wixobj: Log4Shib-x64.wxs\
+ $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\x64\Debug\log4shib$(Log4ShibFileVersion)D.dll\
+ $(BuildSP)\log4shib-$(Log4ShibVersion)\ms$(MsVCVersion)\x64\Release\log4shib$(Log4ShibFileVersion).dll
+ wixcop -indent:2 Log4Shib-x64.wxs
+ candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion)\
+ -dLog4ShibComponent64=$(Log4ShibComponent64) -dLog4ShibComponent64d=$(Log4ShibComponent64d) -dShibbolethMsVersion=$(MsVCVersion)
#
# OpenSAML
@@ -84,21 +103,39 @@ OpenSAML-x64.msm: OpenSAML-x64.wixobj
light OpenSAML-x64.wixobj
del ..\*64*.msi
-OpenSAML-x86.wixobj: OpenSAML-x86.wxs $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling-lite$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Debug\xmltooling$(XmlToolingFileVersion)d.dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Debu [...]
- wixcop -indent:2 OpenSAML-x86.wxs
- candle OpenSAML-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion) -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent32=$(SamlComponent32) -dXMLToolingComponent32=$(XMLToolingComponent32) -dXMLToolingLiteComponent32=$(XMLToolingLiteComponent32) -dSamlComponent32d=$(SamlComponent32d) -dXMLToolingComponent32d=$(XMLToolingComponent32d) -dXMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) -dShibbo [...]
-
-OpenSAML-x64.wixobj: OpenSAML-x64.wxs $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Release\xmltooling$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Release\xmltooling-lite$(XmlToolingFileVersion).dll $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\x64\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Debug\xmltooling$(XmlToolingFileVersion)d.dll $(SolutionDir)..\cpp-xmltooling\Build\$(M [...]
- wixcop -indent:2 OpenSAML-x64.wxs
- candle OpenSAML-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion) -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent64=$(SamlComponent64) -dXMLToolingComponent64=$(XMLToolingComponent64) -dXMLToolingLiteComponent64=$(XMLToolingLiteComponent64) -dSamlComponent64d=$(SamlComponent64d) -dXMLToolingComponent64d=$(XMLToolingComponent64d) -dXMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) -dShibb [...]
+OpenSAML-x86.wixobj: OpenSAML-x86.wxs $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling$(XmlToolingFileVersion).dll\
+ $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Release\xmltooling-lite$(XmlToolingFileVersion).dll\
+ $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\Release\saml$(OpenSAMLFileVersion).dll\
+ $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Debug\xmltooling$(XmlToolingFileVersion)d.dll\
+ $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll\
+ $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\Debug\saml$(OpenSAMLFileVersion)d.dll
+ wixcop -indent:2 OpenSAML-x86.wxs
+ candle OpenSAML-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion)\
+ -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent32=$(SamlComponent32)\
+ -dXMLToolingComponent32=$(XMLToolingComponent32) -dXMLToolingLiteComponent32=$(XMLToolingLiteComponent32)\
+ -dSamlComponent32d=$(SamlComponent32d) -dXMLToolingComponent32d=$(XMLToolingComponent32d) \
+ -dXMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) -dShibbolethMsVersion=$(MsVCVersion)
+
+OpenSAML-x64.wixobj: OpenSAML-x64.wxs $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Release\xmltooling$(XmlToolingFileVersion).dll\
+ $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Release\xmltooling-lite$(XmlToolingFileVersion).dll\
+ $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\x64\Release\saml$(OpenSAMLFileVersion).dll\
+ $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Debug\xmltooling$(XmlToolingFileVersion)d.dll\
+ $(SolutionDir)..\cpp-xmltooling\Build\$(MsVCVersion)\x64\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll\
+ $(SolutionDir)..\cpp-OpenSaml\Build\$(MsVCVersion)\x64\Debug\saml$(OpenSAMLFileVersion)d.dll
+ wixcop -indent:2 OpenSAML-x64.wxs
+ candle OpenSAML-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion)\
+ -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent64=$(SamlComponent64)\
+ -dXMLToolingComponent64=$(XMLToolingComponent64) -dXMLToolingLiteComponent64=$(XMLToolingLiteComponent64)\
+ -dSamlComponent64d=$(SamlComponent64d) -dXMLToolingComponent64d=$(XMLToolingComponent64d)\
+ -dXMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) -dShibbolethMsVersion=$(MsVCVersion)
OpenSAML-schemas.msm: OpenSAML-schemas.wixobj
light OpenSAML-schemas.wixobj
del ..\*.msi
OpenSAML-schemas.wixobj: OpenSAML-schemas.wxs
- wixcop -indent:2 OpenSAML-schemas.wxs
- candle OpenSAML-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion)
+ wixcop -indent:2 OpenSAML-schemas.wxs
+ candle OpenSAML-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion)
#
# OpenSSL
@@ -112,12 +149,16 @@ OpenSSL-x64.msm: OpenSSL-x64.wixobj
del ..\*64*.msi
OpenSSL-x86.wixobj: OpenSSL-x86.wxs
- wixcop -indent:2 OpenSSL-x86.wxs
- candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component) -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
+ wixcop -indent:2 OpenSSL-x86.wxs
+ candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion)\
+ -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component)\
+ -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd)
OpenSSL-x64.wixobj: OpenSSL-x64.wxs
- wixcop -indent:2 OpenSSL-x64.wxs
- candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay64Component=$(LibEay64Component) -dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd) -dSSlEay64Componentd=$(SSlEay64Componentd) -dOpenSSLV1Libs=$(OpenSSL1_1Libs)
+ wixcop -indent:2 OpenSSL-x64.wxs
+ candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion)\
+ -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay64Component=$(LibEay64Component)\
+ -dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd) -dSSlEay64Componentd=$(SSlEay64Componentd)
#
# Shibboleth DLL
@@ -130,20 +171,32 @@ Shibboleth-x64.msm: Shibboleth-x64.wixobj
light Shibboleth-x64.wixobj
del ..\*64*.msi
-Shibboleth-x86.wixobj: Shibboleth-x86.wxs $(SolutionDir)Build\$(MsVCVersion)\Release\shibsp$(ShibbolethDllFileVersion).dll $(SolutionDir)Build\$(MsVCVersion)\Release\shibsp-lite$(ShibbolethDllFileVersion).dll $(SolutionDir)Build\$(MsVCVersion)\Debug\shibsp$(ShibbolethDllFileVersion)d.dll $(SolutionDir)Build\$(MsVCVersion)\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll
- wixcop -indent:2 Shibboleth-x86.wxs
- candle Shibboleth-x86.wxs -dSPBuildDirectory=$(SolutionDir) -dShibbolethMsVersion=$(MsVCVersion) -dShibbolethDllVersion=$(ShibbolethDllVersion) -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll32Component=$(ShibDll32Component) -dShibDllLite32Component=$(ShibDllLite32Component) -dShibDll32Componentd=$(ShibDll32Componentd) -dShibDllLite32Componentd=$(ShibDllLite32Componentd)
-
-Shibboleth-x64.wixobj: Shibboleth-x64.wxs $(SolutionDir)Build\$(MsVCVersion)\x64\Release\shibsp$(ShibbolethDllFileVersion).dll $(SolutionDir)Build\$(MsVCVersion)\x64\Release\shibsp-lite$(ShibbolethDllFileVersion).dll $(SolutionDir)Build\$(MsVCVersion)\x64\Debug\shibsp$(ShibbolethDllFileVersion)d.dll $(SolutionDir)Build\$(MsVCVersion)\x64\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll
- wixcop -indent:2 Shibboleth-x64.wxs
- candle Shibboleth-x64.wxs -dSPBuildDirectory=$(SolutionDir) -dShibbolethMsVersion=$(MsVCVersion) -dShibbolethDllVersion=$(ShibbolethDllVersion) -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll64Component=$(ShibDll64Component) -dShibDllLite64Component=$(ShibDllLite64Component) -dShibDll64Componentd=$(ShibDll64Componentd) -dShibDllLite64Componentd=$(ShibDllLite64Componentd)
+Shibboleth-x86.wixobj: Shibboleth-x86.wxs $(SolutionDir)Build\$(MsVCVersion)\Release\shibsp$(ShibbolethDllFileVersion).dll\
+ $(SolutionDir)Build\$(MsVCVersion)\Release\shibsp-lite$(ShibbolethDllFileVersion).dll\
+ $(SolutionDir)Build\$(MsVCVersion)\Debug\shibsp$(ShibbolethDllFileVersion)d.dll\
+ $(SolutionDir)Build\$(MsVCVersion)\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll
+ wixcop -indent:2 Shibboleth-x86.wxs
+ candle Shibboleth-x86.wxs -dSPBuildDirectory=$(SolutionDir) -dShibbolethMsVersion=$(MsVCVersion) -dShibbolethDllVersion=$(ShibbolethDllVersion)\
+ -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll32Component=$(ShibDll32Component)\
+ -dShibDllLite32Component=$(ShibDllLite32Component) -dShibDll32Componentd=$(ShibDll32Componentd)\
+ -dShibDllLite32Componentd=$(ShibDllLite32Componentd)
+
+Shibboleth-x64.wixobj: Shibboleth-x64.wxs $(SolutionDir)Build\$(MsVCVersion)\x64\Release\shibsp$(ShibbolethDllFileVersion).dll\
+ $(SolutionDir)Build\$(MsVCVersion)\x64\Release\shibsp-lite$(ShibbolethDllFileVersion).dll\
+ $(SolutionDir)Build\$(MsVCVersion)\x64\Debug\shibsp$(ShibbolethDllFileVersion)d.dll\
+ $(SolutionDir)Build\$(MsVCVersion)\x64\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll
+ wixcop -indent:2 Shibboleth-x64.wxs
+ candle Shibboleth-x64.wxs -dSPBuildDirectory=$(SolutionDir) -dShibbolethMsVersion=$(MsVCVersion) -dShibbolethDllVersion=$(ShibbolethDllVersion)\
+ -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll64Component=$(ShibDll64Component)\
+ -dShibDllLite64Component=$(ShibDllLite64Component) -dShibDll64Componentd=$(ShibDll64Componentd)\
+ -dShibDllLite64Componentd=$(ShibDllLite64Componentd)
Shibboleth-schemas.msm: Shibboleth-schemas.wixobj
light Shibboleth-schemas.wixobj
Shibboleth-schemas.wixobj: Shibboleth-schemas.wxs
- wixcop -indent:2 Shibboleth-schemas.wxs
- candle Shibboleth-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion)
+ wixcop -indent:2 Shibboleth-schemas.wxs
+ candle Shibboleth-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion)
#
@@ -161,15 +214,19 @@ XercesDll32=$(BuildSP)$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFi
XercesDebugDll32=$(BuildSP)$(Xerces)\Install32\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
Xerces-x86.wixobj: Xerces-x86.wxs $(XercesDll32) Xerces-x86.wxs $(XercesDebugDll32)
- wixcop -indent:2 Xerces-x86.wxs
- candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesDll=$(XercesDll32) -dXercesDebugDll=$(XercesDebugDll32) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd) -dShibbolethMsVersion=$(MsVCVersion)
+ wixcop -indent:2 Xerces-x86.wxs
+ candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesDll=$(XercesDll32) -dXercesDebugDll=$(XercesDebugDll32) -dXercesVersion=$(XercesVersion)\
+ -dXercesFileVersion=$(XercesFileVersion) -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd)\
+ -dShibbolethMsVersion=$(MsVCVersion)
XercesDll64=$(BuildSP)$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion).dll
XercesDebugDll64=$(BuildSP)$(Xerces)\Install64\$(MsVCVersion)\bin\xerces-c_$(XercesFileVersion)D.dll
Xerces-x64.wixobj: Xerces-x64.wxs $(XercesDll64) Xerces-x86.wxs $(XercesDebugDll64)
- wixcop -indent:2 Xerces-x64.wxs
- candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesDll=$(XercesDll64) -dXercesDebugDll=$(XercesDebugDll64) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd) -dShibbolethMsVersion=$(MsVCVersion)
+ wixcop -indent:2 Xerces-x64.wxs
+ candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesDll=$(XercesDll64) -dXercesDebugDll=$(XercesDebugDll64) -dXercesVersion=$(XercesVersion)\
+ -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd)\
+ -dShibbolethMsVersion=$(MsVCVersion)
#
@@ -183,13 +240,41 @@ XmlSec-x64.msm: XmlSec-x64.wixobj
light XmlSec-x64.wixobj
del ..\*64*.msi
-XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\xsec_$(XmlSecFileVersion).dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVers [...]
- wixcop -indent:2 XmlSec-x86.wxs
- candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) -dShibbolethMsVersion=$(MsVCVersion)
-
-XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\xsec_$(XmlSecFileVersion).dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Bui [...]
- wixcop -indent:2 XmlSec-x64.wxs
- candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd) -dShibbolethMsVersion=$(MsVCVersion)
+XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\xsec_$(XmlSecFileVersion).dll"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\c14n.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\checksig.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\cipher.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\siginf.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\templatesign.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Release No Xalan\txfmout.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\xsec_$(XmlSecFileVersion)D.dll"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\c14n.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\checksig.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\cipher.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\siginf.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\templatesign.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\$(MsVCVersion)\Debug No Xalan\txfmout.exe"
+ wixcop -indent:2 XmlSec-x86.wxs
+ candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion)\
+ -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd) -dShibbolethMsVersion=$(MsVCVersion)
+
+XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\xsec_$(XmlSecFileVersion).dll"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\c14n.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\checksig.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\cipher.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\siginf.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\templatesign.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Release No Xalan\txfmout.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\xsec_$(XmlSecFileVersion)D.dll"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\c14n.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\checksig.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\cipher.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\siginf.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\templatesign.exe"\
+ "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\$(MsVCVersion)\Debug No Xalan\txfmout.exe"
+ wixcop -indent:2 XmlSec-x64.wxs
+ candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion)\
+ -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd) -dShibbolethMsVersion=$(MsVCVersion)
#
# ZLIB
@@ -204,11 +289,14 @@ zlib-x64.msm: zlib-x64.wixobj
del ..\*64*.msi
zlib-x86.wixobj: zlib-x86.wxs $(BuildSP)\zlib-$(ZlibVersion)\Release\zlib$(ZlibFileVersion).dll $(BuildSP)\zlib-$(ZlibVersion)\Debug\zlib$(ZlibFileVersion)d.dll
- wixcop -indent:2 zlib-x86.wxs
- candle zlib-x86.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib32Component=$(Zlib32Component) -dZlib32Componentd=$(Zlib32Componentd)
-
-zlib-x64.wixobj: zlib-x64.wxs $(BuildSP)\zlib-$(ZlibVersion)\x64\Release\zlib$(ZlibFileVersion).dll $(BuildSP)\zlib-$(ZlibVersion)\x64\Debug\zlib$(ZlibFileVersion)d.dll
- wixcop -indent:2 zlib-x64.wxs
- candle zlib-x64.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib64Component=$(Zlib64Component) -dZlib64Componentd=$(Zlib64Componentd)
+ wixcop -indent:2 zlib-x86.wxs
+ candle zlib-x86.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib32Component=$(Zlib32Component)\
+ -dZlib32Componentd=$(Zlib32Componentd)
+
+zlib-x64.wixobj: zlib-x64.wxs $(BuildSP)\zlib-$(ZlibVersion)\x64\Release\zlib$(ZlibFileVersion).dll\
+ $(BuildSP)\zlib-$(ZlibVersion)\x64\Debug\zlib$(ZlibFileVersion)d.dll
+ wixcop -indent:2 zlib-x64.wxs
+ candle zlib-x64.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib64Component=$(Zlib64Component)\
+ -dZlib64Componentd=$(Zlib64Componentd)
#
diff --git a/msi/WiX/MergeModules/OpenSSL-x64.wxs b/msi/WiX/MergeModules/OpenSSL-x64.wxs
index 3d77916..fc362eb 100644
--- a/msi/WiX/MergeModules/OpenSSL-x64.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x64.wxs
@@ -16,8 +16,6 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<?if $(var.OpenSSLV1Libs) = "1" ?>
-
<?define ReleaseDir="x64\bin"?>
<?define DebugDir="x64Debug\bin"?>
<?define LibEay="libcrypto-$(var.OpenSSLFileVersion)-x64.dll"?>
@@ -25,17 +23,6 @@
<?define SslEay="libssl-$(var.OpenSSLFileVersion)-x64.dll"?>
<?define SslEayD="libssl-$(var.OpenSSLFileVersion)D-x64.dll"?>
-<?else ?>
-
-<?define ReleaseDir="out64dll"?>
-<?define DebugDir="out64dll.dbg"?>
-<?define LibEay="libeay32_$(var.OpenSSLFileVersion).dll"?>
-<?define LibEayD="libeay32_$(var.OpenSSLFileVersion)D.dll"?>
-<?define SslEay="ssleay32_$(var.OpenSSLFileVersion).dll"?>
-<?define SslEayD="ssleay32_$(var.OpenSSLFileVersion)D.dll"?>
-
-<?endif ?>
-
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Module Id='OpenSSLMergeModule_x64' Language='1033' Version='$(var.OpenSSLVersion)'>
<Package Id='{EEB21422-347C-4AFA-A347-DCA0E5D61572}' Description='Merge Module for OpenSSL (x64)'
diff --git a/msi/WiX/MergeModules/OpenSSL-x86.wxs b/msi/WiX/MergeModules/OpenSSL-x86.wxs
index 2e37936..b204fd9 100644
--- a/msi/WiX/MergeModules/OpenSSL-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSSL-x86.wxs
@@ -16,8 +16,6 @@
implied. See the License for the specific language governing
permissions and limitations under the License. -->
-<?if $(var.OpenSSLV1Libs) = "1" ?>
-
<?define ReleaseDir="x86\bin"?>
<?define DebugDir="x86Debug\bin"?>
<?define LibEay="libcrypto-$(var.OpenSSLFileVersion).dll"?>
@@ -25,17 +23,6 @@
<?define SslEay="libssl-$(var.OpenSSLFileVersion).dll"?>
<?define SslEayD="libssl-$(var.OpenSSLFileVersion)D.dll"?>
-<?else ?>
-
-<?define ReleaseDir="out64dll"?>
-<?define DebugDir="out64dll.dbg"?>
-<?define LibEay="libeay32_$(var.OpenSSLFileVersion).dll"?>
-<?define LibEayD="libeay32_$(var.OpenSSLFileVersion)D.dll"?>
-<?define SslEay="ssleay32_$(var.OpenSSLFileVersion).dll"?>
-<?define SslEayD="ssleay32_$(var.OpenSSLFileVersion)D.dll"?>
-
-<?endif ?>
-
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 0ace463..bbe051b 100644
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -49,34 +49,34 @@
<ComponentRef Id="adfs.so" />
<ComponentRef Id="adfs_lite.so" />
<ComponentRef Id="isapi_shib.dll" />
- <ComponentRef Id="mod_shib_13.so" />
- <ComponentRef Id="mod_shib_20.so" />
<ComponentRef Id="mod_shib_22.so" />
- <?if $(var.MsVCVersion) != "vc14" ?>
+ <?if $(var.NSApi) != "" ?>
<ComponentRef Id="nsapi_shib.dll" />
<?endif?>
<ComponentRef Id="mod_shib_24.so" />
<ComponentRef Id="odbc_store.so" />
<ComponentRef Id="plugins.so" />
<ComponentRef Id="plugins_lite.so" />
+ <?if $(var.FCGI) != "" ?>
<ComponentRef Id="shibauthorizer.exe" />
<ComponentRef Id="shibresponder.exe" />
+ <?endif?>
<ComponentRef Id="adfs.so_debug" />
<ComponentRef Id="adfs_lite.so_debug" />
<ComponentRef Id="isapi_shib.dll_debug" />
- <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" ?>
+ <?if $(var.NSApi) != "" ?>
<ComponentRef Id="nsapi_shib.dll_debug" />
<?endif?>
<ComponentRef Id="mod_shib_24.so_debug" />
<ComponentRef Id="odbc_store.so_debug" />
<ComponentRef Id="plugins.so_debug" />
<ComponentRef Id="plugins_lite.so_debug" />
+ <?if $(var.FCGI) != "" ?>
<ComponentRef Id="shibauthorizer.exe_debug" />
<ComponentRef Id="shibresponder.exe_debug" />
+ <?endif?>
<ComponentRef Id="shibd.exe" />
<ComponentRef Id="shibd.exe_debug" />
diff --git a/msi/WiX/ShibbolethSP-exe-x64.wxs b/msi/WiX/ShibbolethSP-exe-x64.wxs
index 54c11df..ec6d190 100644
--- a/msi/WiX/ShibbolethSP-exe-x64.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x64.wxs
@@ -63,12 +63,14 @@
<Component Id='plugins_lite64.so' Guid='{83CA3D25-2370-426A-9747-B8A74EFC9037}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='plugins_lite64.so' Name='plugins-lite.so' />
</Component>
+ <?if $(var.FCGI) != "" ?>
<Component Id='shibauthorizer64.exe' Guid='{5A323F4F-AE87-451A-9253-1965E46C9C5F}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='shibauthorizer64.exe' Name='shibauthorizer.exe' />
</Component>
<Component Id='shibresponder64.exe' Guid='{538D6EEC-1AE1-400B-94AF-2B7791BFEBDA}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='shibresponder64.exe' Name='shibresponder.exe' />
</Component>
+ <?endif?>
<Directory Id='lib64_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\x64\Debug'>
<Component Id='adfs64.so_debug' Guid='{BFF58DDD-CF04-49B1-A172-C84087705D2A}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='adfs64.so_debug' Name='adfs.so' />
@@ -94,12 +96,14 @@
<Component Id='plugins_lite64.so_debug' Guid='{3A05BDF3-12C8-4502-A30D-7C8B9C7A5855}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='plugins_lite64.so_debug' Name='plugins-lite.so' />
</Component>
+ <?if $(var.FCGI) != "" ?>
<Component Id='shibauthorizer64.exe_debug' Guid='{642C9137-66C8-4E2E-A76C-4D9F65B17157}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='shibauthorizer64.exe_debug' Name='shibauthorizer.exe' />
</Component>
<Component Id='shibresponder64.exe_debug' Guid='{7947F31A-1429-44FC-85B2-BF1E7AA50D20}' Win64='yes'>
<File KeyPath='yes' Checksum='yes' Id='shibresponder64.exe_debug' Name='shibresponder.exe' />
</Component>
+ <?endif?>
</Directory><!-- lib_shibboleth_debug -->
</Directory><!-- lib_shibboleth -->
</Directory><!-- lib -->
diff --git a/msi/WiX/ShibbolethSP-exe-x86.wxs b/msi/WiX/ShibbolethSP-exe-x86.wxs
index a978081..5cce678 100644
--- a/msi/WiX/ShibbolethSP-exe-x86.wxs
+++ b/msi/WiX/ShibbolethSP-exe-x86.wxs
@@ -48,19 +48,13 @@
<Component Id='isapi_shib.dll' Guid='{716D6F4F-4185-4219-B1BA-1D15F867926E}'>
<File KeyPath='yes' Checksum='yes' Name='isapi_shib.dll' />
</Component>
- <Component Id='mod_shib_13.so' Guid='{5C85940B-7644-4AA4-9948-9EFFC1729EFB}'>
- <File KeyPath='yes' Checksum='yes' Name='mod_shib_13.so' />
- </Component>
- <Component Id='mod_shib_20.so' Guid='{FFC2D560-FD06-42BB-9EA7-B0CC988AC4A6}'>
- <File KeyPath='yes' Checksum='yes' Name='mod_shib_20.so' />
- </Component>
<Component Id='mod_shib_22.so' Guid='{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}'>
<File KeyPath='yes' Checksum='yes' Name='mod_shib_22.so' />
</Component>
<Component Id='mod_shib_24.so' Guid='{8CAE4DF0-C8A8-4A48-A213-F4B3AFE6F439}'>
<File KeyPath='yes' Checksum='yes' Name='mod_shib_24.so' />
</Component>
- <?if $(var.MsVCVersion) != "vc14" ?>
+ <?if $(var.NSApi) != "" ?>
<Component Id='nsapi_shib.dll' Guid='{F199DD8A-292F-4C7D-AACB-7283852D6335}'>
<File KeyPath='yes' Checksum='yes' Name='nsapi_shib.dll' />
</Component>
@@ -74,12 +68,14 @@
<Component Id='plugins_lite.so' Guid='{FF18A6B4-EDC7-4A9A-8BFE-C166DCE5243E}'>
<File KeyPath='yes' Checksum='yes' Name='plugins-lite.so' />
</Component>
+ <?if $(var.FCGI) != "" ?>
<Component Id='shibauthorizer.exe' Guid='{7C7C1C24-902A-4003-AE59-599E79161782}'>
<File KeyPath='yes' Checksum='yes' Name='shibauthorizer.exe' />
</Component>
<Component Id='shibresponder.exe' Guid='{510267D9-61F2-47EF-99D2-CB3D21CB14EB}'>
<File KeyPath='yes' Checksum='yes' Name='shibresponder.exe' />
</Component>
+ <?endif?>
<Directory Id='lib_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Build\$(var.MsVCVersion)\Debug'>
<Component Id='adfs.so_debug' Guid='{9B8E071F-B251-4373-A786-8966FD0D22EF}'>
<File KeyPath='yes' Checksum='yes' Id='adfs.so_debug' Name='adfs.so' />
@@ -90,19 +86,13 @@
<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>
- <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>
- <Component Id='mod_shib_20.so_debug' Guid='{468806BF-6924-47D5-B319-608C2D63FDDC}'>
- <File KeyPath='yes' Checksum='yes' Id='mod_shib_20.so_debug' Name='mod_shib_20.so' />
- </Component>
<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>
<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>
- <?if $(var.MsVCVersion) != "vc14" ?>
+ <?if $(var.NSApi) != "" ?>
<Component Id='nsapi_shib.dll_debug' Guid='{492A5D72-4FE0-417E-9023-311E1BF34816}'>
<File KeyPath='yes' Checksum='yes' Id='nsapi_shib.dll_debug' Name='nsapi_shib.dll' />
</Component>
@@ -116,12 +106,14 @@
<Component Id='plugins_lite.so_debug' Guid='{83A9DA0D-774C-4F96-9446-D5A1B61BB4A2}'>
<File KeyPath='yes' Checksum='yes' Id='plugins_lite.so_debug' Name='plugins-lite.so' />
</Component>
+ <?if $(var.FCGI) != "" ?>
<Component Id='shibauthorizer.exe_debug' Guid='{83360639-DDC0-4B76-8168-21FB77EE6CD6}'>
<File KeyPath='yes' Checksum='yes' Id='shibauthorizer.exe_debug' Name='shibauthorizer.exe' />
</Component>
<Component Id='shibresponder.exe_debug' Guid='{760124EA-67E5-4393-B3DF-657DCC92F04C}'>
<File KeyPath='yes' Checksum='yes' Id='shibresponder.exe_debug' Name='shibresponder.exe' />
</Component>
+ <?endif?>
</Directory><!-- lib_shibboleth_debug -->
</Directory><!-- lib_shibboleth -->
</Directory><!-- lib -->
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 5195914..4136124 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -53,7 +53,9 @@
<Directory Id='ProgramFilesFolder' Name='PFiles'>
<!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
<Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm' DiskId='1' />
+ <?if $(var.FCGI) != "" ?>
<Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm' DiskId='1' />
+ <?endif?>
<Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm' DiskId='1' />
<Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm' DiskId='1' />
<Merge Id='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm' DiskId='1' />
@@ -63,14 +65,16 @@
<Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm' DiskId='1' />
<Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm' DiskId='1' />
<Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm' DiskId='1' />
- <Merge Id='Microsoft_DebugCRT_x86' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_DebugCRT_x86.msm' DiskId='1' />
- <Merge Id='Microsoft_CRT_x86' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_CRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_DebugCRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_DebugCRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_CRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_CRT_x86.msm' DiskId='1' />
</Directory><!--ProgramFilesFolder-->
<Directory Id='ProgramFiles64Folder' Name='PFiles'>
<!-- 64 bit merge modules notionally go to "Program Files" -->
<Merge Id='CurlMergeModule_x64' Language='1033' SourceFile='MergeModules\Curl-x64.msm' DiskId='1' />
+ <?if $(var.FCGI) != "" ?>
<Merge Id='FastCGIMergeModule_x64' Language='1033' SourceFile='MergeModules\FastCGI-x64.msm' DiskId='1' />
+ <?endif?>
<Merge Id='Log4ShibMergeModule_x64' Language='1033' SourceFile='MergeModules\Log4Shib-x64.msm' DiskId='1' />
<Merge Id='OpenSAMLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSAML-x64.msm' DiskId='1' />
<Merge Id='OpenSSLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSSL-x64.msm' DiskId='1' />
@@ -78,8 +82,8 @@
<Merge Id='XercesMergeModule_x64' Language='1033' SourceFile='MergeModules\Xerces-x64.msm' DiskId='1' />
<Merge Id='XmlSecMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlSec-x64.msm' DiskId='1' />
<Merge Id='ZlibMergeModule_x64' Language='1033' SourceFile='MergeModules\Zlib-x64.msm' DiskId='1' />
- <Merge Id='Microsoft_DebugCRT_x64' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_DebugCRT_x64.msm' DiskId='1' />
- <Merge Id='Microsoft_CRT_x64' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_CRT_x64.msm' DiskId='1' />
+ <Merge Id='Microsoft_DebugCRT_x64' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_DebugCRT_x64.msm' DiskId='1' />
+ <Merge Id='Microsoft_CRT_x64' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_CRT_x64.msm' DiskId='1' />
</Directory><!--ProgramFiles64Folder-->
<!-- PATH -->
@@ -102,7 +106,9 @@
<Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' ConfigurableDirectory='INSTALLDIR'>
<MergeRef Id='CurlMergeModule_x86'/>
+ <?if $(var.FCGI) != "" ?>
<MergeRef Id='FastCGIMergeModule_x86'/>
+ <?endif?>
<MergeRef Id='Log4ShibMergeModule_x86'/>
<MergeRef Id='OpenSAMLMergeModule_x86'/>
<MergeRef Id='OpenSAMLMergeModule_schemas'/>
@@ -117,7 +123,9 @@
<MergeRef Id='Microsoft_CRT_x86'/>
<MergeRef Id='CurlMergeModule_x64'/>
+ <?if $(var.FCGI) != "" ?>
<MergeRef Id='FastCGIMergeModule_x64'/>
+ <?endif?>
<MergeRef Id='Log4ShibMergeModule_x64'/>
<MergeRef Id='OpenSAMLMergeModule_x64'/>
<MergeRef Id='OpenSSLMergeModule_x64'/>
@@ -144,8 +152,10 @@
<ComponentRef Id='odbc_store64.so'/>
<ComponentRef Id='plugins64.so'/>
<ComponentRef Id='plugins_lite64.so'/>
+ <?if $(var.FCGI) != "" ?>
<ComponentRef Id='shibauthorizer64.exe'/>
<ComponentRef Id='shibresponder64.exe'/>
+ <?endif?>
<ComponentRef Id='adfs64.so_debug'/>
<ComponentRef Id='adfs_lite64.so_debug'/>
@@ -155,8 +165,10 @@
<ComponentRef Id='odbc_store64.so_debug'/>
<ComponentRef Id='plugins64.so_debug'/>
<ComponentRef Id='plugins_lite64.so_debug'/>
+ <?if $(var.FCGI) != "" ?>
<ComponentRef Id='shibauthorizer64.exe_debug'/>
<ComponentRef Id='shibresponder64.exe_debug'/>
+ <?endif?>
<ComponentRef Id='shibd64.exe'/>
<ComponentRef Id='shibd64.exe_debug'/>
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 24d2bf6..062d9f4 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -54,7 +54,9 @@
<Directory Id='ProgramFilesFolder' Name='PFiles'>
<!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
<Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm' DiskId='1' />
+ <?if $(var.FCGI) != "" ?>
<Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm' DiskId='1' />
+ <?endif?>
<Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm' DiskId='1' />
<Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm' DiskId='1' />
<Merge Id='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm' DiskId='1' />
@@ -64,10 +66,8 @@
<Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm' DiskId='1' />
<Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\XmlSec-x86.msm' DiskId='1' />
<Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Zlib-x86.msm' DiskId='1' />
- <Merge Id='Microsoft_DebugCRT_x86' Language='1033'
- SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_DebugCRT_x86.msm' DiskId='1' />
- <Merge Id='Microsoft_CRT_x86' Language='1033'
- SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_$(var.MsVCVersion)0_CRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_DebugCRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_DebugCRT_x86.msm' DiskId='1' />
+ <Merge Id='Microsoft_CRT_x86' Language='1033' SourceFile='$(var.CppMmDir)\Microsoft_$(var.MsVCVersion)0_CRT_x86.msm' DiskId='1' />
</Directory><!--ProgramFilesFolder-->
<Component Id='SetPath' Guid='{3300B9CD-67AF-4AAC-801D-8C56E5FB4AF5}'>
@@ -79,7 +79,9 @@
<Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden'
ConfigurableDirectory='INSTALLDIR'>
<MergeRef Id='CurlMergeModule_x86'/>
+ <?if $(var.FCGI) != "" ?>
<MergeRef Id='FastCGIMergeModule_x86'/>
+ <?endif?>
<MergeRef Id='Log4ShibMergeModule_x86'/>
<MergeRef Id='OpenSAMLMergeModule_x86'/>
<MergeRef Id='OpenSAMLMergeModule_schemas'/>
--
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