Set native EOL on all wxs, make and vcxproj files. Revert the ones which had become...
authorRod Widdowson <rdw@steadingsoftware.com>
Tue, 23 Oct 2012 12:10:55 +0000 (12:10 +0000)
committerRod Widdowson <rdw@steadingsoftware.com>
Tue, 23 Oct 2012 12:10:55 +0000 (12:10 +0000)
35 files changed:
msi/WiX/Installer.make
msi/WiX/Installer.vcxproj
msi/WiX/MergeModules/Curl-x64.wxs
msi/WiX/MergeModules/Curl-x86.wxs
msi/WiX/MergeModules/FastCGI-x64.wxs
msi/WiX/MergeModules/FastCGI-x86.wxs
msi/WiX/MergeModules/Log4Shib-x64.wxs
msi/WiX/MergeModules/Log4Shib-x86.wxs
msi/WiX/MergeModules/MergeModules.make
msi/WiX/MergeModules/MergeModules.vcxproj
msi/WiX/MergeModules/OpenSAML-schemas.wxs
msi/WiX/MergeModules/OpenSAML-x64.wxs
msi/WiX/MergeModules/OpenSAML-x86.wxs
msi/WiX/MergeModules/OpenSSL-x64.wxs
msi/WiX/MergeModules/OpenSSL-x86.wxs
msi/WiX/MergeModules/Shibboleth-schemas.wxs
msi/WiX/MergeModules/Shibboleth-x64.wxs
msi/WiX/MergeModules/Shibboleth-x86.wxs
msi/WiX/MergeModules/Xerces-x64.wxs
msi/WiX/MergeModules/Xerces-x86.wxs
msi/WiX/MergeModules/XmlSec-x64.wxs
msi/WiX/MergeModules/XmlSec-x86.wxs
msi/WiX/MergeModules/Zlib-x64.wxs
msi/WiX/MergeModules/Zlib-x86.wxs
msi/WiX/Patch.wxs
msi/WiX/ShibbolethSP-exe-x64.wxs
msi/WiX/ShibbolethSP-exe-x86.wxs
msi/WiX/ShibbolethSP-gui.wxs
msi/WiX/ShibbolethSP-install-dlg.wxs
msi/WiX/ShibbolethSP-noarch.wxs
msi/WiX/ShibbolethSP-registry-x64.wxs
msi/WiX/ShibbolethSP-registry-x86.wxs
msi/WiX/ShibbolethSP-update-dlg.wxs
msi/WiX/tes.wxs [deleted file]
msi/WiX/testInstall.wxs [deleted file]

index 9091a2d..fca059b 100644 (file)
@@ -1,76 +1,76 @@
-all: all32 all64\r
-\r
-all32: shibboleth-sp-$(ShibbolethVersion)-win32.msi\r
-\r
-all64: shibboleth-sp-$(ShibbolethVersion)-win64.msi\r
-\r
-clean32: \r
-       del *-x86.msi *-x86.wixobj *-x86.wixpdb *schemas.wixobj Shibboleth.wixlib\r
-\r
-clean64: \r
-       del *-x64.wixobj *-x64.msi *-x64.wixpdb *schemas.wixobj Shibboleth.wixlib\r
-\r
-clean: clean32 clean64\r
-\r
-rebuild32: clean32 all32\r
-\r
-rebuild64: clean64 all64\r
-\r
-#\r
-# MSI\r
-#\r
-shibboleth-sp-$(ShibbolethVersion)-win32.msi: ShibbolethSP-main-x86.wixobj Shibboleth.wixlib\r
-       light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion)-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension\r
-       del shibboleth-sp-$(ShibbolethVersion)-win64.msi\r
-\r
-shibboleth-sp-$(ShibbolethVersion)-win64.msi: ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  Shibboleth.wixlib\r
-       light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion)-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension\r
-\r
-#\r
-# Library\r
-#\r
-Shibboleth.wixlib: ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj\r
-       lit -pedantic -out  Shibboleth.wixlib ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj\r
-\r
-#\r
-# Individual files\r
-#\r
-ShibbolethSP-exe-x64.wixobj: ShibbolethSP-exe-x64.wxs ..\..\x64\Release\shibd.exe ..\..\x64\Release\resolvertest.exe ..\..\x64\Release\mdquery.exe ..\..\x64\Release\adfs.so ..\..\x64\Release\adfs-lite.so ..\..\x64\Release\isapi_shib.dll ..\..\x64\Release\mod_shib_22.so ..\..\x64\Release\mod_shib_24.so ..\..\x64\Release\odbc-store.so ..\..\x64\Release\plugins.so ..\..\x64\Release\plugins-lite.so ..\..\x64\Release\shibauthorizer.exe ..\..\x64\Release\shibresponder.exe ..\..\x64\Debug\shibd.exe ..\..\x64\Debug\resolvertest.exe ..\..\x64\Debug\mdquery.exe ..\..\x64\Debug\adfs.so ..\..\x64\Debug\adfs-lite.so ..\..\x64\Debug\isapi_shib.dll ..\..\x64\Debug\mod_shib_22.so ..\..\x64\Debug\mod_shib_24.so ..\..\x64\Debug\odbc-store.so ..\..\x64\Debug\plugins.so ..\..\x64\Debug\plugins-lite.so ..\..\x64\Debug\shibauthorizer.exe ..\..\x64\Debug\shibresponder.exe\r
-       wixcop -indent:2 ShibbolethSP-exe-x64.wxs\r
-       candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-exe-x64.wxs\r
-\r
-ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs\r
-       wixcop -indent:2 ShibbolethSP-registry-x64.wxs\r
-       candle ShibbolethSP-registry-x64.wxs\r
-\r
-ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs\r
-       wixcop -indent:2 ShibbolethSP-noarch.wxs\r
-       candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-noarch.wxs\r
-\r
-ShibbolethSP-exe-x86.wixobj: ShibbolethSP-exe-x86.wxs  ..\..\Release\shibd.exe ..\..\Release\resolvertest.exe ..\..\Release\mdquery.exe ..\..\Release\adfs.so ..\..\Release\adfs-lite.so ..\..\Release\isapi_shib.dll ..\..\Release\mod_shib_20.so ..\..\Release\mod_shib_22.so ..\..\Release\mod_shib_13.so ..\..\Release\mod_shib_24.so  ..\..\Release\nsapi_shib.dll ..\..\Release\odbc-store.so ..\..\Release\plugins.so ..\..\Release\plugins-lite.so ..\..\Release\shibauthorizer.exe ..\..\Release\shibresponder.exe ..\..\Debug\shibd.exe ..\..\Debug\resolvertest.exe ..\..\Debug\mdquery.exe ..\..\Debug\adfs.so ..\..\Debug\adfs-lite.so ..\..\Debug\isapi_shib.dll ..\..\Debug\mod_shib_13.so ..\..\Debug\mod_shib_20.so ..\..\Debug\mod_shib_22.so ..\..\Debug\mod_shib_24.so ..\..\Debug\nsapi_shib.dll ..\..\Debug\odbc-store.so ..\..\Debug\plugins.so ..\..\Debug\plugins-lite.so ..\..\Debug\shibauthorizer.exe ..\..\Debug\shibresponder.exe\r
-       wixcop -indent:2 ShibbolethSP-exe-x86.wxs\r
-       candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-exe-x86.wxs\r
-\r
-ShibbolethSP-registry-x86.wixobj: ShibbolethSP-registry-x86.wxs\r
-       wixcop -indent:2 ShibbolethSP-registry-x86.wxs\r
-       candle ShibbolethSP-registry-x86.wxs\r
-\r
-ShibbolethSP-gui.wixobj: ShibbolethSP-gui.wxs\r
-       wixcop -indent:2 ShibbolethSP-gui.wxs\r
-       candle ShibbolethSP-gui.wxs\r
-\r
-ShibbolethSP-update-dlg.wixobj: ShibbolethSP-update-dlg.wxs\r
-       wixcop -indent:2 ShibbolethSP-update-dlg.wxs\r
-       candle ShibbolethSP-update-dlg.wxs\r
-\r
-ShibbolethSP-install-dlg.wixobj: ShibbolethSP-install-dlg.wxs\r
-       wixcop -indent:2 ShibbolethSP-install-dlg.wxs\r
-       candle ShibbolethSP-install-dlg.wxs\r
-\r
-ShibbolethSP-main-x64.wixobj: ShibbolethSP-main-x64.wxs 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 MergeModules\Log4Shib-x64.msm MergeModules\OpenSAML-x64.msm MergeModules\OpenSSL-x64.msm MergeModules\Shibboleth-x64.msm MergeModules\Xerces-x64.msm MergeModules\XmlSec-x64.msm MergeModules\Zlib-x64.msm\r
-#      wixcop -indent:2 ShibbolethSP-main-x64.wxs\r
-       candle -dSPBuildDirectory=$(SolutionDir)..-dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x64.wxs\r
-\r
-ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs 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\r
-#      wixcop -indent:2 ShibbolethSP-main-x86.wxs\r
-       candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x86.wxs\r
+all: all32 all64
+
+all32: shibboleth-sp-$(ShibbolethVersion)-win32.msi
+
+all64: shibboleth-sp-$(ShibbolethVersion)-win64.msi
+
+clean32: 
+       del *-x86.msi *-x86.wixobj *-x86.wixpdb *schemas.wixobj Shibboleth.wixlib
+
+clean64: 
+       del *-x64.wixobj *-x64.msi *-x64.wixpdb *schemas.wixobj Shibboleth.wixlib
+
+clean: clean32 clean64
+
+rebuild32: clean32 all32
+
+rebuild64: clean64 all64
+
+#
+# MSI
+#
+shibboleth-sp-$(ShibbolethVersion)-win32.msi: ShibbolethSP-main-x86.wixobj Shibboleth.wixlib
+       light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion)-win32.msi ShibbolethSP-main-x86.wixobj Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension  -ext WixIISExtension
+       del shibboleth-sp-$(ShibbolethVersion)-win64.msi
+
+shibboleth-sp-$(ShibbolethVersion)-win64.msi: ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  Shibboleth.wixlib
+       light -sw1055 -sice:ICE82 -o shibboleth-sp-$(ShibbolethVersion)-win64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  Shibboleth.wixlib -ext WixUtilExtension.dll -ext WixUIExtension -ext WixIISExtension
+
+#
+# Library
+#
+Shibboleth.wixlib: ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj
+       lit -pedantic -out  Shibboleth.wixlib ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj  ShibbolethSP-gui.wixobj ShibbolethSP-update-dlg.wixobj ShibbolethSP-install-dlg.wixobj
+
+#
+# Individual files
+#
+ShibbolethSP-exe-x64.wixobj: ShibbolethSP-exe-x64.wxs ..\..\x64\Release\shibd.exe ..\..\x64\Release\resolvertest.exe ..\..\x64\Release\mdquery.exe ..\..\x64\Release\adfs.so ..\..\x64\Release\adfs-lite.so ..\..\x64\Release\isapi_shib.dll ..\..\x64\Release\mod_shib_22.so ..\..\x64\Release\mod_shib_24.so ..\..\x64\Release\odbc-store.so ..\..\x64\Release\plugins.so ..\..\x64\Release\plugins-lite.so ..\..\x64\Release\shibauthorizer.exe ..\..\x64\Release\shibresponder.exe ..\..\x64\Debug\shibd.exe ..\..\x64\Debug\resolvertest.exe ..\..\x64\Debug\mdquery.exe ..\..\x64\Debug\adfs.so ..\..\x64\Debug\adfs-lite.so ..\..\x64\Debug\isapi_shib.dll ..\..\x64\Debug\mod_shib_22.so ..\..\x64\Debug\mod_shib_24.so ..\..\x64\Debug\odbc-store.so ..\..\x64\Debug\plugins.so ..\..\x64\Debug\plugins-lite.so ..\..\x64\Debug\shibauthorizer.exe ..\..\x64\Debug\shibresponder.exe
+       wixcop -indent:2 ShibbolethSP-exe-x64.wxs
+       candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-exe-x64.wxs
+
+ShibbolethSP-registry-x64.wixobj: ShibbolethSP-registry-x64.wxs
+       wixcop -indent:2 ShibbolethSP-registry-x64.wxs
+       candle ShibbolethSP-registry-x64.wxs
+
+ShibbolethSP-noarch.wixobj: ShibbolethSP-noarch.wxs
+       wixcop -indent:2 ShibbolethSP-noarch.wxs
+       candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-noarch.wxs
+
+ShibbolethSP-exe-x86.wixobj: ShibbolethSP-exe-x86.wxs  ..\..\Release\shibd.exe ..\..\Release\resolvertest.exe ..\..\Release\mdquery.exe ..\..\Release\adfs.so ..\..\Release\adfs-lite.so ..\..\Release\isapi_shib.dll ..\..\Release\mod_shib_20.so ..\..\Release\mod_shib_22.so ..\..\Release\mod_shib_13.so ..\..\Release\mod_shib_24.so  ..\..\Release\nsapi_shib.dll ..\..\Release\odbc-store.so ..\..\Release\plugins.so ..\..\Release\plugins-lite.so ..\..\Release\shibauthorizer.exe ..\..\Release\shibresponder.exe ..\..\Debug\shibd.exe ..\..\Debug\resolvertest.exe ..\..\Debug\mdquery.exe ..\..\Debug\adfs.so ..\..\Debug\adfs-lite.so ..\..\Debug\isapi_shib.dll ..\..\Debug\mod_shib_13.so ..\..\Debug\mod_shib_20.so ..\..\Debug\mod_shib_22.so ..\..\Debug\mod_shib_24.so ..\..\Debug\nsapi_shib.dll ..\..\Debug\odbc-store.so ..\..\Debug\plugins.so ..\..\Debug\plugins-lite.so ..\..\Debug\shibauthorizer.exe ..\..\Debug\shibresponder.exe
+       wixcop -indent:2 ShibbolethSP-exe-x86.wxs
+       candle -dSPBuildDirectory=$(SolutionDir).. ShibbolethSP-exe-x86.wxs
+
+ShibbolethSP-registry-x86.wixobj: ShibbolethSP-registry-x86.wxs
+       wixcop -indent:2 ShibbolethSP-registry-x86.wxs
+       candle ShibbolethSP-registry-x86.wxs
+
+ShibbolethSP-gui.wixobj: ShibbolethSP-gui.wxs
+       wixcop -indent:2 ShibbolethSP-gui.wxs
+       candle ShibbolethSP-gui.wxs
+
+ShibbolethSP-update-dlg.wixobj: ShibbolethSP-update-dlg.wxs
+       wixcop -indent:2 ShibbolethSP-update-dlg.wxs
+       candle ShibbolethSP-update-dlg.wxs
+
+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 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 MergeModules\Log4Shib-x64.msm MergeModules\OpenSAML-x64.msm MergeModules\OpenSSL-x64.msm MergeModules\Shibboleth-x64.msm MergeModules\Xerces-x64.msm MergeModules\XmlSec-x64.msm MergeModules\Zlib-x64.msm
+       wixcop -indent:2 ShibbolethSP-main-x64.wxs
+       candle -dSPBuildDirectory=$(SolutionDir)..-dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId64=$(ShibbolethId64) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x64.wxs
+
+ShibbolethSP-main-x86.wixobj: ShibbolethSP-main-x86.wxs 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
+       wixcop -indent:2 ShibbolethSP-main-x86.wxs
+       candle -dSPBuildDirectory=$(SolutionDir).. -dShibbolethVersion=$(ShibbolethVersion) -dShibbolethId32=$(ShibbolethId32) -dShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethSP-main-x86.wxs
index ed01d3b..af64161 100644 (file)
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{C2B1BB79-C88B-42B4-9AEC-170F91910F70}</ProjectGuid>\r
-    <Keyword>MakeFileProj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Label="Configuration">\r
-    <ConfigurationType>Makefile</ConfigurationType>\r
-    <UseDebugLibraries>false</UseDebugLibraries>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <Import Project="..\..\..\BuildPath.props" />\r
-  <Import Project="..\..\MsBuild\Versions.props" />\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">\r
-    <NMakeBuildCommandLine>nmake /f Installer.make clean</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *.wixobj *.msi *.wixlib</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f Installer.make clean</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) all32</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *86.wixobj\r
-del *86.msi\r
-del *.wixlib\r
-del *x86.wixpdb</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) rebuild32</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>\r
-    </NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) all64</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *64.wixobj\r
-del *64.msmi\r
-del *.wixlib\r
-del *64.wixpdb</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) rebuild64</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>\r
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C2B1BB79-C88B-42B4-9AEC-170F91910F70}</ProjectGuid>
+    <Keyword>MakeFileProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <Import Project="..\..\..\BuildPath.props" />
+  <Import Project="..\..\MsBuild\Versions.props" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <NMakeBuildCommandLine>nmake /f Installer.make clean</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>del *.wixobj *.msi *.wixlib</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>nmake /f Installer.make clean</NMakeReBuildCommandLine>
+    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) all32</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>del *86.wixobj
+del *86.msi
+del *.wixlib
+del *x86.wixpdb</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) rebuild32</NMakeReBuildCommandLine>
+    <NMakePreprocessorDefinitions>
+    </NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) all64</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>del *64.wixobj
+del *64.msmi
+del *.wixlib
+del *64.wixpdb</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) rebuild64</NMakeReBuildCommandLine>
+    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
index e24a52c..037b986 100644 (file)
@@ -1,61 +1,61 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='CurlMergeModule_x64' Language='1033' Version='$(var.CurlVersion)'>\r
-    <Package Id='{DB1A5E0D-0052-40F3-9D7B-469CCD0CEB2D}' Description='Merge Module for CURL (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib'>\r
-              <Component Id='libcurl.dll' Guid='{14BDB19A-B7F1-4038-B114-8388F3FF07F0}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes'\r
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll'/>\r
-              </Component>\r
-              <Component Id='curl.exe' Guid='{52103377-AEF6-4533-B0CE-D3A786D2D17E}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes'\r
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release.x64\curl.exe'/>\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
-                <Component Id='libcurld.dll' Guid='{6F225F9F-25CD-4F6D-8A8F-01C6DD0F0959}' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll'/>\r
-                </Component>\r
-                <Component Id='curl.exe_debug' Guid='{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}' Win64='yes'>\r
-                  <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'\r
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug.x64\curl.exe'/>\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='CURL.LICENSE' Guid='{838175A6-8CC3-45D3-9A5E-C4C4147076E9}' Win64='yes'>\r
-                <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_SP -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='CurlMergeModule_x64' Language='1033' Version='$(var.CurlVersion)'>
+    <Package Id='{DB1A5E0D-0052-40F3-9D7B-469CCD0CEB2D}' Description='Merge Module for CURL (x64)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='libcurl.dll' Guid='{14BDB19A-B7F1-4038-B114-8388F3FF07F0}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll'/>
+              </Component>
+              <Component Id='curl.exe' Guid='{52103377-AEF6-4533-B0CE-D3A786D2D17E}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release.x64\curl.exe'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libcurld.dll' Guid='{6F225F9F-25CD-4F6D-8A8F-01C6DD0F0959}' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll'/>
+                </Component>
+                <Component Id='curl.exe_debug' Guid='{F363D42B-8CB6-4ED8-B2D3-3637B6110E38}' Win64='yes'>
+                  <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug.x64\curl.exe'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='CURL.LICENSE' Guid='{838175A6-8CC3-45D3-9A5E-C4C4147076E9}' Win64='yes'>
+                <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
index 55cdcd4..8976786 100644 (file)
@@ -1,61 +1,61 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>\r
-    <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib'>\r
-              <Component Id='libcurl.dll' Guid='{8F72A198-4D90-47DC-BBAC-123D51DE4192}'>\r
-                <File KeyPath='yes' Checksum='yes'\r
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll'/>\r
-              </Component>\r
-              <Component Id='curl.exe' Guid='{67A6F011-9715-43C2-92F1-70FE53E935AD}'>\r
-                <File KeyPath='yes' Checksum='yes'\r
-                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release\curl.exe'/>\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
-                <Component Id='libcurld.dll' Guid='{EFAEA264-C49A-4A91-816F-DD151F094892}'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll'/>\r
-                </Component>\r
-                <Component Id='curl.exe_debug' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>\r
-                  <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'\r
-                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='CURL.LICENSE' Guid='{54E0C63F-C591-49AF-9D3C-CBBE8281B6DB}'>\r
-                <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_SP -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
+    <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='libcurl.dll' Guid='{8F72A198-4D90-47DC-BBAC-123D51DE4192}'>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll'/>
+              </Component>
+              <Component Id='curl.exe' Guid='{67A6F011-9715-43C2-92F1-70FE53E935AD}'>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\release\curl.exe'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libcurld.dll' Guid='{EFAEA264-C49A-4A91-816F-DD151F094892}'>
+                  <File KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll'/>
+                </Component>
+                <Component Id='curl.exe_debug' Guid='{FB6BF939-9744-49ED-ACBF-8956B9C5DE29}'>
+                  <File Id='curl.exe_debug' KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\src\debug\curl.exe'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='CURL.LICENSE' Guid='{54E0C63F-C591-49AF-9D3C-CBBE8281B6DB}'>
+                <File KeyPath='yes' Name='CURL.LICENSE' Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\COPYING' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
index c086b8d..9bce2c9 100644 (file)
@@ -1,54 +1,54 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='FastCGIMergeModule_x64' Language='1033' Version='$(var.FastCGIVersion)'>\r
-    <Package Id='{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}' Description='Merge Module for FastCGI (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib'>\r
-              <Component Id='libfcgi.dll' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes'\r
-                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
-                <Component Id='libfcgid.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                    Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='FASTCGI.LICENSE' Guid='{FC00E9B5-72B1-4E87-A5C4-26EE6A7BA509}' Win64='yes'>\r
-                <File KeyPath='yes' Name='FASTCGI.LICENSE'\r
-                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth -->\r
-        </Directory><!-- shibboleth_SP -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='FastCGIMergeModule_x64' Language='1033' Version='$(var.FastCGIVersion)'>
+    <Package Id='{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}' Description='Merge Module for FastCGI (x64)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='libfcgi.dll' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes'
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libfcgid.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='FASTCGI.LICENSE' Guid='{FC00E9B5-72B1-4E87-A5C4-26EE6A7BA509}' Win64='yes'>
+                <File KeyPath='yes' Name='FASTCGI.LICENSE'
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth -->
+        </Directory><!-- shibboleth_SP -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
index a8dba68..f20c189 100644 (file)
@@ -1,56 +1,56 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='FastCGIMergeModule_x86' Language='1033' Version='$(var.FastCGIVersion)'>\r
-    <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI (x86)'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib'>\r
-              <Component Id='libfcgi.dll' Guid='{FD6F8E32-CBDF-4662-A39C-8EC713483C51}'>\r
-                <File KeyPath='yes' Checksum='yes'\r
-                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Release\libfcgi.dll' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
-                <Component Id='libfcgid.dll' Guid='{682FFA3A-D517-4332-BCC5-EF24252C3528}'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                    Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll' />\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='FASTCGI.LICENSE' Guid='{3FB61369-D8A7-4076-B659-DEDA2558A1AF}'>\r
-                <File KeyPath='yes' Name='FASTCGI.LICENSE'\r
-                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth -->\r
-        </Directory><!-- shibboleth_SP -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
-\r
-\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='FastCGIMergeModule_x86' Language='1033' Version='$(var.FastCGIVersion)'>
+    <Package Id='{2C0C288C-D24D-48E0-9BAD-DEFD6A8D8D64}' Description='Merge Module for FastCGI (x86)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='libfcgi.dll' Guid='{FD6F8E32-CBDF-4662-A39C-8EC713483C51}'>
+                <File KeyPath='yes' Checksum='yes'
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Release\libfcgi.dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='libfcgid.dll' Guid='{682FFA3A-D517-4332-BCC5-EF24252C3528}'>
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='FASTCGI.LICENSE' Guid='{3FB61369-D8A7-4076-B659-DEDA2558A1AF}'>
+                <File KeyPath='yes' Name='FASTCGI.LICENSE'
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth -->
+        </Directory><!-- shibboleth_SP -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+
index 6e03c74..699472d 100644 (file)
@@ -1,59 +1,59 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define Log4ShibComponent64d='{792E6762-70FE-418A-9336-39DDF1A6BAE7}'?>\r
-<?define Log4ShibComponent64='{DA7E5213-363E-4E13-B05D-90905BE9FB94}'?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>\r
-    <Package Id='{A2D51A0D-847A-4941-80FC-C8C8E697565F}' Description='Merge Module for Log4Shib (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'>\r
-              <Component Id='log4shib.dll' Guid='$(var.Log4ShibComponent64)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>\r
-              </Component>\r
-              <Component Id='NTEventLogAppender.dll' Guid='{1A559035-DCA4-4297-AE94-C3E6ABB37662}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Debug\'>\r
-                <Component Id='log4shibD.dll' Guid='$(var.Log4ShibComponent64d)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>\r
-                </Component>\r
-                <Component Id='NTEventLogAppender.dll_debug' Guid='{6C23C432-EA11-4313-9F5F-DBB09A8752E8}' Win64='yes'>\r
-                  <File Id='NTEventLogAppender.dll_debug' KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='LOG4SHIB.LICENSE' Guid='{6332D7BE-90A0-4698-B1E9-06AE8163F5A8}' Win64='yes'>\r
-                <File KeyPath='yes' Name='LOG4SHIB.LICENSE' Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\COPYING' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_SP -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define Log4ShibComponent64d='{792E6762-70FE-418A-9336-39DDF1A6BAE7}'?>
+<?define Log4ShibComponent64='{DA7E5213-363E-4E13-B05D-90905BE9FB94}'?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>
+    <Package Id='{A2D51A0D-847A-4941-80FC-C8C8E697565F}' Description='Merge Module for Log4Shib (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'>
+              <Component Id='log4shib.dll' Guid='$(var.Log4ShibComponent64)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>
+              </Component>
+              <Component Id='NTEventLogAppender.dll' Guid='{1A559035-DCA4-4297-AE94-C3E6ABB37662}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Debug\'>
+                <Component Id='log4shibD.dll' Guid='$(var.Log4ShibComponent64d)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>
+                </Component>
+                <Component Id='NTEventLogAppender.dll_debug' Guid='{6C23C432-EA11-4313-9F5F-DBB09A8752E8}' Win64='yes'>
+                  <File Id='NTEventLogAppender.dll_debug' KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='LOG4SHIB.LICENSE' Guid='{6332D7BE-90A0-4698-B1E9-06AE8163F5A8}' Win64='yes'>
+                <File KeyPath='yes' Name='LOG4SHIB.LICENSE' Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\COPYING' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
index 670cfa9..85135c3 100644 (file)
@@ -1,60 +1,60 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-\r
-<?define Log4ShibComponent32d={B8D2E797-F5A8-4E0D-B57F-9A7D4E699942} ?>\r
-<?define Log4ShibComponent32={2FDE8ED0-774A-4F44-88D5-C7089350D895} ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>\r
-    <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib (x86)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\'>\r
-              <Component Id='log4shib.dll' Guid='$(var.Log4ShibComponent32)'>\r
-                <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>\r
-              </Component>\r
-              <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>\r
-                <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\'>\r
-                <Component Id='log4shibD.dll' Guid='$(var.Log4ShibComponent32d)'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>\r
-                </Component>\r
-                <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>\r
-                  <File Id='NTEventLogAppender.dll_debug' KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>\r
-                <File KeyPath='yes' Name='LOG4SHIB.LICENSE' Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\COPYING' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_SP -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+
+<?define Log4ShibComponent32d={B8D2E797-F5A8-4E0D-B57F-9A7D4E699942} ?>
+<?define Log4ShibComponent32={2FDE8ED0-774A-4F44-88D5-C7089350D895} ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='Log4ShibMergeModule_x86' Language='1033' Version='$(var.LogForShibVersion)'>
+    <Package Id='1AD64745-CA05-41AF-B5E9-A59AA4A1C134' Description='Merge Module for Log4Shib (x86)'
+             Comments='This module is built by the Shibboleth Consortium. Includes log4cpp/shib and NTEventLogAppender.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\'>
+              <Component Id='log4shib.dll' Guid='$(var.Log4ShibComponent32)'>
+                <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>
+              </Component>
+              <Component Id='NTEventLogAppender.dll' Guid='{43B944CB-E42A-4D17-A601-AC4E14DA2217}'>
+                <File KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Debug\'>
+                <Component Id='log4shibD.dll' Guid='$(var.Log4ShibComponent32d)'>
+                  <File KeyPath='yes' Checksum='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>
+                </Component>
+                <Component Id='NTEventLogAppender.dll_debug' Guid='{5501F9FA-C6EC-48A7-8318-EA8C918DC8BF}'>
+                  <File Id='NTEventLogAppender.dll_debug' KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='LOG4CPP.LICENSE' Guid='{10B0BF4F-ED70-4B49-BFBA-947EB6AA6B21}'>
+                <File KeyPath='yes' Name='LOG4SHIB.LICENSE' Source='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\COPYING' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
index 87ce185..a44e784 100644 (file)
-all: all32 all64\r
-\r
-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\r
-\r
-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\r
-\r
-clean32: \r
-       del *-x86.msm *-x86.wixobj *-x86.wixpdb *schemas.wixobj *schemas.msm\r
-\r
-clean64: \r
-       del *-x64.wixobj *-x64.msm *-x64.wixpdb *schemas.wixobj *schemas.msm\r
-\r
-clean: clean32 clean64\r
-\r
-rebuild32: clean32 all32\r
-\r
-rebuild64: clean64 all64\r
-\r
-#\r
-# CURL \r
-#\r
-Curl-x64.msm: Curl-x64.wixobj \r
-       light Curl-x64.wixobj\r
-       del ..\*.msi\r
-\r
-Curl-x64.wixobj: Curl-x64.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll\r
-       wixcop -indent:2 Curl-x64.wxs \r
-       candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\r
-\r
-Curl-x86.msm: Curl-x86.wixobj \r
-       light Curl-x86.wixobj\r
-       del ..\*.msi\r
-\r
-Curl-x86.wixobj: Curl-x86.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll \r
-       wixcop -indent:2 Curl-x86.wxs \r
-       candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)\r
-\r
-#\r
-# FastCGI\r
-#\r
-FastCGI-x86.msm: FastCGI-x86.wixobj \r
-       light FastCGI-x86.wixobj\r
-       del ..\*.msi\r
-\r
-FastCGI-x86.wixobj: FastCGI-x86.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Release\libfcgi.dll  $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll \r
-       wixcop -indent:2 FastCGI-x86.wxs \r
-       candle FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\r
-\r
-FastCGI-x64.msm: FastCGI-x64.wixobj \r
-       light FastCGI-x64.wixobj\r
-       del ..\*.msi\r
-\r
-FastCGI-x64.wixobj: FastCGI-x64.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll  $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll\r
-       wixcop -indent:2 FastCGI-x64.wxs \r
-       candle FastCGI-x64.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)\r
-\r
-#\r
-# Log 4 shib.  More complicated since it has a version and a file version (and hence 2 components per architecture)\r
-#\r
-Log4Shib-x64.msm: Log4Shib-x64.wixobj\r
-       light Log4Shib-x64.wixobj\r
-       del ..\*.msi\r
-\r
-Log4Shib-x86.msm: Log4Shib-x86.wixobj\r
-       light Log4Shib-x86.wixobj\r
-       del ..\*.msi\r
-\r
-Log4Shib-x86.wixobj: Log4Shib-x86.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\Release\log4shib$(Log4ShibFileVersion).dll\r
-       wixcop -indent:2 Log4Shib-x86.wxs \r
-       candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d)\r
-\r
-Log4Shib-x64.wixobj: Log4Shib-x64.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\x64\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\x64\Release\log4shib$(Log4ShibFileVersion).dll\r
-       wixcop -indent:2 Log4Shib-x64.wxs \r
-       candle Log4Shib-x64.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent64=$(Log4ShibComponent64) -dLog4ShibComponent64d=$(Log4ShibComponent64d)\r
-\r
-#\r
-# OpenSAML\r
-#\r
-OpenSAML-x86.msm: OpenSAML-x86.wixobj\r
-       light OpenSAML-x86.wixobj\r
-       del ..\*.msi\r
-\r
-OpenSAML-x64.msm: OpenSAML-x64.wixobj\r
-       light OpenSAML-x64.wixobj\r
-       del ..\*.msi\r
-\r
-OpenSAML-x86.wixobj: OpenSAML-x86.wxs $(SolutionDir)..\cpp-xmltooling\Release\xmltooling$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-xmltooling\Release\xmltooling-lite$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-OpenSaml\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Debug\xmltooling$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-xmltooling\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-OpenSaml\Debug\saml$(OpenSAMLFileVersion)d.dll\r
-       wixcop -indent:2 OpenSAML-x86.wxs \r
-       candle OpenSAML-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion) -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent32=$(SamlComponent32) -dXMLToolingComponent32=$(XMLToolingComponent32) -dXMLToolingLiteComponent32=$(XMLToolingLiteComponent32) -dSamlComponent32d=$(SamlComponent32d) -dXMLToolingComponent32d=$(XMLToolingComponent32d) -dXMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d)\r
-\r
-OpenSAML-x64.wixobj: OpenSAML-x64.wxs $(SolutionDir)..\cpp-xmltooling\x64\Release\xmltooling$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-xmltooling\x64\Release\xmltooling-lite$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-OpenSaml\x64\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\x64\Debug\xmltooling$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-xmltooling\x64\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-OpenSaml\x64\Debug\saml$(OpenSAMLFileVersion)d.dll\r
-       wixcop -indent:2 OpenSAML-x64.wxs \r
-       candle OpenSAML-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) -dOpenSAMLFileVersion=$(OpenSAMLFileVersion) -dXmlToolingFileVersion=$(XmlToolingFileVersion) -dSamlComponent64=$(SamlComponent64) -dXMLToolingComponent64=$(XMLToolingComponent64) -dXMLToolingLiteComponent64=$(XMLToolingLiteComponent64) -dSamlComponent64d=$(SamlComponent64d) -dXMLToolingComponent64d=$(XMLToolingComponent64d) -dXMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d)\r
-\r
-OpenSAML-schemas.msm: OpenSAML-schemas.wixobj\r
-       light OpenSAML-schemas.wixobj\r
-       del ..\*.msi\r
-\r
-OpenSAML-schemas.wixobj: OpenSAML-schemas.wxs\r
-       wixcop -indent:2 OpenSAML-schemas.wxs \r
-       candle OpenSAML-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dOpenSAMLVersion=$(OpenSAMLVersion) \r
-\r
-#\r
-# OpenSSL\r
-#\r
-OpenSSL-x86.msm: OpenSSL-x86.wixobj\r
-       light OpenSSL-x86.wixobj\r
-       del ..\*.msi\r
-\r
-OpenSSL-x64.msm: OpenSSL-x64.wixobj\r
-       light OpenSSL-x64.wixobj\r
-       del ..\*.msi\r
-\r
-OpenSSL-x86.wixobj: OpenSSL-x86.wxs  $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\libeay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\ssleay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\openssl.exe $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\libeay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\ssleay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\openssl.exe\r
-       wixcop -indent:2 OpenSSL-x86.wxs \r
-       candle OpenSSL-x86.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay32Component=$(LibEay32Component) -dSSlEay32Component=$(SSlEay32Component) -dLibEay32Componentd=$(LibEay32Componentd) -dSSlEay32Componentd=$(SSlEay32Componentd)\r
-\r
-OpenSSL-x64.wixobj: OpenSSL-x64.wxs  $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\libeay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\ssleay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\openssl.exe $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll.dbg\libeay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll.dbg\ssleay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll.dbg\openssl.exe\r
-       wixcop -indent:2 OpenSSL-x64.wxs \r
-       candle OpenSSL-x64.wxs -dBuildDirectory=$(BuildSP) -dOpenSSLVersion=$(OpenSSLVersion) -dOpenSSLDirVersion=$(OpenSSLDirVersion) -dOpenSSLFileVersion=$(OpenSSLFileVersion) -dLibEay64Component=$(LibEay64Component) -dSSlEay64Component=$(SSlEay64Component) -dLibEay64Componentd=$(LibEay64Componentd) -dSSlEay64Componentd=$(SSlEay64Componentd)\r
-\r
-#\r
-# Shibboleth DLL\r
-#\r
-Shibboleth-x86.msm: Shibboleth-x86.wixobj\r
-       light Shibboleth-x86.wixobj\r
-       del ..\*.msi\r
-\r
-Shibboleth-x64.msm: Shibboleth-x64.wixobj\r
-       light Shibboleth-x64.wixobj\r
-       del ..\*.msi\r
-\r
-Shibboleth-x86.wixobj: Shibboleth-x86.wxs $(SolutionDir)\Release\shibsp$(ShibbolethDllFileVersion).dll $(SolutionDir)\Release\shibsp-lite$(ShibbolethDllFileVersion).dll $(SolutionDir)\Debug\shibsp$(ShibbolethDllFileVersion)d.dll $(SolutionDir)\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll\r
-       wixcop -indent:2 Shibboleth-x86.wxs \r
-       candle Shibboleth-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll32Component=$(ShibDll32Component) -dShibDllLite32Component=$(ShibDllLite32Component) -dShibDll32Componentd=$(ShibDll32Componentd) -dShibDllLite32Componentd=$(ShibDllLite32Componentd)\r
-\r
-Shibboleth-x64.wixobj: Shibboleth-x64.wxs $(SolutionDir)\x64\Release\shibsp$(ShibbolethDllFileVersion).dll $(SolutionDir)\x64\Release\shibsp-lite$(ShibbolethDllFileVersion).dll $(SolutionDir)\x64\Debug\shibsp$(ShibbolethDllFileVersion)d.dll $(SolutionDir)\x64\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll\r
-       wixcop -indent:2 Shibboleth-x64.wxs \r
-       candle Shibboleth-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll64Component=$(ShibDll64Component) -dShibDllLite64Component=$(ShibDllLite64Component) -dShibDll64Componentd=$(ShibDll64Componentd) -dShibDllLite64Componentd=$(ShibDllLite64Componentd)\r
-\r
-Shibboleth-schemas.msm: Shibboleth-schemas.wixobj\r
-       light Shibboleth-schemas.wixobj\r
-       del ..\*.msi\r
-\r
-Shibboleth-schemas.wixobj: Shibboleth-schemas.wxs\r
-       wixcop -indent:2 Shibboleth-schemas.wxs \r
-       candle Shibboleth-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) \r
-\r
-\r
-#\r
-# Xerces\r
-#\r
-Xerces-x86.msm: Xerces-x86.wixobj\r
-       light Xerces-x86.wixobj\r
-       del ..\*.msi\r
-\r
-Xerces-x64.msm: Xerces-x64.wixobj\r
-       light Xerces-x64.wixobj\r
-       del ..\*.msi\r
-\r
-Xerces-x86.wixobj: Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion)D.dll\r
-       wixcop -indent:2 Xerces-x86.wxs \r
-       candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd)\r
-\r
-Xerces-x64.wixobj: Xerces-x64.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion)D.dll\r
-       wixcop -indent:2 Xerces-x64.wxs \r
-       candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd)\r
-\r
-\r
-#\r
-# XmlSec\r
-#\r
-XmlSec-x86.msm: XmlSec-x86.wixobj\r
-       light XmlSec-x86.wixobj\r
-       del ..\*.msi\r
-\r
-XmlSec-x64.msm: XmlSec-x64.wixobj\r
-       light XmlSec-x64.wixobj\r
-       del ..\*.msi\r
-\r
-XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\xsec_$(XmlSecFileVersion).dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\txfmout.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\xsec_$(XmlSecFileVersion)D.dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\txfmout.exe" \r
-       wixcop -indent:2 XmlSec-x86.wxs \r
-       candle XmlSec-x86.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec32Component=$(XmlSec32Component) -dXmlSec32Componentd=$(XmlSec32Componentd)\r
-\r
-XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\xsec_$(XmlSecFileVersion).dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\txfmout.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\xsec_$(XmlSecFileVersion)D.dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\txfmout.exe"\r
-       wixcop -indent:2 XmlSec-x64.wxs \r
-       candle XmlSec-x64.wxs -dBuildDirectory=$(BuildSP) -dXmlSecVersion=$(XmlSecVersion) -dXmlSecFileVersion=$(XmlSecFileVersion) -dXmlSec64Component=$(XmlSec64Component) -dXmlSec64Componentd=$(XmlSec64Componentd)\r
-\r
-#\r
-# ZLIB\r
-#\r
-\r
-zlib-x86.msm: zlib-x86.wixobj\r
-       light zlib-x86.wixobj\r
-       del ..\*.msi\r
-\r
-zlib-x64.msm: zlib-x64.wixobj\r
-       light zlib-x64.wixobj\r
-       del ..\*.msi\r
-\r
-zlib-x86.wixobj: zlib-x86.wxs $(BuildSP)\zlib-$(ZlibVersion)\Release\zlib$(ZlibFileVersion).dll $(BuildSP)\zlib-$(ZlibVersion)\Debug\zlib$(ZlibFileVersion)d.dll\r
-       wixcop -indent:2 zlib-x86.wxs \r
-       candle zlib-x86.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib32Component=$(Zlib32Component) -dZlib32Componentd=$(Zlib32Componentd)\r
-\r
-zlib-x64.wixobj: zlib-x64.wxs $(BuildSP)\zlib-$(ZlibVersion)\x64\Release\zlib$(ZlibFileVersion).dll $(BuildSP)\zlib-$(ZlibVersion)\x64\Debug\zlib$(ZlibFileVersion)d.dll\r
-       wixcop -indent:2 zlib-x64.wxs \r
-       candle zlib-x64.wxs -dBuildDirectory=$(BuildSP) -dZlibVersion=$(ZlibVersion) -dZlibFileVersion=$(ZlibFileVersion) -dZlib64Component=$(Zlib64Component) -dZlib64Componentd=$(Zlib64Componentd)\r
-\r
-#\r
+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
+
+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
+
+clean32: 
+       del *-x86.msm *-x86.wixobj *-x86.wixpdb *schemas.wixobj *schemas.msm
+
+clean64: 
+       del *-x64.wixobj *-x64.msm *-x64.wixpdb *schemas.wixobj *schemas.msm
+
+clean: clean32 clean64
+
+rebuild32: clean32 all32
+
+rebuild64: clean64 all64
+
+#
+# CURL 
+#
+Curl-x64.msm: Curl-x64.wixobj 
+       light Curl-x64.wixobj
+       del ..\*.msi
+
+Curl-x64.wixobj: Curl-x64.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll
+       wixcop -indent:2 Curl-x64.wxs 
+       candle Curl-x64.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)
+
+Curl-x86.msm: Curl-x86.wixobj 
+       light Curl-x86.wixobj
+       del ..\*.msi
+
+Curl-x86.wixobj: Curl-x86.wxs $(BuildSP)\curl-$(CurlVersion)\lib\release-dll-ssl-dll-zlib-dll\libcurl.dll $(BuildSP)\curl-$(CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll\libcurld.dll 
+       wixcop -indent:2 Curl-x86.wxs 
+       candle Curl-x86.wxs -dBuildDirectory=$(BuildSP) -dCurlVersion=$(CurlVersion)
+
+#
+# FastCGI
+#
+FastCGI-x86.msm: FastCGI-x86.wixobj 
+       light FastCGI-x86.wixobj
+       del ..\*.msi
+
+FastCGI-x86.wixobj: FastCGI-x86.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Release\libfcgi.dll  $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll 
+       wixcop -indent:2 FastCGI-x86.wxs 
+       candle FastCGI-x86.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)
+
+FastCGI-x64.msm: FastCGI-x64.wixobj 
+       light FastCGI-x64.wixobj
+       del ..\*.msi
+
+FastCGI-x64.wixobj: FastCGI-x64.wxs $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll  $(BuildSP)\fcgi-$(FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll
+       wixcop -indent:2 FastCGI-x64.wxs 
+       candle FastCGI-x64.wxs -dBuildDirectory=$(BuildSP) -dFastCGIVersion=$(FastCGIVersion)
+
+#
+# Log 4 shib.  More complicated since it has a version and a file version (and hence 2 components per architecture)
+#
+Log4Shib-x64.msm: Log4Shib-x64.wixobj
+       light Log4Shib-x64.wixobj
+       del ..\*.msi
+
+Log4Shib-x86.msm: Log4Shib-x86.wixobj
+       light Log4Shib-x86.wixobj
+       del ..\*.msi
+
+Log4Shib-x86.wixobj: Log4Shib-x86.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\Release\log4shib$(Log4ShibFileVersion).dll
+       wixcop -indent:2 Log4Shib-x86.wxs 
+       candle Log4Shib-x86.wxs -dBuildDirectory=$(BuildSP) -dLog4ShibVersion=$(Log4ShibVersion) -dLog4ShibFileVersion=$(Log4ShibFileVersion) -dLog4ShibComponent32=$(Log4ShibComponent32) -dLog4ShibComponent32d=$(Log4ShibComponent32d)
+
+Log4Shib-x64.wixobj: Log4Shib-x64.wxs $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\x64\Debug\log4shib$(Log4ShibFileVersion)D.dll $(BuildSP)\log4shib-$(Log4ShibVersion)\msvc10\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)
+
+#
+# OpenSAML
+#
+OpenSAML-x86.msm: OpenSAML-x86.wixobj
+       light OpenSAML-x86.wixobj
+       del ..\*.msi
+
+OpenSAML-x64.msm: OpenSAML-x64.wixobj
+       light OpenSAML-x64.wixobj
+       del ..\*.msi
+
+OpenSAML-x86.wixobj: OpenSAML-x86.wxs $(SolutionDir)..\cpp-xmltooling\Release\xmltooling$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-xmltooling\Release\xmltooling-lite$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-OpenSaml\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\Debug\xmltooling$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-xmltooling\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-OpenSaml\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)
+
+OpenSAML-x64.wixobj: OpenSAML-x64.wxs $(SolutionDir)..\cpp-xmltooling\x64\Release\xmltooling$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-xmltooling\x64\Release\xmltooling-lite$(XmlToolingFileVersion).dll  $(SolutionDir)..\cpp-OpenSaml\x64\Release\saml$(OpenSAMLFileVersion).dll $(SolutionDir)..\cpp-xmltooling\x64\Debug\xmltooling$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-xmltooling\x64\Debug\xmltooling-lite$(XmlToolingFileVersion)d.dll  $(SolutionDir)..\cpp-OpenSaml\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)
+
+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) 
+
+#
+# OpenSSL
+#
+OpenSSL-x86.msm: OpenSSL-x86.wixobj
+       light OpenSSL-x86.wixobj
+       del ..\*.msi
+
+OpenSSL-x64.msm: OpenSSL-x64.wixobj
+       light OpenSSL-x64.wixobj
+       del ..\*.msi
+
+OpenSSL-x86.wixobj: OpenSSL-x86.wxs  $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\libeay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\ssleay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll\openssl.exe $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\libeay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\ssleay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out32dll.dbg\openssl.exe
+       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  $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\libeay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\ssleay32_$(OpenSSLFileVersion).dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll\openssl.exe $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll.dbg\libeay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll.dbg\ssleay32_$(OpenSSLFileVersion)d.dll $(BuildSP)\openssl-$(OpenSSLDirVersion)\out64dll.dbg\openssl.exe
+       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
+#
+Shibboleth-x86.msm: Shibboleth-x86.wixobj
+       light Shibboleth-x86.wixobj
+       del ..\*.msi
+
+Shibboleth-x64.msm: Shibboleth-x64.wixobj
+       light Shibboleth-x64.wixobj
+       del ..\*.msi
+
+Shibboleth-x86.wixobj: Shibboleth-x86.wxs $(SolutionDir)\Release\shibsp$(ShibbolethDllFileVersion).dll $(SolutionDir)\Release\shibsp-lite$(ShibbolethDllFileVersion).dll $(SolutionDir)\Debug\shibsp$(ShibbolethDllFileVersion)d.dll $(SolutionDir)\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll
+       wixcop -indent:2 Shibboleth-x86.wxs 
+       candle Shibboleth-x86.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll32Component=$(ShibDll32Component) -dShibDllLite32Component=$(ShibDllLite32Component) -dShibDll32Componentd=$(ShibDll32Componentd) -dShibDllLite32Componentd=$(ShibDllLite32Componentd)
+
+Shibboleth-x64.wixobj: Shibboleth-x64.wxs $(SolutionDir)\x64\Release\shibsp$(ShibbolethDllFileVersion).dll $(SolutionDir)\x64\Release\shibsp-lite$(ShibbolethDllFileVersion).dll $(SolutionDir)\x64\Debug\shibsp$(ShibbolethDllFileVersion)d.dll $(SolutionDir)\x64\Debug\shibsp-lite$(ShibbolethDllFileVersion)d.dll
+       wixcop -indent:2 Shibboleth-x64.wxs 
+       candle Shibboleth-x64.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) -dShibbolethDllFileVersion=$(ShibbolethDllFileVersion) -dShibDll64Component=$(ShibDll64Component) -dShibDllLite64Component=$(ShibDllLite64Component) -dShibDll64Componentd=$(ShibDll64Componentd) -dShibDllLite64Componentd=$(ShibDllLite64Componentd)
+
+Shibboleth-schemas.msm: Shibboleth-schemas.wixobj
+       light Shibboleth-schemas.wixobj
+       del ..\*.msi
+
+Shibboleth-schemas.wixobj: Shibboleth-schemas.wxs
+       wixcop -indent:2 Shibboleth-schemas.wxs 
+       candle Shibboleth-schemas.wxs -dSPBuildDirectory=$(SolutionDir).. -dShibbolethDllVersion=$(ShibbolethDllVersion) 
+
+
+#
+# Xerces
+#
+Xerces-x86.msm: Xerces-x86.wixobj
+       light Xerces-x86.wixobj
+       del ..\*.msi
+
+Xerces-x64.msm: Xerces-x64.wixobj
+       light Xerces-x64.wixobj
+       del ..\*.msi
+
+Xerces-x86.wixobj: Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion)D.dll
+       wixcop -indent:2 Xerces-x86.wxs 
+       candle Xerces-x86.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces32Component=$(Xerces32Component) -dXerces32Componentd=$(Xerces32Componentd)
+
+Xerces-x64.wixobj: Xerces-x64.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion).dll Xerces-x86.wxs $(BuildSP)\xerces-c-$(XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(XercesFileVersion)D.dll
+       wixcop -indent:2 Xerces-x64.wxs 
+       candle Xerces-x64.wxs -dBuildDirectory=$(BuildSP) -dXercesVersion=$(XercesVersion) -dXercesFileVersion=$(XercesFileVersion) -dXerces64Component=$(Xerces64Component) -dXerces64Componentd=$(Xerces64Componentd)
+
+
+#
+# XmlSec
+#
+XmlSec-x86.msm: XmlSec-x86.wixobj
+       light XmlSec-x86.wixobj
+       del ..\*.msi
+
+XmlSec-x64.msm: XmlSec-x64.wixobj
+       light XmlSec-x64.wixobj
+       del ..\*.msi
+
+XmlSec-x86.wixobj: XmlSec-x86.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\xsec_$(XmlSecFileVersion).dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Release No Xalan\txfmout.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\xsec_$(XmlSecFileVersion)D.dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\Debug No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\Win32\VC10\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)
+
+XmlSec-x64.wixobj: XmlSec-x64.wxs "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\xsec_$(XmlSecFileVersion).dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Release No Xalan\txfmout.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\xsec_$(XmlSecFileVersion)D.dll" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\c14n.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\checksig.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\cipher.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\siginf.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\Debug No Xalan\templatesign.exe" "$(BuildSP)\xml-security-c-$(XmlSecVersion)\Build\x64\VC10\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)
+
+#
+# ZLIB
+#
+
+zlib-x86.msm: zlib-x86.wixobj
+       light zlib-x86.wixobj
+       del ..\*.msi
+
+zlib-x64.msm: zlib-x64.wixobj
+       light zlib-x64.wixobj
+       del ..\*.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)
+
+#
index ed75f5a..e219853 100644 (file)
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}</ProjectGuid>\r
-    <Keyword>MakeFileProj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Label="Configuration">\r
-    <ConfigurationType>Makefile</ConfigurationType>\r
-    <UseDebugLibraries>false</UseDebugLibraries>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <Import Project="..\..\..\..\BuildPath.props" />\r
-  <Import Project="..\..\..\MsBuild\Versions.props" />\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">\r
-    <NMakeBuildCommandLine>nmake /f MergeModules.make clean</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *.wixobj</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make clean</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) all32</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *86.wixobj\r
-del *86.msm\r
-del *x86.wixpdb\r
-del OpenSAML-schemas.wixpdb\r
-del OpenSAML-schemas.wixobj\r
-del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion)  Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d)  SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) rebuild32</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>\r
-    </NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) all64</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *64.wixobj\r
-del *64.msm \r
-del *64.wixpdb \r
-del OpenSAML-schemas.wixpdb \r
-del OpenSAML-schemas.wixobj\r
-del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) rebuild64</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <None Include="Curl-x64.wxs" />\r
-    <None Include="Curl-x86.wxs" />\r
-    <None Include="Curl.vcxproj.user" />\r
-    <None Include="FastCGI-x86.wxs" />\r
-    <None Include="FastCGI-x64.wxs" />\r
-    <None Include="MergeModules.make" />\r
-    <None Include="Log4Shib-x64.wxs" />\r
-    <None Include="Log4Shib-x86.wxs" />\r
-    <None Include="OpenSAML-schemas.wxs" />\r
-    <None Include="OpenSAML-x64.wxs" />\r
-    <None Include="OpenSAML-x86.wxs" />\r
-    <None Include="OpenSSL-x64.wxs" />\r
-    <None Include="OpenSSL-x86.wxs" />\r
-    <None Include="Shibboleth-schemas.wxs" />\r
-    <None Include="Shibboleth-x64.wxs" />\r
-    <None Include="Shibboleth-x86.wxs" />\r
-    <None Include="Xerces-x64.wxs" />\r
-    <None Include="Xerces-x86.wxs" />\r
-    <None Include="XmlSec-x64.wxs" />\r
-    <None Include="XmlSec-x86.wxs" />\r
-    <None Include="Zlib-x64.wxs" />\r
-    <None Include="Zlib-x86.wxs" />\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}</ProjectGuid>
+    <Keyword>MakeFileProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <Import Project="..\..\..\..\BuildPath.props" />
+  <Import Project="..\..\..\MsBuild\Versions.props" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <NMakeBuildCommandLine>nmake /f MergeModules.make clean</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>del *.wixobj</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>nmake /f MergeModules.make clean</NMakeReBuildCommandLine>
+    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) all32</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>del *86.wixobj
+del *86.msm
+del *x86.wixpdb
+del OpenSAML-schemas.wixpdb
+del OpenSAML-schemas.wixobj
+del OpenSAML-schemas.msm</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion)  Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d)  SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) rebuild32</NMakeReBuildCommandLine>
+    <NMakePreprocessorDefinitions>
+    </NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) all64</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>del *64.wixobj
+del *64.msm 
+del *64.wixpdb 
+del OpenSAML-schemas.wixpdb 
+del OpenSAML-schemas.wixobj
+del OpenSAML-schemas.msm</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) rebuild64</NMakeReBuildCommandLine>
+    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="Curl-x64.wxs" />
+    <None Include="Curl-x86.wxs" />
+    <None Include="Curl.vcxproj.user" />
+    <None Include="FastCGI-x86.wxs" />
+    <None Include="FastCGI-x64.wxs" />
+    <None Include="MergeModules.make" />
+    <None Include="Log4Shib-x64.wxs" />
+    <None Include="Log4Shib-x86.wxs" />
+    <None Include="OpenSAML-schemas.wxs" />
+    <None Include="OpenSAML-x64.wxs" />
+    <None Include="OpenSAML-x86.wxs" />
+    <None Include="OpenSSL-x64.wxs" />
+    <None Include="OpenSSL-x86.wxs" />
+    <None Include="Shibboleth-schemas.wxs" />
+    <None Include="Shibboleth-x64.wxs" />
+    <None Include="Shibboleth-x86.wxs" />
+    <None Include="Xerces-x64.wxs" />
+    <None Include="Xerces-x86.wxs" />
+    <None Include="XmlSec-x64.wxs" />
+    <None Include="XmlSec-x86.wxs" />
+    <None Include="Zlib-x64.wxs" />
+    <None Include="Zlib-x86.wxs" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
index bfab312..3418ce0 100644 (file)
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-     Development, Inc. (UCAID) under one or more contributor license\r
-     agreements.  See the NOTICE file distributed with this work for\r
-     additional information regarding copyright ownership. The UCAID\r
-     licenses this file to You under the Apache License, Version 2.0\r
-     (the "License"); you may not use this file except in compliance\r
-     with the License.  You may obtain a copy of the License at\r
-     \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
-     \r
-     Unless required by applicable law or agreed to in writing, software\r
-     distributed under the License is distributed on an "AS IS" BASIS,\r
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-     implied.  See the License for the specific language governing\r
-     permissions and limitations under the License.  -->\r
-<?include ..\Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-\r
-  <Module Id='OpenSAMLSchemasMergeModule' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
-    <Package Id='{8567178A-EEA1-4798-9D20-C2E2F7247D0F}' Description='Merge Module for OpenSAML schemas'\r
-             Comments='This module is built by the Shibboleth Consortium'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >\r
-        <Directory Id='Shibboleth' Name='Shibboleth' >\r
-          <Directory Id='SP' Name='SP' >\r
-            <Directory Id='xml' Name='xml' >\r
-              <Directory Id='opensaml' Name='opensaml' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\schemas\' >\r
-                <Component Id='assertion_01.xsd' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>\r
-                  <File KeyPath='yes' Id='assertion_01.xsd' Name='cs-sstc-schema-assertion-01.xsd'/>\r
-                </Component>\r
-                <Component Id='assertion_1.1.xsd' Guid='{D01E45CD-41D8-4029-AB27-103D36734D07}'>\r
-                  <File KeyPath='yes' Id='assertion_1.1.xsd' Name='cs-sstc-schema-assertion-1.1.xsd' />\r
-                </Component>\r
-                <Component Id='protocol_01.xsd' Guid='{333BABD7-1EDF-4F7C-85A7-4FDD804E57D3}'>\r
-                  <File KeyPath='yes' Id='protocol_01.xsd' Name='cs-sstc-schema-protocol-01.xsd' />\r
-                </Component>\r
-                <Component Id='protocol_1.1.xsd' Guid='{CB8A87E7-A8FE-44E7-AE2F-D5C41F66A1C0}'>\r
-                  <File KeyPath='yes' Id='protocol_1.1.xsd' Name='cs-sstc-schema-protocol-1.1.xsd' />\r
-                </Component>\r
-                <Component Id='saml10_catalog.xml' Guid='{7E08BA59-AC67-4FEF-A3C4-DA01F59E16E0}'>\r
-                  <File KeyPath='yes' Name='saml10-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml10-catalog.xml.in' />\r
-                </Component>\r
-                <Component Id='saml11_catalog.xml' Guid='{4D599268-82B3-4C69-BB24-8E3D0FC79BE1}'>\r
-                  <File KeyPath='yes' Name='saml11-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml11-catalog.xml.in' />\r
-                </Component>\r
-                <Component Id='saml20_catalog.xml' Guid='{2A9829FE-518F-478B-B116-5B6A3087A6C9}'>\r
-                  <File KeyPath='yes' Name='saml20-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml20-catalog.xml.in' />\r
-                </Component>\r
-                <Component Id='assertion_2.0.xsd' Guid='{6A785715-2E2E-4DFC-948B-94711E1DC355}'>\r
-                  <File KeyPath='yes' Id='assertion_2.0.xsd' Name='saml-schema-assertion-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='authn_context_2.0.xsd' Guid='{7EC7E7A6-464C-4137-8E20-DDE9BD4F7706}'>\r
-                  <File KeyPath='yes' Id='authn_context_2.0.xsd' Name='saml-schema-authn-context-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_auth_telephony_2.0.xsd' Guid='{81BDD012-6863-45DF-86CB-138B627D7D17}'>\r
-                  <File KeyPath='yes' Id='ac_auth_telephony_2.0.xsd' Name='saml-schema-authn-context-auth-telephony-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_ip_2.0.xsd' Guid='{A47F07CA-77B4-40E5-A8FA-955C626E6E38}'>\r
-                  <File KeyPath='yes' Id='ac_ip_2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_ippword_2.0.xsd' Guid='{9052E8FD-D9B5-42CB-836A-C1A825DA6B3F}'>\r
-                  <File KeyPath='yes' Id='ac_ippword_2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_kerberos_2.0.xsd' Guid='{03D7CD55-AF85-4B1A-A09F-991D5BCC3C71}'>\r
-                  <File KeyPath='yes' Id='ac_kerberos_2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_mobileonefactor_reg_2.0.xsd' Guid='{B934A845-5027-4B80-9C8B-DE6BA42E1D1C}'>\r
-                  <File KeyPath='yes' Id='ac_mobileonefactor_reg_2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_mobileonefactor_unreg_2.0.xsd' Guid='{B2DCED0E-E97E-448E-83D1-6CDFC8711EA9}'>\r
-                  <File KeyPath='yes' Id='ac_mobileonefactor_unreg_2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_mobiletwofactor_reg_2.0.xsd' Guid='{70C79D92-D7AF-49FB-A332-72F431582C6A}'>\r
-                  <File KeyPath='yes' Id='ac_mobiletwofactor_reg_2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_mobiletwofactor_unreg_2.0.xsd' Guid='{195F5D51-1FD6-410A-9A48-9C4AAF1202FB}'>\r
-                  <File KeyPath='yes' Id='ac_mobiletwofactor_unreg_2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_nomad_telephony_2.0.xsd' Guid='{13686CA3-58F4-4176-9297-3E797D075A6E}'>\r
-                  <File KeyPath='yes' Id='ac_nomad_telephony_2.0.xsd' Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_personal_telephony_2.0.xsd' Guid='{10BFBEF9-B458-4CF2-930A-404D1BDCF4B8}'>\r
-                  <File KeyPath='yes' Id='ac_personal_telephony_2.0.xsd' Name='saml-schema-authn-context-personal-telephony-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_pgp_2.0.xsd' Guid='{4514C6C6-0DFB-4A4B-BD93-36D856937199}'>\r
-                  <File KeyPath='yes' Id='ac_pgp_2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_ppt_2.0.xsd' Guid='{8AB6A86E-DEDC-49C3-B1BB-92DAFBE49351}'>\r
-                  <File KeyPath='yes' Id='ac_ppt_2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_pword_2.0.xsd' Guid='{77793E85-3003-4D75-862E-7164AB576D6D}'>\r
-                  <File KeyPath='yes' Id='ac_pword_2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_session_2.0.xsd' Guid='{D426514A-1A01-4B70-9375-C5240E9267FB}'>\r
-                  <File KeyPath='yes' Id='ac_session_2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_smartcard_2.0.xsd' Guid='{3A57FE98-237B-4993-ACCE-6BC5ECAF0E54}'>\r
-                  <File KeyPath='yes' Id='ac_smartcard_2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_smartcardpki_2.0.xsd' Guid='{CBAE6C22-E0B1-42E5-BF3F-AAD55EAA6193}'>\r
-                  <File KeyPath='yes' Id='ac_smartcardpki_2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_softwarepki_2.0.xsd' Guid='{BB0D6BE0-9C42-4EDA-88B6-C791809B5092}'>\r
-                  <File KeyPath='yes' Id='ac_softwarepki_2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_spki_2.0.xsd' Guid='{76840C0F-8991-4B6D-A32F-6053B93B60B6}'>\r
-                  <File KeyPath='yes' Id='ac_spki_2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_srp_2.0.xsd' Guid='{C07DFE86-DCCA-4289-BEB8-D8B7A146EBBB}'>\r
-                  <File KeyPath='yes' Id='ac_srp_2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_sslcert_2.0.xsd' Guid='{72BE1F0B-E2B5-40D3-A086-24D0011E718C}'>\r
-                  <File KeyPath='yes' Id='ac_sslcert_2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_telephony_2.0.xsd' Guid='{BDD9E146-8AEB-4AE9-A99F-6B2072587A4C}'>\r
-                  <File KeyPath='yes' Id='ac_telephony_2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_timesync_2.0.xsd' Guid='{8220805B-A2D3-4952-BF20-AA763B77C243}'>\r
-                  <File KeyPath='yes' Id='ac_timesync_2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_types_2.0.xsd' Guid='{E0ED6CFB-C41E-4E8D-AC78-ADBC22A28893}'>\r
-                  <File KeyPath='yes' Id='ac_types_2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_x509_2.0.xsd' Guid='{514D0A27-C204-43BC-A8B1-47E51C4E4FE2}'>\r
-                  <File KeyPath='yes' Id='ac_x509_2.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ac_xmldsig_2.0.xsd' Guid='{8BD5727A-0DE4-4739-8CCA-CC0BEA03D7B1}'>\r
-                  <File KeyPath='yes' Id='ac_xmldsig_2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='dce_2.0.xsd' Guid='{669A1D43-AB09-4BCD-A989-B42DE5D50EB1}'>\r
-                  <File KeyPath='yes' Id='dce_2.0.xsd' Name='saml-schema-dce-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='ecp_2.0.xsd' Guid='{D4E12A26-39B7-407B-9177-D67799CEF333}'>\r
-                  <File KeyPath='yes' Id='ecp_2.0.xsd' Name='saml-schema-ecp-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='metadata_2.0.xsd' Guid='{02823006-3999-4F7B-979E-4BE0C32B6109}'>\r
-                  <File KeyPath='yes' Id='metadata_2.0.xsd' Name='saml-schema-metadata-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='protocol_2.0.xsd' Guid='{20E92615-EA8B-482C-80A2-6EEB103DA945}'>\r
-                  <File KeyPath='yes' Id='protocol_2.0.xsd' Name='saml-schema-protocol-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='x500_2.0.xsd' Guid='{1C737F49-4B66-47FD-A1CA-754342DFF868}'>\r
-                  <File KeyPath='yes' Id='x500_2.0.xsd' Name='saml-schema-x500-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='xacml_2.0.xsd' Guid='{36D94CC5-8DB9-4986-B7A2-D71303966307}'>\r
-                  <File KeyPath='yes' Id='xacml_2.0.xsd' Name='saml-schema-xacml-2.0.xsd' />\r
-                </Component>\r
-                <Component Id='metadata_attr.xsd' Guid='{87188F0C-D1CF-4990-91E7-A10D23EDDFE7}'>\r
-                  <File KeyPath='yes' Id='metadata_attr.xsd' Name='sstc-metadata-attr.xsd' />\r
-                </Component>\r
-                <Component Id='request_initiation.xsd' Guid='{F824BCC5-467B-4AEB-B2CA-BE8F465B34F5}'>\r
-                  <File KeyPath='yes' Id='request_initiation.xsd' Name='sstc-request-initiation.xsd' />\r
-                </Component>\r
-                <Component Id='saml1x_metadata.xsd' Guid='{1F5DD1A1-A7EB-44C7-9FC5-A15E2263804F}'>\r
-                  <File KeyPath='yes' Id='saml1x_metadata.xsd' Name='sstc-saml1x-metadata.xsd' />\r
-                </Component>\r
-                <Component Id='attribute_ext.xsd' Guid='{E81FA4D6-C58D-4D04-8167-A4BB9E3675E9}'>\r
-                  <File KeyPath='yes' Id='attribute_ext.xsd' Name='sstc-saml-attribute-ext.xsd' />\r
-                </Component>\r
-                <Component Id='delegation.xsd' Guid='{48AA3869-C62B-47B2-8E1E-80BE6AB056BE}'>\r
-                  <File KeyPath='yes' Id='delegation.xsd' Name='sstc-saml-delegation.xsd' />\r
-                </Component>\r
-                <Component Id='idp_discovery.xsd' Guid='{9A16BE14-D5AA-40F3-8416-709B7C96E8C6}'>\r
-                  <File KeyPath='yes' Id='idp_discovery.xsd' Name='sstc-saml-idp-discovery.xsd' />\r
-                </Component>\r
-                <Component Id='metadata_algsupport_v1.0.xsd' Guid='{97489B89-9651-4131-82A7-0B9F638FD25C}'>\r
-                  <File KeyPath='yes' Id='metadata_algsupport_v1.0.xsd' Name='sstc-saml-metadata-algsupport-v1.0.xsd' />\r
-                </Component>\r
-                <Component Id='metadata_ext_query.xsd' Guid='{5F1380C9-7327-4D11-BC9E-CD59CC362B21}'>\r
-                  <File KeyPath='yes' Id='metadata_ext_query.xsd' Name='sstc-saml-metadata-ext-query.xsd' />\r
-                </Component>\r
-                <Component Id='metadata_ui_v1.0.xsd' Guid='{C203B8C4-0056-46F6-96DE-E831933437D3}'>\r
-                  <File KeyPath='yes' Id='metadata_ui_v1.0.xsd' Name='sstc-saml-metadata-ui-v1.0.xsd' />\r
-                </Component>\r
-                <Component Id='protocol_ext_thirdparty.xsd' Guid='{EEFDA0C0-F1F4-4C09-82CD-873F037A4296}'>\r
-                  <File KeyPath='yes' Id='protocol_ext_thirdparty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd' />\r
-                </Component>\r
-                <Component Id='async_slo_v1.0.xsd' Guid='{C3209C47-3F6D-4C20-B004-C85DDC4AD7E7}'>\r
-                  <File KeyPath='yes' Id='async_slo_v1.0.xsd' Name='saml-async-slo-v1.0.xsd' />\r
-                </Component>\r
-              </Directory><!-- opensaml -->\r
-              <Directory Id='xmltooling' Name='xmltooling' FileSource='$(var.SPBuildDirectory)\cpp-xmltooling\schemas\' >\r
-                <Component Id='xenc_schema.xsd' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>\r
-                  <File KeyPath='yes' Name='xenc-schema.xsd' />\r
-                </Component>\r
-                <Component Id='xenc11_schema.xsd' Guid='{DC61F4FB-03BB-4ED4-9552-6BE33CE3DF80}'>\r
-                  <File KeyPath='yes' Name='xenc11-schema.xsd' />\r
-                </Component>\r
-                <Component Id='xmldsig.xsd' Guid='{72871706-1D8F-4695-B573-AF2EB0635281}'>\r
-                  <File KeyPath='yes' Name='xmldsig-core-schema.xsd' />\r
-                </Component>\r
-                <Component Id='xmldsig11.xsd' Guid='{A0E6F269-77F0-47E6-B59A-887977ECE06A}'>\r
-                  <File KeyPath='yes' Name='xmldsig11-schema.xsd' />\r
-                </Component>\r
-                <Component Id='soap_envelope.xsd' Guid='{A2B2255D-344E-44E9-B894-5AB3416D8CBC}'>\r
-                  <File KeyPath='yes' Name='soap-envelope.xsd' />\r
-                </Component>\r
-                <Component Id='xml.xsd' Guid='{E58D7865-6B4D-4CDB-859F-0A69AD1E20BF}'>\r
-                  <File KeyPath='yes' Name='xml.xsd' />\r
-                </Component>\r
-                <Component Id='xmltooling.xsd' Guid='{E99A5CCE-C0A9-483C-BB02-A147E0C1A609}'>\r
-                  <File KeyPath='yes' Name='xmltooling.xsd' />\r
-                </Component>\r
-                <Component Id='catalog.xml' Guid='{CD84FD26-CCB0-4FC6-9B51-E72CC23046D8}'>\r
-                  <File KeyPath='yes' Name='catalog.xml' Source='$(var.SPBuildDirectory)\cpp-xmltooling\schemas\catalog.xml.in' />\r
-                </Component>\r
-              </Directory><!-- xmltooling -->\r
-            </Directory><!-- xml -->\r
-          </Directory><!-- SP -->\r
-        </Directory><!-- Shibboleth -->\r
-      </Directory><!-- CommonAppDataFolder -->\r
-    </Directory><!-- TargetDir -->\r
-    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />\r
-    <CustomAction Id='EditXMLToolingCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall=''\r
-      Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='EditCatalogSAML10' BinaryKey='EditCatalogFileSrc' VBScriptCall=''\r
-      Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='EditCatalogSAML11' BinaryKey='EditCatalogFileSrc' VBScriptCall=''\r
-      Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall=''\r
-      Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog'\r
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\catalog.xml' />\r
-    <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10'\r
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml10-catalog.xml' />\r
-    <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11'\r
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml11-catalog.xml' />\r
-    <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20'\r
-      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml20-catalog.xml' />\r
-    <InstallExecuteSequence>\r
-      <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='SetEditCatalogSAML11' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='SetEditCatalogSAML20' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='EditXMLToolingCatalog' After='InstallFiles'>NOT Installed</Custom>\r
-      <Custom Action='EditCatalogSAML10' After='InstallFiles'>NOT Installed</Custom>\r
-      <Custom Action='EditCatalogSAML11' After='InstallFiles'>NOT Installed</Custom>\r
-      <Custom Action='EditCatalogSAML20' After='InstallFiles'>NOT Installed</Custom>\r
-    </InstallExecuteSequence>\r
-\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the "License"); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+<?include ..\Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+
+  <Module Id='OpenSAMLSchemasMergeModule' Language='1033' Version='$(var.OpenSAMLVersion)'>
+    <Package Id='{8567178A-EEA1-4798-9D20-C2E2F7247D0F}' Description='Merge Module for OpenSAML schemas'
+             Comments='This module is built by the Shibboleth Consortium'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
+        <Directory Id='Shibboleth' Name='Shibboleth' >
+          <Directory Id='SP' Name='SP' >
+            <Directory Id='xml' Name='xml' >
+              <Directory Id='opensaml' Name='opensaml' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\schemas\' >
+                <Component Id='assertion_01.xsd' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>
+                  <File KeyPath='yes' Id='assertion_01.xsd' Name='cs-sstc-schema-assertion-01.xsd'/>
+                </Component>
+                <Component Id='assertion_1.1.xsd' Guid='{D01E45CD-41D8-4029-AB27-103D36734D07}'>
+                  <File KeyPath='yes' Id='assertion_1.1.xsd' Name='cs-sstc-schema-assertion-1.1.xsd' />
+                </Component>
+                <Component Id='protocol_01.xsd' Guid='{333BABD7-1EDF-4F7C-85A7-4FDD804E57D3}'>
+                  <File KeyPath='yes' Id='protocol_01.xsd' Name='cs-sstc-schema-protocol-01.xsd' />
+                </Component>
+                <Component Id='protocol_1.1.xsd' Guid='{CB8A87E7-A8FE-44E7-AE2F-D5C41F66A1C0}'>
+                  <File KeyPath='yes' Id='protocol_1.1.xsd' Name='cs-sstc-schema-protocol-1.1.xsd' />
+                </Component>
+                <Component Id='saml10_catalog.xml' Guid='{7E08BA59-AC67-4FEF-A3C4-DA01F59E16E0}'>
+                  <File KeyPath='yes' Name='saml10-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml10-catalog.xml.in' />
+                </Component>
+                <Component Id='saml11_catalog.xml' Guid='{4D599268-82B3-4C69-BB24-8E3D0FC79BE1}'>
+                  <File KeyPath='yes' Name='saml11-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml11-catalog.xml.in' />
+                </Component>
+                <Component Id='saml20_catalog.xml' Guid='{2A9829FE-518F-478B-B116-5B6A3087A6C9}'>
+                  <File KeyPath='yes' Name='saml20-catalog.xml' Source='$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml20-catalog.xml.in' />
+                </Component>
+                <Component Id='assertion_2.0.xsd' Guid='{6A785715-2E2E-4DFC-948B-94711E1DC355}'>
+                  <File KeyPath='yes' Id='assertion_2.0.xsd' Name='saml-schema-assertion-2.0.xsd' />
+                </Component>
+                <Component Id='authn_context_2.0.xsd' Guid='{7EC7E7A6-464C-4137-8E20-DDE9BD4F7706}'>
+                  <File KeyPath='yes' Id='authn_context_2.0.xsd' Name='saml-schema-authn-context-2.0.xsd' />
+                </Component>
+                <Component Id='ac_auth_telephony_2.0.xsd' Guid='{81BDD012-6863-45DF-86CB-138B627D7D17}'>
+                  <File KeyPath='yes' Id='ac_auth_telephony_2.0.xsd' Name='saml-schema-authn-context-auth-telephony-2.0.xsd' />
+                </Component>
+                <Component Id='ac_ip_2.0.xsd' Guid='{A47F07CA-77B4-40E5-A8FA-955C626E6E38}'>
+                  <File KeyPath='yes' Id='ac_ip_2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd' />
+                </Component>
+                <Component Id='ac_ippword_2.0.xsd' Guid='{9052E8FD-D9B5-42CB-836A-C1A825DA6B3F}'>
+                  <File KeyPath='yes' Id='ac_ippword_2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd' />
+                </Component>
+                <Component Id='ac_kerberos_2.0.xsd' Guid='{03D7CD55-AF85-4B1A-A09F-991D5BCC3C71}'>
+                  <File KeyPath='yes' Id='ac_kerberos_2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd' />
+                </Component>
+                <Component Id='ac_mobileonefactor_reg_2.0.xsd' Guid='{B934A845-5027-4B80-9C8B-DE6BA42E1D1C}'>
+                  <File KeyPath='yes' Id='ac_mobileonefactor_reg_2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd' />
+                </Component>
+                <Component Id='ac_mobileonefactor_unreg_2.0.xsd' Guid='{B2DCED0E-E97E-448E-83D1-6CDFC8711EA9}'>
+                  <File KeyPath='yes' Id='ac_mobileonefactor_unreg_2.0.xsd' Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd' />
+                </Component>
+                <Component Id='ac_mobiletwofactor_reg_2.0.xsd' Guid='{70C79D92-D7AF-49FB-A332-72F431582C6A}'>
+                  <File KeyPath='yes' Id='ac_mobiletwofactor_reg_2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd' />
+                </Component>
+                <Component Id='ac_mobiletwofactor_unreg_2.0.xsd' Guid='{195F5D51-1FD6-410A-9A48-9C4AAF1202FB}'>
+                  <File KeyPath='yes' Id='ac_mobiletwofactor_unreg_2.0.xsd' Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd' />
+                </Component>
+                <Component Id='ac_nomad_telephony_2.0.xsd' Guid='{13686CA3-58F4-4176-9297-3E797D075A6E}'>
+                  <File KeyPath='yes' Id='ac_nomad_telephony_2.0.xsd' Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' />
+                </Component>
+                <Component Id='ac_personal_telephony_2.0.xsd' Guid='{10BFBEF9-B458-4CF2-930A-404D1BDCF4B8}'>
+                  <File KeyPath='yes' Id='ac_personal_telephony_2.0.xsd' Name='saml-schema-authn-context-personal-telephony-2.0.xsd' />
+                </Component>
+                <Component Id='ac_pgp_2.0.xsd' Guid='{4514C6C6-0DFB-4A4B-BD93-36D856937199}'>
+                  <File KeyPath='yes' Id='ac_pgp_2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd' />
+                </Component>
+                <Component Id='ac_ppt_2.0.xsd' Guid='{8AB6A86E-DEDC-49C3-B1BB-92DAFBE49351}'>
+                  <File KeyPath='yes' Id='ac_ppt_2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd' />
+                </Component>
+                <Component Id='ac_pword_2.0.xsd' Guid='{77793E85-3003-4D75-862E-7164AB576D6D}'>
+                  <File KeyPath='yes' Id='ac_pword_2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd' />
+                </Component>
+                <Component Id='ac_session_2.0.xsd' Guid='{D426514A-1A01-4B70-9375-C5240E9267FB}'>
+                  <File KeyPath='yes' Id='ac_session_2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd' />
+                </Component>
+                <Component Id='ac_smartcard_2.0.xsd' Guid='{3A57FE98-237B-4993-ACCE-6BC5ECAF0E54}'>
+                  <File KeyPath='yes' Id='ac_smartcard_2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd' />
+                </Component>
+                <Component Id='ac_smartcardpki_2.0.xsd' Guid='{CBAE6C22-E0B1-42E5-BF3F-AAD55EAA6193}'>
+                  <File KeyPath='yes' Id='ac_smartcardpki_2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd' />
+                </Component>
+                <Component Id='ac_softwarepki_2.0.xsd' Guid='{BB0D6BE0-9C42-4EDA-88B6-C791809B5092}'>
+                  <File KeyPath='yes' Id='ac_softwarepki_2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd' />
+                </Component>
+                <Component Id='ac_spki_2.0.xsd' Guid='{76840C0F-8991-4B6D-A32F-6053B93B60B6}'>
+                  <File KeyPath='yes' Id='ac_spki_2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd' />
+                </Component>
+                <Component Id='ac_srp_2.0.xsd' Guid='{C07DFE86-DCCA-4289-BEB8-D8B7A146EBBB}'>
+                  <File KeyPath='yes' Id='ac_srp_2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd' />
+                </Component>
+                <Component Id='ac_sslcert_2.0.xsd' Guid='{72BE1F0B-E2B5-40D3-A086-24D0011E718C}'>
+                  <File KeyPath='yes' Id='ac_sslcert_2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd' />
+                </Component>
+                <Component Id='ac_telephony_2.0.xsd' Guid='{BDD9E146-8AEB-4AE9-A99F-6B2072587A4C}'>
+                  <File KeyPath='yes' Id='ac_telephony_2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd' />
+                </Component>
+                <Component Id='ac_timesync_2.0.xsd' Guid='{8220805B-A2D3-4952-BF20-AA763B77C243}'>
+                  <File KeyPath='yes' Id='ac_timesync_2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd' />
+                </Component>
+                <Component Id='ac_types_2.0.xsd' Guid='{E0ED6CFB-C41E-4E8D-AC78-ADBC22A28893}'>
+                  <File KeyPath='yes' Id='ac_types_2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd' />
+                </Component>
+                <Component Id='ac_x509_2.0.xsd' Guid='{514D0A27-C204-43BC-A8B1-47E51C4E4FE2}'>
+                  <File KeyPath='yes' Id='ac_x509_2.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd' />
+                </Component>
+                <Component Id='ac_xmldsig_2.0.xsd' Guid='{8BD5727A-0DE4-4739-8CCA-CC0BEA03D7B1}'>
+                  <File KeyPath='yes' Id='ac_xmldsig_2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd' />
+                </Component>
+                <Component Id='dce_2.0.xsd' Guid='{669A1D43-AB09-4BCD-A989-B42DE5D50EB1}'>
+                  <File KeyPath='yes' Id='dce_2.0.xsd' Name='saml-schema-dce-2.0.xsd' />
+                </Component>
+                <Component Id='ecp_2.0.xsd' Guid='{D4E12A26-39B7-407B-9177-D67799CEF333}'>
+                  <File KeyPath='yes' Id='ecp_2.0.xsd' Name='saml-schema-ecp-2.0.xsd' />
+                </Component>
+                <Component Id='metadata_2.0.xsd' Guid='{02823006-3999-4F7B-979E-4BE0C32B6109}'>
+                  <File KeyPath='yes' Id='metadata_2.0.xsd' Name='saml-schema-metadata-2.0.xsd' />
+                </Component>
+                <Component Id='protocol_2.0.xsd' Guid='{20E92615-EA8B-482C-80A2-6EEB103DA945}'>
+                  <File KeyPath='yes' Id='protocol_2.0.xsd' Name='saml-schema-protocol-2.0.xsd' />
+                </Component>
+                <Component Id='x500_2.0.xsd' Guid='{1C737F49-4B66-47FD-A1CA-754342DFF868}'>
+                  <File KeyPath='yes' Id='x500_2.0.xsd' Name='saml-schema-x500-2.0.xsd' />
+                </Component>
+                <Component Id='xacml_2.0.xsd' Guid='{36D94CC5-8DB9-4986-B7A2-D71303966307}'>
+                  <File KeyPath='yes' Id='xacml_2.0.xsd' Name='saml-schema-xacml-2.0.xsd' />
+                </Component>
+                <Component Id='metadata_attr.xsd' Guid='{87188F0C-D1CF-4990-91E7-A10D23EDDFE7}'>
+                  <File KeyPath='yes' Id='metadata_attr.xsd' Name='sstc-metadata-attr.xsd' />
+                </Component>
+                <Component Id='request_initiation.xsd' Guid='{F824BCC5-467B-4AEB-B2CA-BE8F465B34F5}'>
+                  <File KeyPath='yes' Id='request_initiation.xsd' Name='sstc-request-initiation.xsd' />
+                </Component>
+                <Component Id='saml1x_metadata.xsd' Guid='{1F5DD1A1-A7EB-44C7-9FC5-A15E2263804F}'>
+                  <File KeyPath='yes' Id='saml1x_metadata.xsd' Name='sstc-saml1x-metadata.xsd' />
+                </Component>
+                <Component Id='attribute_ext.xsd' Guid='{E81FA4D6-C58D-4D04-8167-A4BB9E3675E9}'>
+                  <File KeyPath='yes' Id='attribute_ext.xsd' Name='sstc-saml-attribute-ext.xsd' />
+                </Component>
+                <Component Id='delegation.xsd' Guid='{48AA3869-C62B-47B2-8E1E-80BE6AB056BE}'>
+                  <File KeyPath='yes' Id='delegation.xsd' Name='sstc-saml-delegation.xsd' />
+                </Component>
+                <Component Id='idp_discovery.xsd' Guid='{9A16BE14-D5AA-40F3-8416-709B7C96E8C6}'>
+                  <File KeyPath='yes' Id='idp_discovery.xsd' Name='sstc-saml-idp-discovery.xsd' />
+                </Component>
+                <Component Id='metadata_algsupport_v1.0.xsd' Guid='{97489B89-9651-4131-82A7-0B9F638FD25C}'>
+                  <File KeyPath='yes' Id='metadata_algsupport_v1.0.xsd' Name='sstc-saml-metadata-algsupport-v1.0.xsd' />
+                </Component>
+                <Component Id='metadata_ext_query.xsd' Guid='{5F1380C9-7327-4D11-BC9E-CD59CC362B21}'>
+                  <File KeyPath='yes' Id='metadata_ext_query.xsd' Name='sstc-saml-metadata-ext-query.xsd' />
+                </Component>
+                <Component Id='metadata_ui_v1.0.xsd' Guid='{C203B8C4-0056-46F6-96DE-E831933437D3}'>
+                  <File KeyPath='yes' Id='metadata_ui_v1.0.xsd' Name='sstc-saml-metadata-ui-v1.0.xsd' />
+                </Component>
+                <Component Id='protocol_ext_thirdparty.xsd' Guid='{EEFDA0C0-F1F4-4C09-82CD-873F037A4296}'>
+                  <File KeyPath='yes' Id='protocol_ext_thirdparty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd' />
+                </Component>
+                <Component Id='async_slo_v1.0.xsd' Guid='{C3209C47-3F6D-4C20-B004-C85DDC4AD7E7}'>
+                  <File KeyPath='yes' Id='async_slo_v1.0.xsd' Name='saml-async-slo-v1.0.xsd' />
+                </Component>
+              </Directory><!-- opensaml -->
+              <Directory Id='xmltooling' Name='xmltooling' FileSource='$(var.SPBuildDirectory)\cpp-xmltooling\schemas\' >
+                <Component Id='xenc_schema.xsd' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>
+                  <File KeyPath='yes' Name='xenc-schema.xsd' />
+                </Component>
+                <Component Id='xenc11_schema.xsd' Guid='{DC61F4FB-03BB-4ED4-9552-6BE33CE3DF80}'>
+                  <File KeyPath='yes' Name='xenc11-schema.xsd' />
+                </Component>
+                <Component Id='xmldsig.xsd' Guid='{72871706-1D8F-4695-B573-AF2EB0635281}'>
+                  <File KeyPath='yes' Name='xmldsig-core-schema.xsd' />
+                </Component>
+                <Component Id='xmldsig11.xsd' Guid='{A0E6F269-77F0-47E6-B59A-887977ECE06A}'>
+                  <File KeyPath='yes' Name='xmldsig11-schema.xsd' />
+                </Component>
+                <Component Id='soap_envelope.xsd' Guid='{A2B2255D-344E-44E9-B894-5AB3416D8CBC}'>
+                  <File KeyPath='yes' Name='soap-envelope.xsd' />
+                </Component>
+                <Component Id='xml.xsd' Guid='{E58D7865-6B4D-4CDB-859F-0A69AD1E20BF}'>
+                  <File KeyPath='yes' Name='xml.xsd' />
+                </Component>
+                <Component Id='xmltooling.xsd' Guid='{E99A5CCE-C0A9-483C-BB02-A147E0C1A609}'>
+                  <File KeyPath='yes' Name='xmltooling.xsd' />
+                </Component>
+                <Component Id='catalog.xml' Guid='{CD84FD26-CCB0-4FC6-9B51-E72CC23046D8}'>
+                  <File KeyPath='yes' Name='catalog.xml' Source='$(var.SPBuildDirectory)\cpp-xmltooling\schemas\catalog.xml.in' />
+                </Component>
+              </Directory><!-- xmltooling -->
+            </Directory><!-- xml -->
+          </Directory><!-- SP -->
+        </Directory><!-- Shibboleth -->
+      </Directory><!-- CommonAppDataFolder -->
+    </Directory><!-- TargetDir -->
+    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />
+    <CustomAction Id='EditXMLToolingCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
+      Execute='deferred' Impersonate='no' />
+    <CustomAction Id='EditCatalogSAML10' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
+      Execute='deferred' Impersonate='no' />
+    <CustomAction Id='EditCatalogSAML11' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
+      Execute='deferred' Impersonate='no' />
+    <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall=''
+      Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog'
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\xmltooling\;@;[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\catalog.xml' />
+    <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10'
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml10-catalog.xml' />
+    <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11'
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml11-catalog.xml' />
+    <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20'
+      Value='%PROGRAMDATA%\Shibboleth\SP\xml\opensaml\;@;[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\saml20-catalog.xml' />
+    <InstallExecuteSequence>
+      <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='SetEditCatalogSAML11' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='SetEditCatalogSAML20' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='EditXMLToolingCatalog' After='InstallFiles'>NOT Installed</Custom>
+      <Custom Action='EditCatalogSAML10' After='InstallFiles'>NOT Installed</Custom>
+      <Custom Action='EditCatalogSAML11' After='InstallFiles'>NOT Installed</Custom>
+      <Custom Action='EditCatalogSAML20' After='InstallFiles'>NOT Installed</Custom>
+    </InstallExecuteSequence>
+
+  </Module>
+</Wix>
index 6da5f11..ef05cd0 100644 (file)
@@ -1,79 +1,79 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define XMLToolingComponent64='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' ?>\r
-<?define XMLToolingComponent64d='{C380627F-9D45-4626-A249-3831FC7C83FC}' ?>\r
-<?define XMLToolingLiteComponent64='{060F61B9-36E9-4F33-9B5B-C59A43709052}' ?> \r
-<?define XMLToolingLiteComponent64d='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' ?>\r
-<?define SamlComponent64='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' ?>\r
-<?define SamlComponent64d='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
-    <Package Id='{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}' Description='Merge Module for OpenSAML (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes XMLTooling library.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Release\'>\r
-              <Component Id='saml.dll' Guid='$(var.SamlComponent64)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='samlsign.exe' Guid='{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />\r
-              </Component>\r
-              <Component Id='xmltooling.dll' Guid='$(var.XMLToolingComponent64)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='xmltooling_lite.dll' Guid='$(var.XMLToolingLiteComponent64)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Debug\'>\r
-                <Component Id='samlD.dll' Guid='$(var.SamlComponent64d)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='samlsign.exe_debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
-                </Component>\r
-                <Component Id='xmltoolingD.dll' Guid='$(var.XMLToolingComponent64d)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='xmltooling_liteD.dll' Guid='$(var.XMLToolingLiteComponent64d)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
-                </Component>\r
-              </Directory><!-- lib_debug -->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='doc' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>\r
-                <File KeyPath='yes' Name='OPENSAML.LICENSE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\LICENSE.txt' />\r
-                <File Name='OPENSAML.NOTICE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt' />\r
-                <File Name='OPENSAML.README' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!--shibboleth_SP-->\r
-        </Directory><!--shibboleth-->\r
-      </Directory><!--ProgramFiles64Folder-->\r
-    </Directory>\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define XMLToolingComponent64='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' ?>
+<?define XMLToolingComponent64d='{C380627F-9D45-4626-A249-3831FC7C83FC}' ?>
+<?define XMLToolingLiteComponent64='{060F61B9-36E9-4F33-9B5B-C59A43709052}' ?> 
+<?define XMLToolingLiteComponent64d='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' ?>
+<?define SamlComponent64='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' ?>
+<?define SamlComponent64d='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>
+    <Package Id='{C4A8AAF1-D263-4361-9695-CE0F56B5D3C6}' Description='Merge Module for OpenSAML (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes XMLTooling library.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Release\'>
+              <Component Id='saml.dll' Guid='$(var.SamlComponent64)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />
+              </Component>
+              <Component Id='samlsign.exe' Guid='{B89B1F75-9B8A-4A15-B141-4DC3F132CD47}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />
+              </Component>
+              <Component Id='xmltooling.dll' Guid='$(var.XMLToolingComponent64)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Component Id='xmltooling_lite.dll' Guid='$(var.XMLToolingLiteComponent64)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\x64\Debug\'>
+                <Component Id='samlD.dll' Guid='$(var.SamlComponent64d)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
+                </Component>
+                <Component Id='samlsign.exe_debug' Guid='{A6588914-93E1-4FAF-B237-39C0240EECB1}' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />
+                </Component>
+                <Component Id='xmltoolingD.dll' Guid='$(var.XMLToolingComponent64d)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+                <Component Id='xmltooling_liteD.dll' Guid='$(var.XMLToolingLiteComponent64d)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+              </Directory><!-- lib_debug -->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='doc' Guid='{F858AC39-4C24-4255-A86E-4747FE45624E}' Win64='yes'>
+                <File KeyPath='yes' Name='OPENSAML.LICENSE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\LICENSE.txt' />
+                <File Name='OPENSAML.NOTICE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt' />
+                <File Name='OPENSAML.README' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!--shibboleth_SP-->
+        </Directory><!--shibboleth-->
+      </Directory><!--ProgramFiles64Folder-->
+    </Directory>
+  </Module>
+</Wix>
index ccd44c6..5e0378f 100644 (file)
@@ -1,79 +1,79 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define SamlComponent32='{B52F8C71-2042-4CDF-A250-BD773985A2AB}' ?>\r
-<?define XMLToolingComponent32='{53533A59-A563-439D-B13D-A4D7090C42D3}' ?>\r
-<?define XMLToolingLiteComponent32='{5045A722-D6D6-4E55-9196-CB7C50B4446F}' ?>\r
-<?define SamlComponent32d='{7B934257-5F7F-428E-930E-A793A11573D7}' ?>\r
-<?define XMLToolingComponent32d='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}' ?>\r
-<?define XMLToolingLiteComponent32d='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='OpenSAMLMergeModule_x86' Language='1033' Version='$(var.OpenSAMLVersion)'>\r
-    <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML (x86)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes XMLTooling library.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Release\'>\r
-              <Component Id='saml.dll' Guid='$(var.SamlComponent32)'>\r
-                <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>\r
-                <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />\r
-              </Component>\r
-              <Component Id='xmltooling.dll' Guid='$(var.XMLToolingComponent32)'>\r
-                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='xmltooling_lite.dll' Guid='$(var.XMLToolingLiteComponent32)'>\r
-                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Debug\'>\r
-                <Component Id='samlD.dll' Guid='$(var.SamlComponent32d)'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='samlsign.exe_debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>\r
-                  <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
-                </Component>\r
-                <Component Id='xmltoolingD.dll' Guid='$(var.XMLToolingComponent32d)'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='xmltooling_liteD.dll' Guid='$(var.XMLToolingLiteComponent32d)'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
-                </Component>\r
-              </Directory><!-- lib_debug -->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='doc' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>\r
-                <File KeyPath='yes' Name='OPENSAML.LICENSE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\LICENSE.txt' />\r
-                <File Name='OPENSAML.NOTICE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt' />\r
-                <File Name='OPENSAML.README' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_SP -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define SamlComponent32='{B52F8C71-2042-4CDF-A250-BD773985A2AB}' ?>
+<?define XMLToolingComponent32='{53533A59-A563-439D-B13D-A4D7090C42D3}' ?>
+<?define XMLToolingLiteComponent32='{5045A722-D6D6-4E55-9196-CB7C50B4446F}' ?>
+<?define SamlComponent32d='{7B934257-5F7F-428E-930E-A793A11573D7}' ?>
+<?define XMLToolingComponent32d='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}' ?>
+<?define XMLToolingLiteComponent32d='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='OpenSAMLMergeModule_x86' Language='1033' Version='$(var.OpenSAMLVersion)'>
+    <Package Id='{D6367F80-6B31-4554-ABE4-53404DD46F35}' Description='Merge Module for OpenSAML (x86)'
+             Comments='This module is built by the Shibboleth Consortium. Includes XMLTooling library.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Release\'>
+              <Component Id='saml.dll' Guid='$(var.SamlComponent32)'>
+                <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />
+              </Component>
+              <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>
+                <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />
+              </Component>
+              <Component Id='xmltooling.dll' Guid='$(var.XMLToolingComponent32)'>
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Component Id='xmltooling_lite.dll' Guid='$(var.XMLToolingLiteComponent32)'>
+                <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Debug\'>
+                <Component Id='samlD.dll' Guid='$(var.SamlComponent32d)'>
+                  <File KeyPath='yes' Checksum='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />
+                </Component>
+                <Component Id='samlsign.exe_debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>
+                  <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />
+                </Component>
+                <Component Id='xmltoolingD.dll' Guid='$(var.XMLToolingComponent32d)'>
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+                <Component Id='xmltooling_liteD.dll' Guid='$(var.XMLToolingLiteComponent32d)'>
+                  <File KeyPath='yes' Checksum='yes'
+                    Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />
+                </Component>
+              </Directory><!-- lib_debug -->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='doc' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>
+                <File KeyPath='yes' Name='OPENSAML.LICENSE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\LICENSE.txt' />
+                <File Name='OPENSAML.NOTICE' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\NOTICE.txt' />
+                <File Name='OPENSAML.README' Source='$(var.SPBuildDirectory)\cpp-opensaml\doc\README.txt' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
index a7fb823..5f0da85 100644 (file)
@@ -1,66 +1,66 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define LibEay64Component='{DCB83813-11B4-469D-BD26-5DBF9815AC36}' ?>\r
-<?define SSlEay64Component='{EAC28C6F-C98E-454F-BFE7-076D7C0A5CF1}' ?>\r
-<?define LibEay64Componentd='{D6E409C6-2F1C-42BA-8759-CF898C62C9A9}' ?>\r
-<?define SSlEay64Componentd='{8FBB6D41-0044-4969-AA27-813EF2606C7A}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='OpenSSLMergeModule_x64' Language='1033' Version='$(var.OpenSSLVersion)'>\r
-    <Package Id='{EEB21422-347C-4AFA-A347-DCA0E5D61572}' Description='Merge Module for OpenSSL (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' >\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >\r
-              <Component Id='libeay32.dll' Guid='$(var.LibEay64Component)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='ssleay32.dll' Guid='$(var.SSlEay64Component)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>\r
-                <Component Id='libeay32D.dll' Guid='$(var.LibEay64Componentd)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='ssleay32D.dll' Guid='$(var.SSlEay64Componentd)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>\r
-                  <File Id='openssl.exe_debug' KeyPath='yes' Checksum='yes' Name='openssl.exe' />\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='OPENSSL.LICENSE' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='yes'>\r
-                <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\LICENSE' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_sp -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory>\r
-  </Module>\r
-</Wix>    \r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define LibEay64Component='{DCB83813-11B4-469D-BD26-5DBF9815AC36}' ?>
+<?define SSlEay64Component='{EAC28C6F-C98E-454F-BFE7-076D7C0A5CF1}' ?>
+<?define LibEay64Componentd='{D6E409C6-2F1C-42BA-8759-CF898C62C9A9}' ?>
+<?define SSlEay64Componentd='{8FBB6D41-0044-4969-AA27-813EF2606C7A}' ?>
+
+<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)'
+             Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' >
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll\' >
+              <Component Id='libeay32.dll' Guid='$(var.LibEay64Component)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='ssleay32.dll' Guid='$(var.SSlEay64Component)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='openssl.exe' Guid='{AF6DBF01-02E0-4CA4-9466-2E95EAC1200E}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'>
+                <Component Id='libeay32D.dll' Guid='$(var.LibEay64Componentd)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='ssleay32D.dll' Guid='$(var.SSlEay64Componentd)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='openssl.exe_debug' Guid='{3555958C-C30D-4829-BC17-936D2EEC3EA4}' Win64='yes'>
+                  <File Id='openssl.exe_debug' KeyPath='yes' Checksum='yes' Name='openssl.exe' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='OPENSSL.LICENSE' Guid='{10B77A21-E554-47F2-99F0-7171304FE899}' Win64='yes'>
+                <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory>
+  </Module>
+</Wix>    
index b9ffaf4..0d3a847 100644 (file)
@@ -1,66 +1,66 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define LibEay32Component='{1DE4C235-0F1E-41EF-B7B8-9F3FD03A8F26}' ?>\r
-<?define SSlEay32Component='{9D0D75C3-69B6-4A29-9890-EF3DD939B6CA}' ?>\r
-<?define LibEay32Componentd='{53BCB6F4-77DC-4B6C-9798-EC10796D3C59}' ?>\r
-<?define SSlEay32Componentd='{A9583DF6-F075-4F43-991C-3611B31036DF}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>\r
-    <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL (x86)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\'>\r
-              <Component Id='libeay32.dll' Guid='$(var.LibEay32Component)'>\r
-                <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='ssleay32.dll' Guid='$(var.SSlEay32Component)'>\r
-                <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>\r
-                <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\' >\r
-                <Component Id='libeay32D.dll' Guid='$(var.LibEay32Componentd)'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='ssleay32D.dll' Guid='$(var.SSlEay32Componentd)'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>\r
-                  <File Id='openssl.exe_debug' KeyPath='yes' Checksum='yes' Name='openssl.exe' />\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>\r
-                <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\LICENSE' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_sp -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>    \r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define LibEay32Component='{1DE4C235-0F1E-41EF-B7B8-9F3FD03A8F26}' ?>
+<?define SSlEay32Component='{9D0D75C3-69B6-4A29-9890-EF3DD939B6CA}' ?>
+<?define LibEay32Componentd='{53BCB6F4-77DC-4B6C-9798-EC10796D3C59}' ?>
+<?define SSlEay32Componentd='{A9583DF6-F075-4F43-991C-3611B31036DF}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='OpenSSLMergeModule_x86' Language='1033' Version='$(var.OpenSSLVersion)'>
+    <Package Id='11FD68EE-607E-4755-98AA-1C7EE5E03652' Description='Merge Module for OpenSSL (x86)'
+             Comments='This module is built by the Shibboleth Consortium. Includes libeay32 and ssleay32.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\'>
+              <Component Id='libeay32.dll' Guid='$(var.LibEay32Component)'>
+                <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='ssleay32.dll' Guid='$(var.SSlEay32Component)'>
+                <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />
+              </Component>
+              <Component Id='openssl.exe' Guid='{886F0254-AD10-45C6-A723-37C7FA466651}'>
+                <File KeyPath='yes' Checksum='yes' Name='openssl.exe' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll.dbg\' >
+                <Component Id='libeay32D.dll' Guid='$(var.LibEay32Componentd)'>
+                  <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='ssleay32D.dll' Guid='$(var.SSlEay32Componentd)'>
+                  <File KeyPath='yes' Checksum='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />
+                </Component>
+                <Component Id='openssl.exe_debug' Guid='{D47E4692-F648-4800-BE4A-9D84DAD5DEEA}'>
+                  <File Id='openssl.exe_debug' KeyPath='yes' Checksum='yes' Name='openssl.exe' />
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='OPENSSL.LICENSE' Guid='{CEC1CC66-6D48-475A-8C99-B687B0B901AA}'>
+                <File KeyPath='yes' Name='OPENSSL.LICENSE' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>    
index 57132ad..65a90e4 100644 (file)
@@ -1,82 +1,82 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-     Development, Inc. (UCAID) under one or more contributor license\r
-     agreements.  See the NOTICE file distributed with this work for\r
-     additional information regarding copyright ownership. The UCAID\r
-     licenses this file to You under the Apache License, Version 2.0\r
-     (the "License"); you may not use this file except in compliance\r
-     with the License.  You may obtain a copy of the License at\r
-     \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
-     \r
-     Unless required by applicable law or agreed to in writing, software\r
-     distributed under the License is distributed on an "AS IS" BASIS,\r
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-     implied.  See the License for the specific language governing\r
-     permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='ShibbolethSPSchemasMergeModule' Language='1033' Version='$(var.ShibbolethDllVersion)'>\r
-    <Package Id='{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}' Description='Merge Module for Shibboleth SP schemas'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >\r
-        <Directory Id='Shibboleth' Name='Shibboleth' >\r
-          <Directory Id='SP' Name='SP' >\r
-            <Directory Id='xml' Name='xml' >\r
-              <Directory Id='xml_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\schemas' >\r
-                <Component Id='catalog.xml' Guid='{C6EA59A2-0A86-4F5F-B5F8-E37A2310A793}'>\r
-                  <File KeyPath='yes' Name='catalog.xml' Source='$(var.SPBuildDirectory)\cpp-sp\schemas\catalog.xml.in' />\r
-                </Component>\r
-                <Component Id='shibboleth.xsd' Guid='{18F3DD83-0C0A-480E-8C87-043C9296DFE5}'>\r
-                  <File KeyPath='yes' Name='shibboleth.xsd' />\r
-                </Component>\r
-                <Component Id='metadata_1.0.xsd' Guid='{E2740531-4A6C-43C8-9E1A-9F7CA87862B7}'>\r
-                  <File KeyPath='yes' Id='metadata_1.0.xsd' Name='shibboleth-metadata-1.0.xsd' />\r
-                </Component>\r
-                <Component Id='attribute_map.xsd' Guid='{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}'>\r
-                  <File KeyPath='yes' Id='attribute_map.xsd' Name='shibboleth-2.0-attribute-map.xsd' />\r
-                </Component>\r
-                <Component Id='afp.xsd' Guid='{9672ADDF-8053-41C3-A58A-C8B99C710336}'>\r
-                  <File KeyPath='yes' Id='afp.xsd' Name='shibboleth-2.0-afp.xsd' />\r
-                </Component>\r
-                <Component Id='afp_mf_basic.xsd' Guid='{D1C32485-D3DF-414C-B2FF-721F169CAC05}'>\r
-                  <File KeyPath='yes' Id='afp_mf_basic.xsd' Name='shibboleth-2.0-afp-mf-basic.xsd' />\r
-                </Component>\r
-                <Component Id='afp_mf_saml.xsd' Guid='{40B8AEF3-0A31-4204-95E7-F8079CB55979}'>\r
-                  <File KeyPath='yes' Id='afp_mf_saml.xsd' Name='shibboleth-2.0-afp-mf-saml.xsd' />\r
-                </Component>\r
-                <Component Id='WSTrust.xsd' Guid='{91EA82B5-A19C-40C0-8D1C-40FA020A484E}'>\r
-                  <File KeyPath='yes' Name='WS-Trust.xsd' />\r
-                </Component>\r
-                <Component Id='sp_notify.xsd' Guid='{65EBC9F1-C958-4B17-9554-7F86186A15C1}'>\r
-                  <File KeyPath='yes' Id='sp_notify.xsd' Name='shibboleth-2.0-sp-notify.xsd' />\r
-                </Component>\r
-                <Component Id='native_sp_config.xsd' Guid='{5514B435-94AB-4A92-9737-0BEB78C146C8}'>\r
-                  <File KeyPath='yes' Id='native_sp_config.xsd' Name='shibboleth-2.0-native-sp-config.xsd' />\r
-                </Component>\r
-                <Component Id='native_sp_protocols.xsd' Guid='{AE42FFFB-1A59-4F1D-9935-15D727B99929}'>\r
-                  <File KeyPath='yes' Id='native_sp_protocols.xsd' Name='shibboleth-2.0-native-sp-protocols.xsd' />\r
-                </Component>\r
-              </Directory><!--xml_shibboleth-->\r
-            </Directory><!--xml-->\r
-          </Directory><!--SP-->\r
-        </Directory><!--Shibboleth-->\r
-      </Directory><!--CommonAppDataFolder-->\r
-    </Directory><!--TargetDir-->\r
-    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />\r
-    <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
-                  Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' \r
-                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\catalog.xml' />\r
-    <InstallExecuteSequence>\r
-      <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>\r
-    </InstallExecuteSequence>\r
-\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the "License"); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ShibbolethSPSchemasMergeModule' Language='1033' Version='$(var.ShibbolethDllVersion)'>
+    <Package Id='{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}' Description='Merge Module for Shibboleth SP schemas'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='CommonAppDataFolder' Name='CommonFiles' >
+        <Directory Id='Shibboleth' Name='Shibboleth' >
+          <Directory Id='SP' Name='SP' >
+            <Directory Id='xml' Name='xml' >
+              <Directory Id='xml_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\schemas' >
+                <Component Id='catalog.xml' Guid='{C6EA59A2-0A86-4F5F-B5F8-E37A2310A793}'>
+                  <File KeyPath='yes' Name='catalog.xml' Source='$(var.SPBuildDirectory)\cpp-sp\schemas\catalog.xml.in' />
+                </Component>
+                <Component Id='shibboleth.xsd' Guid='{18F3DD83-0C0A-480E-8C87-043C9296DFE5}'>
+                  <File KeyPath='yes' Name='shibboleth.xsd' />
+                </Component>
+                <Component Id='metadata_1.0.xsd' Guid='{E2740531-4A6C-43C8-9E1A-9F7CA87862B7}'>
+                  <File KeyPath='yes' Id='metadata_1.0.xsd' Name='shibboleth-metadata-1.0.xsd' />
+                </Component>
+                <Component Id='attribute_map.xsd' Guid='{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}'>
+                  <File KeyPath='yes' Id='attribute_map.xsd' Name='shibboleth-2.0-attribute-map.xsd' />
+                </Component>
+                <Component Id='afp.xsd' Guid='{9672ADDF-8053-41C3-A58A-C8B99C710336}'>
+                  <File KeyPath='yes' Id='afp.xsd' Name='shibboleth-2.0-afp.xsd' />
+                </Component>
+                <Component Id='afp_mf_basic.xsd' Guid='{D1C32485-D3DF-414C-B2FF-721F169CAC05}'>
+                  <File KeyPath='yes' Id='afp_mf_basic.xsd' Name='shibboleth-2.0-afp-mf-basic.xsd' />
+                </Component>
+                <Component Id='afp_mf_saml.xsd' Guid='{40B8AEF3-0A31-4204-95E7-F8079CB55979}'>
+                  <File KeyPath='yes' Id='afp_mf_saml.xsd' Name='shibboleth-2.0-afp-mf-saml.xsd' />
+                </Component>
+                <Component Id='WSTrust.xsd' Guid='{91EA82B5-A19C-40C0-8D1C-40FA020A484E}'>
+                  <File KeyPath='yes' Name='WS-Trust.xsd' />
+                </Component>
+                <Component Id='sp_notify.xsd' Guid='{65EBC9F1-C958-4B17-9554-7F86186A15C1}'>
+                  <File KeyPath='yes' Id='sp_notify.xsd' Name='shibboleth-2.0-sp-notify.xsd' />
+                </Component>
+                <Component Id='native_sp_config.xsd' Guid='{5514B435-94AB-4A92-9737-0BEB78C146C8}'>
+                  <File KeyPath='yes' Id='native_sp_config.xsd' Name='shibboleth-2.0-native-sp-config.xsd' />
+                </Component>
+                <Component Id='native_sp_protocols.xsd' Guid='{AE42FFFB-1A59-4F1D-9935-15D727B99929}'>
+                  <File KeyPath='yes' Id='native_sp_protocols.xsd' Name='shibboleth-2.0-native-sp-protocols.xsd' />
+                </Component>
+              </Directory><!--xml_shibboleth-->
+            </Directory><!--xml-->
+          </Directory><!--SP-->
+        </Directory><!--Shibboleth-->
+      </Directory><!--CommonAppDataFolder-->
+    </Directory><!--TargetDir-->
+    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />
+    <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' 
+                  Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' 
+                  Value='%PROGRAMDATA%\Shibboleth\SP\xml\shibboleth\;@;[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\catalog.xml' />
+    <InstallExecuteSequence>
+      <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>
+    </InstallExecuteSequence>
+
+  </Module>
+</Wix>
index 3c78729..8b33a15 100644 (file)
@@ -1,63 +1,63 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define ShibDll64Component='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' ?>\r
-<?define ShibDllLite64Component='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' ?>\r
-<?define ShibDll64Componentd='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' ?>\r
-<?define ShibDllLite64Componentd='{5EF6FF17-0510-484B-9F24-523B29EB416C}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethDllVersion)'>\r
-    <Package Id='{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}' Description='Merge Module for Shibboleth SP DLLs (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release'>\r
-              <Component Id='shibsp.dll' Guid='$(var.ShibDll64Component)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='shibsp_lite.dll' Guid='$(var.ShibDllLite64Component)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >\r
-                <Component Id='shibspD.dll' Guid='$(var.ShibDll64Componentd)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='shibsp_liteD.dll' Guid='$(var.ShibDllLite64Componentd)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />\r
-                </Component>\r
-              </Directory><!-- lib_debug -->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='doc' Guid='{1ACB430F-7846-4565-93FE-3BE1BC1235C1}' Win64='yes'>\r
-                <File KeyPath='yes' Name='SHIBBOLETH.LICENSE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\LICENSE.txt' />\r
-                <File Name='SHIBBOLETH.NOTICE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\NOTICE.txt' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_sp -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFiles64Folder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
-\r
-    \r
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define ShibDll64Component='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' ?>
+<?define ShibDllLite64Component='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' ?>
+<?define ShibDll64Componentd='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' ?>
+<?define ShibDllLite64Componentd='{5EF6FF17-0510-484B-9F24-523B29EB416C}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethDllVersion)'>
+    <Package Id='{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}' Description='Merge Module for Shibboleth SP DLLs (x64)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release'>
+              <Component Id='shibsp.dll' Guid='$(var.ShibDll64Component)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />
+              </Component>
+              <Component Id='shibsp_lite.dll' Guid='$(var.ShibDllLite64Component)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >
+                <Component Id='shibspD.dll' Guid='$(var.ShibDll64Componentd)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />
+                </Component>
+                <Component Id='shibsp_liteD.dll' Guid='$(var.ShibDllLite64Componentd)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />
+                </Component>
+              </Directory><!-- lib_debug -->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='doc' Guid='{1ACB430F-7846-4565-93FE-3BE1BC1235C1}' Win64='yes'>
+                <File KeyPath='yes' Name='SHIBBOLETH.LICENSE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\LICENSE.txt' />
+                <File Name='SHIBBOLETH.NOTICE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\NOTICE.txt' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFiles64Folder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
+
+    
index 1f08fd2..146a838 100644 (file)
@@ -1,61 +1,61 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define ShibDll32Component='{9DE384BF-C286-4A72-AED9-AA34384005C0}' ?>\r
-<?define ShibDllLite32Component='{10475E33-434D-4805-B983-195092549BED}' ?>\r
-<?define ShibDll32Componentd='{4196D799-1162-4D62-9F7A-1F59E90F19F1}' ?>\r
-<?define ShibDllLite32Componentd='{8E070220-2992-4D45-BF98-459022CD268F}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethDllVersion)'>\r
-    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth SP DLLs (x86)'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release'>\r
-              <Component Id='shibsp.dll' Guid='$(var.ShibDll32Component)'>\r
-                <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='shibsp_lite.dll' Guid='$(var.ShibDllLite32Component)'>\r
-                <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >\r
-                <Component Id='shibspD.dll' Guid='$(var.ShibDll32Componentd)'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='shibsp_liteD.dll' Guid='$(var.ShibDllLite32Componentd)'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />\r
-                </Component>\r
-              </Directory><!-- lib_debug -->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='doc' Guid='{6FB48AD9-2D14-46F5-A826-2DB2E604B5BB}'>\r
-                <File KeyPath='yes' Name='SHIBBOLETH.LICENSE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\LICENSE.txt' />\r
-                <File Name='SHIBBOLETH.NOTICE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\NOTICE.txt' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_sp -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define ShibDll32Component='{9DE384BF-C286-4A72-AED9-AA34384005C0}' ?>
+<?define ShibDllLite32Component='{10475E33-434D-4805-B983-195092549BED}' ?>
+<?define ShibDll32Componentd='{4196D799-1162-4D62-9F7A-1F59E90F19F1}' ?>
+<?define ShibDllLite32Componentd='{8E070220-2992-4D45-BF98-459022CD268F}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethDllVersion)'>
+    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth SP DLLs (x86)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release'>
+              <Component Id='shibsp.dll' Guid='$(var.ShibDll32Component)'>
+                <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />
+              </Component>
+              <Component Id='shibsp_lite.dll' Guid='$(var.ShibDllLite32Component)'>
+                <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />
+              </Component>
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >
+                <Component Id='shibspD.dll' Guid='$(var.ShibDll32Componentd)'>
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />
+                </Component>
+                <Component Id='shibsp_liteD.dll' Guid='$(var.ShibDllLite32Componentd)'>
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />
+                </Component>
+              </Directory><!-- lib_debug -->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='doc' Guid='{6FB48AD9-2D14-46F5-A826-2DB2E604B5BB}'>
+                <File KeyPath='yes' Name='SHIBBOLETH.LICENSE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\LICENSE.txt' />
+                <File Name='SHIBBOLETH.NOTICE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\NOTICE.txt' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
index b3c156f..9218daf 100644 (file)
@@ -1,55 +1,55 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define Xerces64Component='{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}' ?>\r
-<?define Xerces64Componentd='{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>\r
-    <Package Id='{72CA15B1-CEB8-4C9B-A5CB-5254759E4B3A}' Description='Merge Module for Xerces (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib'>\r
-              <Component Id='xercesc.dll' Guid='$(var.Xerces64Component)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes'\r
-                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
-                <Component Id='xercescD.dll' Guid='$(var.Xerces64Componentd)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='XERCES.LICENSE' Guid='{12731F0B-681B-4154-9B02-BEB219954D44}' Win64='yes'>\r
-                <File KeyPath='yes' Name='XERCES.LICENSE'\r
-                    Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\LICENSE' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_SP -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define Xerces64Component='{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}' ?>
+<?define Xerces64Componentd='{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>
+    <Package Id='{72CA15B1-CEB8-4C9B-A5CB-5254759E4B3A}' Description='Merge Module for Xerces (x64)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='xercesc.dll' Guid='$(var.Xerces64Component)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='xercescD.dll' Guid='$(var.Xerces64Componentd)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='XERCES.LICENSE' Guid='{12731F0B-681B-4154-9B02-BEB219954D44}' Win64='yes'>
+                <File KeyPath='yes' Name='XERCES.LICENSE'
+                    Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
index 915132e..65cec84 100644 (file)
@@ -1,55 +1,55 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define Xerces32Component='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}' ?>\r
-<?define Xerces32Componentd='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>\r
-    <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces (x86)'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib'>\r
-              <Component Id='xercesc.dll' Guid='$(var.Xerces32Component)'>\r
-                <File KeyPath='yes' Checksum='yes'\r
-                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
-                <Component Id='xercescD.dll' Guid='$(var.Xerces32Componentd)'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='XERCES.LICENSE' Guid='{7AAB5CC3-CCB4-4567-A16D-584CAE7E95EB}'>\r
-                <File KeyPath='yes' Name='XERCES.LICENSE'\r
-                  Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\LICENSE' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_SP -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define Xerces32Component='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}' ?>
+<?define Xerces32Componentd='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XercesMergeModule_x86' Language='1033' Version='$(var.XercesVersion)'>
+    <Package Id='{5A32778E-B904-4828-90CD-A317B4F6DF7D}' Description='Merge Module for Xerces (x86)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='xercesc.dll' Guid='$(var.Xerces32Component)'>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='xercescD.dll' Guid='$(var.Xerces32Componentd)'>
+                  <File KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion)D.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='XERCES.LICENSE' Guid='{7AAB5CC3-CCB4-4567-A16D-584CAE7E95EB}'>
+                <File KeyPath='yes' Name='XERCES.LICENSE'
+                  Source='$(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86-windows-vc-10.0\LICENSE' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_SP -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
index b959022..3ec704f 100644 (file)
@@ -1,91 +1,91 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-     Development, Inc. (UCAID) under one or more contributor license\r
-     agreements.  See the NOTICE file distributed with this work for\r
-     additional information regarding copyright ownership. The UCAID\r
-     licenses this file to You under the Apache License, Version 2.0\r
-     (the "License"); you may not use this file except in compliance\r
-     with the License.  You may obtain a copy of the License at\r
-     \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
-     \r
-     Unless required by applicable law or agreed to in writing, software\r
-     distributed under the License is distributed on an "AS IS" BASIS,\r
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-     implied.  See the License for the specific language governing\r
-     permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define XmlSec64Component='{DF5FEFC9-9B95-42B1-A6BD-053E0D0BD8E8}' ?>\r
-<?define XmlSec64Componentd='{D97E1B5C-B020-4621-94CE-F10FCFF765C5}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='XmlSecmergemodule_x64' Language='1033' Version='$(var.XmlSecVersion)'>\r
-    <Package Id='{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}' Description='Merge Module for Santuario (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes several executable utilities.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib' \r
-                       FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>\r
-              <Component Id='xsec.dll' Guid='$(var.XmlSec64Component)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
-              </Component>\r
-              <Component Id='c14n.exe' Guid='{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>\r
-              </Component>\r
-              <Component Id='checksig.exe' Guid='{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>\r
-              </Component>\r
-              <Component Id='cipher.exe' Guid='{192AEEF7-3AE2-4570-AA30-1A2046646A84}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>\r
-              </Component>\r
-              <Component Id='siginf.exe' Guid='{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>\r
-              </Component>\r
-              <Component Id='templatesign.exe' Guid='{71B603E6-A54B-4843-A4F8-826AD4CA6A04}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>\r
-              </Component>\r
-              <Component Id='txfmout.exe' Guid='{2D9025EE-D95F-4D3C-B0E7-86D742749D39}' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' \r
-                         FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Debug No Xalan'>\r
-                <Component Id='xsecD.dll' Guid='$(var.XmlSec64Componentd)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
-                </Component>\r
-                <Component Id='c14n.exe_debug' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>\r
-                  <File Id='c14n.exe_debug' KeyPath='yes' Checksum='yes' Name='c14n.exe'/>\r
-                </Component>\r
-                <Component Id='checksig.exe_debug' Guid='{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}' Win64='yes'>\r
-                  <File Id='checksig.exe_debug' KeyPath='yes' Checksum='yes' Name='checksig.exe'/>\r
-                </Component>\r
-                <Component Id='cipher.exe_debug' Guid='{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}' Win64='yes'>\r
-                  <File Id='cipher.exe_debug' KeyPath='yes' Checksum='yes' Name='cipher.exe'/>\r
-                </Component>\r
-                <Component Id='siginf.exe_debug' Guid='{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}' Win64='yes'>\r
-                  <File Id='siginf.exe_debug' KeyPath='yes' Checksum='yes' Name='siginf.exe'/>\r
-                </Component>\r
-                <Component Id='templatesign.exe_debug' Guid='{5AE22CDB-625E-4DC7-9586-77C3DD835100}' Win64='yes'>\r
-                  <File Id='templatesign.exe_debug' KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>\r
-                </Component>\r
-                <Component Id='txfmout.exe_debug' Guid='{373B4E3D-6643-4884-8D0C-324DEF910230}' Win64='yes'>\r
-                  <File Id='txfmout.exe_debug' KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='SANTUARIO.LICENSE' Guid='{07288B10-ED5A-443F-BC90-CFD987C798C4}' Win64='yes'>\r
-                <File KeyPath='yes' Name='SANTUARIO.LICENSE'\r
-                  Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE.txt' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_sp -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix> \r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the "License"); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define XmlSec64Component='{DF5FEFC9-9B95-42B1-A6BD-053E0D0BD8E8}' ?>
+<?define XmlSec64Componentd='{D97E1B5C-B020-4621-94CE-F10FCFF765C5}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XmlSecmergemodule_x64' Language='1033' Version='$(var.XmlSecVersion)'>
+    <Package Id='{B94AFB16-A52E-4C88-9011-FF0C897ABDE1}' Description='Merge Module for Santuario (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes several executable utilities.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib' 
+                       FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan'>
+              <Component Id='xsec.dll' Guid='$(var.XmlSec64Component)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
+              </Component>
+              <Component Id='c14n.exe' Guid='{DE820D93-BC4F-48B5-9C1F-3CD34E34D10C}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
+              </Component>
+              <Component Id='checksig.exe' Guid='{D2145F4D-95FA-4A24-B06C-D37AF36ADDD2}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
+              </Component>
+              <Component Id='cipher.exe' Guid='{192AEEF7-3AE2-4570-AA30-1A2046646A84}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
+              </Component>
+              <Component Id='siginf.exe' Guid='{7C15D545-DDB9-4D02-AE9C-4C9E0229FC72}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
+              </Component>
+              <Component Id='templatesign.exe' Guid='{71B603E6-A54B-4843-A4F8-826AD4CA6A04}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
+              </Component>
+              <Component Id='txfmout.exe' Guid='{2D9025EE-D95F-4D3C-B0E7-86D742749D39}' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug' 
+                         FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Debug No Xalan'>
+                <Component Id='xsecD.dll' Guid='$(var.XmlSec64Componentd)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
+                </Component>
+                <Component Id='c14n.exe_debug' Guid='{ED9BB341-C5D2-4234-B720-483D86D340F9}' Win64='yes'>
+                  <File Id='c14n.exe_debug' KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
+                </Component>
+                <Component Id='checksig.exe_debug' Guid='{F6618EE1-A5BD-4EC5-9257-E62015DC3BC4}' Win64='yes'>
+                  <File Id='checksig.exe_debug' KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
+                </Component>
+                <Component Id='cipher.exe_debug' Guid='{EAB5FF33-9EBD-4C55-8D64-F975E5B11785}' Win64='yes'>
+                  <File Id='cipher.exe_debug' KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
+                </Component>
+                <Component Id='siginf.exe_debug' Guid='{1EA9ABB6-2B33-4E4C-9210-B89FCC493E78}' Win64='yes'>
+                  <File Id='siginf.exe_debug' KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
+                </Component>
+                <Component Id='templatesign.exe_debug' Guid='{5AE22CDB-625E-4DC7-9586-77C3DD835100}' Win64='yes'>
+                  <File Id='templatesign.exe_debug' KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
+                </Component>
+                <Component Id='txfmout.exe_debug' Guid='{373B4E3D-6643-4884-8D0C-324DEF910230}' Win64='yes'>
+                  <File Id='txfmout.exe_debug' KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='SANTUARIO.LICENSE' Guid='{07288B10-ED5A-443F-BC90-CFD987C798C4}' Win64='yes'>
+                <File KeyPath='yes' Name='SANTUARIO.LICENSE'
+                  Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE.txt' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix> 
index f4d1dc1..66eee9f 100644 (file)
@@ -1,91 +1,91 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-     Development, Inc. (UCAID) under one or more contributor license\r
-     agreements.  See the NOTICE file distributed with this work for\r
-     additional information regarding copyright ownership. The UCAID\r
-     licenses this file to You under the Apache License, Version 2.0\r
-     (the "License"); you may not use this file except in compliance\r
-     with the License.  You may obtain a copy of the License at\r
-     \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
-     \r
-     Unless required by applicable law or agreed to in writing, software\r
-     distributed under the License is distributed on an "AS IS" BASIS,\r
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-     implied.  See the License for the specific language governing\r
-     permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define XmlSec32Component='{761CE697-2701-4149-ACD5-A693EBB45B33}' ?>\r
-<?define XmlSec32Componentd='{34D437A1-3008-433F-A86F-F69E4852069F}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='XmlSecMergeModule_x86' Language='1033' Version='$(var.XmlSecVersion)'>\r
-    <Package Id='{D1678DAE-81D9-4756-ABE6-7D1218F0D350}' Description='Merge Module for Santuario (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium. Includes Several executable utilities.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib' \r
-                       FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan'>\r
-              <Component Id='xsec.dll' Guid='$(var.XmlSec32Component)'>\r
-                <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\r
-              </Component>\r
-              <Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>\r
-                <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>\r
-              </Component>\r
-              <Component Id='checksig.exe' Guid='{F0C2B97A-7B93-4CD3-9432-E5904D337815}'>\r
-                <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>\r
-              </Component>\r
-              <Component Id='cipher.exe' Guid='{654BB761-7B9D-4766-AC5F-DC174E7B94AE}'>\r
-                <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>\r
-              </Component>\r
-              <Component Id='siginf.exe' Guid='{1B278BD9-6507-4613-9315-8D47CAEBC3D8}'>\r
-                <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>\r
-              </Component>\r
-              <Component Id='templatesign.exe' Guid='{A24CD56C-F615-406E-B4E2-4AC5EAE99206}'>\r
-                <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>\r
-              </Component>\r
-              <Component Id='txfmout.exe' Guid='{667DD190-335B-4AB7-BBA5-25B5F847F363}'>\r
-                <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' \r
-                         FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan'>\r
-                <Component Id='xsecD.dll' Guid='$(var.XmlSec32Componentd)'>\r
-                  <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\r
-                </Component>\r
-                <Component Id='c14n.exe_debug' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>\r
-                  <File Id='c14n.exe_debug' KeyPath='yes' Checksum='yes' Name='c14n.exe'/>\r
-                </Component>\r
-                <Component Id='checksig.exe_debug' Guid='{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}'>\r
-                  <File Id='checksig.exe_debug' KeyPath='yes' Checksum='yes' Name='checksig.exe'/>\r
-                </Component>\r
-                <Component Id='cipher.exe_debug' Guid='{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}'>\r
-                  <File Id='cipher.exe_debug' KeyPath='yes' Checksum='yes' Name='cipher.exe'/>\r
-                </Component>\r
-                <Component Id='siginf.exe_debug' Guid='{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}'>\r
-                  <File Id='siginf.exe_debug' KeyPath='yes' Checksum='yes' Name='siginf.exe'/>\r
-                </Component>\r
-                <Component Id='templatesign.exe_debug' Guid='{5E8264B4-D759-4502-B989-5A5C56FBD875}'>\r
-                  <File Id='templatesign.exe_debug' KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>\r
-                </Component>\r
-                <Component Id='txfmout.exe_debug' Guid='{FCBFBCAA-5C39-470A-BD58-E558C384898D}'>\r
-                  <File Id='txfmout.exe_debug' KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'>\r
-              <Component Id='SANTUARIO.LICENSE' Guid='{FF81AD29-36DF-42BD-AFC9-211F083D9872}'>\r
-                <File KeyPath='yes' Name='SANTUARIO.LICENSE'\r
-                  Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE.txt' />\r
-              </Component>\r
-            </Directory><!-- doc -->\r
-          </Directory><!-- shibboleth_sp -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix> \r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the "License"); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define XmlSec32Component='{761CE697-2701-4149-ACD5-A693EBB45B33}' ?>
+<?define XmlSec32Componentd='{34D437A1-3008-433F-A86F-F69E4852069F}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='XmlSecMergeModule_x86' Language='1033' Version='$(var.XmlSecVersion)'>
+    <Package Id='{D1678DAE-81D9-4756-ABE6-7D1218F0D350}' Description='Merge Module for Santuario (x64)'
+             Comments='This module is built by the Shibboleth Consortium. Includes Several executable utilities.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_SP' Name='SP'>
+            <Directory Id='lib' Name='lib' 
+                       FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Release No Xalan'>
+              <Component Id='xsec.dll' Guid='$(var.XmlSec32Component)'>
+                <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>
+              </Component>
+              <Component Id='c14n.exe' Guid='{576EB311-AADA-49D3-B444-7EDC37C715F3}'>
+                <File KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
+              </Component>
+              <Component Id='checksig.exe' Guid='{F0C2B97A-7B93-4CD3-9432-E5904D337815}'>
+                <File KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
+              </Component>
+              <Component Id='cipher.exe' Guid='{654BB761-7B9D-4766-AC5F-DC174E7B94AE}'>
+                <File KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
+              </Component>
+              <Component Id='siginf.exe' Guid='{1B278BD9-6507-4613-9315-8D47CAEBC3D8}'>
+                <File KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
+              </Component>
+              <Component Id='templatesign.exe' Guid='{A24CD56C-F615-406E-B4E2-4AC5EAE99206}'>
+                <File KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
+              </Component>
+              <Component Id='txfmout.exe' Guid='{667DD190-335B-4AB7-BBA5-25B5F847F363}'>
+                <File KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug' 
+                         FileSource='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\Win32\VC10\Debug No Xalan'>
+                <Component Id='xsecD.dll' Guid='$(var.XmlSec32Componentd)'>
+                  <File KeyPath='yes' Checksum='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>
+                </Component>
+                <Component Id='c14n.exe_debug' Guid='{20506FEA-CCFF-46A2-9753-DBBA8A967003}'>
+                  <File Id='c14n.exe_debug' KeyPath='yes' Checksum='yes' Name='c14n.exe'/>
+                </Component>
+                <Component Id='checksig.exe_debug' Guid='{6C2A1FC2-73F0-4EAE-A2CA-9C27A102E460}'>
+                  <File Id='checksig.exe_debug' KeyPath='yes' Checksum='yes' Name='checksig.exe'/>
+                </Component>
+                <Component Id='cipher.exe_debug' Guid='{BE90D2A6-0776-4E48-87F2-6DDE79D8E167}'>
+                  <File Id='cipher.exe_debug' KeyPath='yes' Checksum='yes' Name='cipher.exe'/>
+                </Component>
+                <Component Id='siginf.exe_debug' Guid='{D94E92D1-7B48-4FB2-A2B7-CC253FE27B7F}'>
+                  <File Id='siginf.exe_debug' KeyPath='yes' Checksum='yes' Name='siginf.exe'/>
+                </Component>
+                <Component Id='templatesign.exe_debug' Guid='{5E8264B4-D759-4502-B989-5A5C56FBD875}'>
+                  <File Id='templatesign.exe_debug' KeyPath='yes' Checksum='yes' Name='templatesign.exe'/>
+                </Component>
+                <Component Id='txfmout.exe_debug' Guid='{FCBFBCAA-5C39-470A-BD58-E558C384898D}'>
+                  <File Id='txfmout.exe_debug' KeyPath='yes' Checksum='yes' Name='txfmout.exe'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+            <Directory Id='doc' Name='doc'>
+              <Component Id='SANTUARIO.LICENSE' Guid='{FF81AD29-36DF-42BD-AFC9-211F083D9872}'>
+                <File KeyPath='yes' Name='SANTUARIO.LICENSE'
+                  Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE.txt' />
+              </Component>
+            </Directory><!-- doc -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix> 
index c93b056..4a08cd7 100644 (file)
@@ -1,49 +1,49 @@
-<?xml version='1.0' encoding='utf-8'?>\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define Zlib64Component='{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}' ?>\r
-<?define Zlib64Componentd='{74D67C6F-655E-4E4D-A147-39F32DB6E796}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>\r
-    <Package Id='{68821F70-8952-4778-8149-85A93E4BF426}' Description='Merge Module for Zlib (x64)'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib'>\r
-              <Component Id='zlib1.dll' Guid='$(var.Zlib64Component)' Win64='yes'>\r
-                <File KeyPath='yes' Checksum='yes'\r
-                      Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Release\zlib$(var.ZlibFileVersion).dll'/>\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
-                <Component Id='zlib1d.dll' Guid='$(var.Zlib64Componentd)' Win64='yes'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-          </Directory><!-- shibboleth_sp -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='utf-8'?>
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define Zlib64Component='{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}' ?>
+<?define Zlib64Componentd='{74D67C6F-655E-4E4D-A147-39F32DB6E796}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>
+    <Package Id='{68821F70-8952-4778-8149-85A93E4BF426}' Description='Merge Module for Zlib (x64)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='zlib1.dll' Guid='$(var.Zlib64Component)' Win64='yes'>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Release\zlib$(var.ZlibFileVersion).dll'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='zlib1d.dll' Guid='$(var.Zlib64Componentd)' Win64='yes'>
+                  <File KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\x64\Debug\zlib$(var.ZlibFileVersion)d.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
index 9156d14..2ced6b3 100644 (file)
@@ -1,49 +1,49 @@
-<?xml version='1.0' encoding='utf-8'?>\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include ..\Versions.wxi ?>\r
-<?define Zlib32Component='{059557A8-7311-47BB-8A5F-CC85F72AE495}' ?>\r
-<?define Zlib32Componentd='{3DA71CD4-F204-49D5-A689-7B1B4C2D395A}' ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>\r
-    <Package Id='{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}' Description='Merge Module for Zlib (x86)'\r
-             Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
-\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_sp' Name='SP'>\r
-            <Directory Id='lib' Name='lib'>\r
-              <Component Id='zlib1.dll' Guid='$(var.Zlib32Component)'>\r
-                <File KeyPath='yes' Checksum='yes'\r
-                      Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Release\zlib$(var.ZlibFileVersion).dll'/>\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug'>\r
-                <Component Id='zlib1d.dll' Guid='$(var.Zlib32Componentd)'>\r
-                  <File KeyPath='yes' Checksum='yes'\r
-                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
-            </Directory><!-- lib -->\r
-          </Directory><!-- shibboleth_sp -->\r
-        </Directory><!-- shibboleth -->\r
-      </Directory><!-- ProgramFilesFolder -->\r
-    </Directory><!-- TARGETDIR -->\r
-  </Module>\r
-</Wix>\r
+<?xml version='1.0' encoding='utf-8'?>
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include ..\Versions.wxi ?>
+<?define Zlib32Component='{059557A8-7311-47BB-8A5F-CC85F72AE495}' ?>
+<?define Zlib32Componentd='{3DA71CD4-F204-49D5-A689-7B1B4C2D395A}' ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Module Id='ZlibMergeModule_x86' Language='1033' Version='$(var.ZlibVersion)'>
+    <Package Id='{F5C689A2-A72F-417E-B0F8-CF9B1450EE97}' Description='Merge Module for Zlib (x86)'
+             Comments='This module is built by the Shibboleth Consortium.'
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>
+
+    <Directory Id='TARGETDIR' Name='SourceDir'>
+      <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>
+        <Directory Id='shibboleth' Name='Shibboleth'>
+          <Directory Id='shibboleth_sp' Name='SP'>
+            <Directory Id='lib' Name='lib'>
+              <Component Id='zlib1.dll' Guid='$(var.Zlib32Component)'>
+                <File KeyPath='yes' Checksum='yes'
+                      Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Release\zlib$(var.ZlibFileVersion).dll'/>
+              </Component>
+              <Directory Id='lib_debug' Name='debug'>
+                <Component Id='zlib1d.dll' Guid='$(var.Zlib32Componentd)'>
+                  <File KeyPath='yes' Checksum='yes'
+                        Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\Debug\zlib$(var.ZlibFileVersion)d.dll'/>
+                </Component>
+              </Directory><!-- lib_debug-->
+            </Directory><!-- lib -->
+          </Directory><!-- shibboleth_sp -->
+        </Directory><!-- shibboleth -->
+      </Directory><!-- ProgramFilesFolder -->
+    </Directory><!-- TARGETDIR -->
+  </Module>
+</Wix>
index fa3e04d..279ba2a 100644 (file)
@@ -1,57 +1,57 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <PatchCreation\r
-     Id='{1E09E74F-D547-464B-80B7-1FF63C496BAB}'\r
-     CleanWorkingFolder='yes'\r
-     OutputPath='patch.pcp'\r
-     WholeFilesOnly='yes'\r
-     >\r
-    \r
-    <!-- Information oput into the summary (Details) field -->\r
-    <PatchInformation \r
-       Description='This patch does something' \r
-       Comments='comments' \r
-       Manufacturer='Shibboleth Consortium'/>\r
-    \r
-    <!-- Recommended values for 'Classification' are\r
-         Critical Update, Hotfix, Security Rollup, Security Update, Service Pack, Update, Update Rollup. \r
-\r
-         DisplayName goes into the Name Column for "View installed updates" in control panel's "Porgram and Feature".\r
-      -->\r
-    <PatchMetadata\r
-       AllowRemoval='yes'\r
-       Description='This patch does something'\r
-       ManufacturerName='Shibboleth Consortium'\r
-       TargetProductName='Shibboleth SP Version'\r
-       MoreInfoURL='http://www.shibboleth.net/secadv/bla/bla'\r
-       Classification='Update' \r
-       DisplayName='Shibboleth Patch sevadv blabla'/> \r
-    \r
-    <!-- Note:\r
-         That SequenceStart must be greater than the last\r
-         sequence in the File table in the target package or the patch\r
-         will not install. -->\r
-\r
-    <Family DiskId='5000'\r
-            MediaSrcProp='Sample' \r
-            Name='Sample'\r
-            SequenceStart='5000'>\r
-      <UpgradeImage SourceFile='C:\My Downloads\shib\SPInst\patch\251\admin\ShibbolethSP-main-x64.msi' Id='SampleUpgrade'>\r
-        <TargetImage SourceFile='C:\My Downloads\shib\SPInst\patch\250\admin\ShibbolethSP-main-x64.msi' Order='2'      \r
-                     Id='SampleTarget' IgnoreMissingFiles='no' />\r
-      </UpgradeImage>\r
-    </Family>\r
-    \r
-    <!-- Supersede:  Set this value to 'yes' to indicate that this patch will\r
-         supersede all previous patches in this patch family.  The\r
-         default value is 'no'. \r
-         \r
-         PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed\r
-      -->\r
-\r
-    <PatchSequence PatchFamily='SamplePatchFamily'\r
-                   Sequence='1.0.0.0'\r
-                   Supersede='no' />\r
-    \r
-  </PatchCreation>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <PatchCreation
+     Id='{1E09E74F-D547-464B-80B7-1FF63C496BAB}'
+     CleanWorkingFolder='yes'
+     OutputPath='patch.pcp'
+     WholeFilesOnly='yes'
+     >
+    
+    <!-- Information oput into the summary (Details) field -->
+    <PatchInformation 
+       Description='This patch does something' 
+       Comments='comments' 
+       Manufacturer='Shibboleth Consortium'/>
+    
+    <!-- Recommended values for 'Classification' are
+         Critical Update, Hotfix, Security Rollup, Security Update, Service Pack, Update, Update Rollup. 
+
+         DisplayName goes into the Name Column for "View installed updates" in control panel's "Porgram and Feature".
+      -->
+    <PatchMetadata
+       AllowRemoval='yes'
+       Description='This patch does something'
+       ManufacturerName='Shibboleth Consortium'
+       TargetProductName='Shibboleth SP Version'
+       MoreInfoURL='http://www.shibboleth.net/secadv/bla/bla'
+       Classification='Update' 
+       DisplayName='Shibboleth Patch sevadv blabla'/> 
+    
+    <!-- Note:
+         That SequenceStart must be greater than the last
+         sequence in the File table in the target package or the patch
+         will not install. -->
+
+    <Family DiskId='5000'
+            MediaSrcProp='Sample' 
+            Name='Sample'
+            SequenceStart='5000'>
+      <UpgradeImage SourceFile='C:\My Downloads\shib\SPInst\patch\251\admin\ShibbolethSP-main-x64.msi' Id='SampleUpgrade'>
+        <TargetImage SourceFile='C:\My Downloads\shib\SPInst\patch\250\admin\ShibbolethSP-main-x64.msi' Order='2'      
+                     Id='SampleTarget' IgnoreMissingFiles='no' />
+      </UpgradeImage>
+    </Family>
+    
+    <!-- Supersede:  Set this value to 'yes' to indicate that this patch will
+         supersede all previous patches in this patch family.  The
+         default value is 'no'. 
+         
+         PatchFamily is the version of patch - nothing to do with the version of Shibboleth Installed
+      -->
+
+    <PatchSequence PatchFamily='SamplePatchFamily'
+                   Sequence='1.0.0.0'
+                   Supersede='no' />
+    
+  </PatchCreation>
+</Wix>
index 672fe0d..1dc85df 100644 (file)
-<?xml version='1.0' encoding='utf-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the 'License'); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an 'AS IS' BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->\r
-  <Fragment>\r
-    <!-- Configuration, licenses and documentation -->\r
-    <DirectoryRef Id='INSTALLDIR'>\r
-      <Directory Id='bin64' Name='bin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release' >\r
-        <Component Id='resolvertest64.exe' Guid='{C29672B6-971D-4828-BB51-1190C0877381}' Win64='yes'>\r
-          <File KeyPath='yes' Checksum='yes' Id='resolvertest64.exe' Name='resolvertest.exe' />\r
-        </Component>\r
-        <Component Id='mdquery64.exe' Guid='{3645630B-3991-4693-8664-A49242B9CF05}' Win64='yes'>\r
-          <File KeyPath='yes' Checksum='yes' Id='mdquery64.exe' Name='mdquery.exe' />\r
-        </Component>\r
-        <Directory Id='bin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >\r
-          <Component Id='resolvertest64.exe_debug' Guid='{58C98426-8C96-41EE-B956-A6BBAEAE5A10}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='resolvertest64.exe_debug' Name='resolvertest.exe' />\r
-          </Component>\r
-          <Component Id='mdquery64.exe_debug' Guid='{2153EDFC-9962-4AF4-8071-40D0FF497BF9}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='mdquery64.exe_debug' Name='mdquery.exe' />\r
-          </Component>\r
-        </Directory><!-- bin_debug -->\r
-      </Directory><!-- bin -->\r
-      <Directory Id='lib64' Name='lib64' >\r
-        <Directory Id='lib64_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release' >\r
-          <Component Id='adfs64.so' Guid='{2891ECDC-F507-4CEC-8A65-8B20FB93F4B7}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='adfs64.so' Name='adfs.so' />\r
-          </Component>\r
-          <Component Id='adfs_lite64.so' Guid='{1162CDA0-C3F8-4599-B01E-9EDAA73B2C0B}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='adfs_lite64.so' Name='adfs-lite.so' />\r
-          </Component>\r
-          <Component Id='isapi_shib64.dll' Guid='{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='isapi_shib64.dll' Name='isapi_shib.dll' />\r
-          </Component>\r
-          <Component Id='mod_shib_2264.so' Guid='{3C8F67F5-C7C2-40DB-94AB-A26266C113C8}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='mod_shib_2264.so' Name='mod_shib_22.so' />\r
-          </Component>\r
-          <Component Id='mod_shib_2464.so' Guid='{6A7EDDE5-9593-4A8D-B767-E171856EEDD4}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='mod_shib_2464.so' Name='mod_shib_24.so' />\r
-          </Component>\r
-          <Component Id='odbc_store64.so' Guid='{D9CF6BD3-4BDB-4BC5-9EB3-6C68CA7544B6}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='odbc_store64.so' Name='odbc-store.so' />\r
-          </Component>\r
-          <Component Id='plugins64.so' Guid='{C78105F1-1258-41A4-8505-5437E90FB1B4}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='plugins64.so' Name='plugins.so' />\r
-          </Component>\r
-          <Component Id='plugins_lite64.so' Guid='{83CA3D25-2370-426A-9747-B8A74EFC9037}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='plugins_lite64.so' Name='plugins-lite.so' />\r
-          </Component>\r
-          <Component Id='shibauthorizer64.exe' Guid='{5A323F4F-AE87-451A-9253-1965E46C9C5F}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='shibauthorizer64.exe' Name='shibauthorizer.exe' />\r
-          </Component>\r
-          <Component Id='shibresponder64.exe' Guid='{538D6EEC-1AE1-400B-94AF-2B7791BFEBDA}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='shibresponder64.exe' Name='shibresponder.exe' />\r
-          </Component>\r
-          <Directory Id='lib64_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >\r
-            <Component Id='adfs64.so_debug' Guid='{BFF58DDD-CF04-49B1-A172-C84087705D2A}' Win64='yes'>\r
-              <File KeyPath='yes' Checksum='yes' Id='adfs64.so_debug' Name='adfs.so' />\r
-            </Component>\r
-            <Component Id='adfs_lite64.so_debug' Guid='{2A3D71BE-BF8F-4CBD-B890-B25F391B09FA}' Win64='yes'>\r
-              <File KeyPath='yes' Checksum='yes' Id='adfs_lite64.so_debug' Name='adfs-lite.so' />\r
-            </Component>\r
-            <Component Id='isapi_shib64.dll_debug' Guid='{60BC5679-A40E-42E5-9FC0-CCE924E660ED}' Win64='yes'>\r
-              <File KeyPath='yes' Checksum='yes' Id='isapi_shib64.dll_debug' Name='isapi_shib.dll' />\r
-            </Component>\r
-            <Component Id='mod_shib_2264.so_debug' Guid='{59FE3C18-1920-48A0-80BC-7ECF8579E441}' Win64='yes'>\r
-              <File KeyPath='yes' Checksum='yes' Id='mod_shib_2264.so_debug' Name='mod_shib_22.so' />\r
-            </Component>\r
-            <Component Id='mod_shib_2464.so_debug' Guid='{38EE87FE-EA2B-41B4-A457-38A8F84B9866}' Win64='yes'>\r
-              <File KeyPath='yes' Checksum='yes' Id='mod_shib_2464.so_debug' Name='mod_shib_24.so' />\r
-            </Component>\r
-            <Component Id='odbc_store64.so_debug' Guid='{586CE55A-F089-4541-96D5-5EE26F8FC471}' Win64='yes'>\r
-              <File KeyPath='yes' Checksum='yes' Id='odbc_store64.so_debug' Name='odbc-store.so' />\r
-            </Component>\r
-            <Component Id='plugins64.so_debug' Guid='{E6E051C8-6C84-4CC9-B718-365E627068B6}' Win64='yes'>\r
-              <File KeyPath='yes' Checksum='yes' Id='plugins64.so_debug' Name='plugins.so' />\r
-            </Component>\r
-            <Component Id='plugins_lite64.so_debug' Guid='{3A05BDF3-12C8-4502-A30D-7C8B9C7A5855}' Win64='yes'>\r
-              <File KeyPath='yes' Checksum='yes' Id='plugins_lite64.so_debug' Name='plugins-lite.so' />\r
-            </Component>\r
-            <Component Id='shibauthorizer64.exe_debug' Guid='{642C9137-66C8-4E2E-A76C-4D9F65B17157}' Win64='yes'>\r
-              <File KeyPath='yes' Checksum='yes' Id='shibauthorizer64.exe_debug' Name='shibauthorizer.exe' />\r
-            </Component>\r
-            <Component Id='shibresponder64.exe_debug' Guid='{7947F31A-1429-44FC-85B2-BF1E7AA50D20}' Win64='yes'>\r
-              <File KeyPath='yes' Checksum='yes' Id='shibresponder64.exe_debug' Name='shibresponder.exe' />\r
-            </Component>\r
-          </Directory><!-- lib_shibboleth_debug -->\r
-        </Directory><!-- lib_shibboleth -->\r
-      </Directory><!-- lib -->\r
-      <!-- the service bin -->\r
-      <Directory Id='sbin64' Name='sbin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release' >\r
-        <Component Id='shibd64.exe' Guid='{707B57A2-CCA0-48A6-9F66-275EB04474AA}' Win64='yes'>\r
-          <File KeyPath='yes' Checksum='yes' Id='shibd64.exe' Name='shibd.exe' />\r
-        </Component>\r
-        <Directory Id='sbin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >\r
-          <Component Id='shibd64.exe_debug' Guid='{657A1902-0104-47C7-84A7-AEB5F736B02F}' Win64='yes'>\r
-            <File KeyPath='yes' Checksum='yes' Id='shibd64.exe_debug' Name='shibd.exe' />\r
-          </Component>\r
-        </Directory><!-- sbin_debug -->\r
-      </Directory><!-- sbin -->\r
-    </DirectoryRef><!-- INSTALLDIR -->\r
-  </Fragment>\r
-</Wix>\r
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->
+  <Fragment>
+    <!-- Configuration, licenses and documentation -->
+    <DirectoryRef Id='INSTALLDIR'>
+      <Directory Id='bin64' Name='bin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release' >
+        <Component Id='resolvertest64.exe' Guid='{C29672B6-971D-4828-BB51-1190C0877381}' Win64='yes'>
+          <File KeyPath='yes' Checksum='yes' Id='resolvertest64.exe' Name='resolvertest.exe' />
+        </Component>
+        <Component Id='mdquery64.exe' Guid='{3645630B-3991-4693-8664-A49242B9CF05}' Win64='yes'>
+          <File KeyPath='yes' Checksum='yes' Id='mdquery64.exe' Name='mdquery.exe' />
+        </Component>
+        <Directory Id='bin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >
+          <Component Id='resolvertest64.exe_debug' Guid='{58C98426-8C96-41EE-B956-A6BBAEAE5A10}' Win64='yes'>
+            <File KeyPath='yes' Checksum='yes' Id='resolvertest64.exe_debug' Name='resolvertest.exe' />
+          </Component>
+          <Component Id='mdquery64.exe_debug' Guid='{2153EDFC-9962-4AF4-8071-40D0FF497BF9}' Win64='yes'>
+            <File KeyPath='yes' Checksum='yes' Id='mdquery64.exe_debug' Name='mdquery.exe' />
+          </Component>
+        </Directory><!-- bin_debug -->
+      </Directory><!-- bin -->
+      <Directory Id='lib64' Name='lib64' >
+        <Directory Id='lib64_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release' >
+          <Component Id='adfs64.so' Guid='{2891ECDC-F507-4CEC-8A65-8B20FB93F4B7}' Win64='yes'>
+            <File KeyPath='yes' Checksum='yes' Id='adfs64.so' Name='adfs.so' />
+          </Component>
+          <Component Id='adfs_lite64.so' Guid='{1162CDA0-C3F8-4599-B01E-9EDAA73B2C0B}' Win64='yes'>
+            <File KeyPath='yes' Checksum='yes' Id='adfs_lite64.so' Name='adfs-lite.so' />
+          </Component>
+          <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>
+          <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>
+          <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>
+          <Component Id='odbc_store64.so' Guid='{D9CF6BD3-4BDB-4BC5-9EB3-6C68CA7544B6}' Win64='yes'>
+            <File KeyPath='yes' Checksum='yes' Id='odbc_store64.so' Name='odbc-store.so' />
+          </Component>
+          <Component Id='plugins64.so' Guid='{C78105F1-1258-41A4-8505-5437E90FB1B4}' Win64='yes'>
+            <File KeyPath='yes' Checksum='yes' Id='plugins64.so' Name='plugins.so' />
+          </Component>
+          <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>
+          <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>
+          <Directory Id='lib64_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\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' />
+            </Component>
+            <Component Id='adfs_lite64.so_debug' Guid='{2A3D71BE-BF8F-4CBD-B890-B25F391B09FA}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='adfs_lite64.so_debug' Name='adfs-lite.so' />
+            </Component>
+            <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>
+            <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>
+            <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>
+            <Component Id='odbc_store64.so_debug' Guid='{586CE55A-F089-4541-96D5-5EE26F8FC471}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='odbc_store64.so_debug' Name='odbc-store.so' />
+            </Component>
+            <Component Id='plugins64.so_debug' Guid='{E6E051C8-6C84-4CC9-B718-365E627068B6}' Win64='yes'>
+              <File KeyPath='yes' Checksum='yes' Id='plugins64.so_debug' Name='plugins.so' />
+            </Component>
+            <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>
+            <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>
+          </Directory><!-- lib_shibboleth_debug -->
+        </Directory><!-- lib_shibboleth -->
+      </Directory><!-- lib -->
+      <!-- the service bin -->
+      <Directory Id='sbin64' Name='sbin64' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release' >
+        <Component Id='shibd64.exe' Guid='{707B57A2-CCA0-48A6-9F66-275EB04474AA}' Win64='yes'>
+          <File KeyPath='yes' Checksum='yes' Id='shibd64.exe' Name='shibd.exe' />
+        </Component>
+        <Directory Id='sbin64_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Debug' >
+          <Component Id='shibd64.exe_debug' Guid='{657A1902-0104-47C7-84A7-AEB5F736B02F}' Win64='yes'>
+            <File KeyPath='yes' Checksum='yes' Id='shibd64.exe_debug' Name='shibd.exe' />
+          </Component>
+        </Directory><!-- sbin_debug -->
+      </Directory><!-- sbin -->
+    </DirectoryRef><!-- INSTALLDIR -->
+  </Fragment>
+</Wix>
index d0d4517..c9066db 100644 (file)
-<?xml version='1.0' encoding='utf-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the 'License'); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an 'AS IS' BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->\r
-  <Fragment>\r
-    <!-- Configuration, licenses and documentation -->\r
-    <DirectoryRef Id='INSTALLDIR'>\r
-      <Directory Id='bin' Name='bin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release' >\r
-        <Component Id='resolvertest.exe' Guid='{D381B6FA-2971-457B-804E-F08DD517866F}'>\r
-          <File KeyPath='yes' Checksum='yes' Name='resolvertest.exe' />\r
-        </Component>\r
-        <Component Id='mdquery.exe' Guid='{5F322597-3B26-48E5-95BA-CF991CF6D6DB}'>\r
-          <File KeyPath='yes' Checksum='yes' Name='mdquery.exe' />\r
-        </Component>\r
-        <Directory Id='bin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >\r
-          <Component Id='resolvertest.exe_debug' Guid='{4FA03A33-961A-42E5-8D7A-5F2E207757DD}'>\r
-            <File KeyPath='yes' Checksum='yes' Id='resolvertest.exe_debug' Name='resolvertest.exe' />\r
-          </Component>\r
-          <Component Id='mdquery.exe_debug' Guid='{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}'>\r
-            <File KeyPath='yes' Checksum='yes' Id='mdquery.exe_debug' Name='mdquery.exe' />\r
-          </Component>\r
-        </Directory><!-- bin_debug -->\r
-      </Directory><!-- bin -->\r
-      <Directory Id='lib' Name='lib' >\r
-        <Directory Id='lib_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release' >\r
-          <Component Id='adfs.so' Guid='{9C92C803-E905-4B43-8723-05678DC73B88}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='adfs.so' />\r
-          </Component>\r
-          <Component Id='adfs_lite.so' Guid='{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='adfs-lite.so' />\r
-          </Component>\r
-          <Component Id='isapi_shib.dll' Guid='{716D6F4F-4185-4219-B1BA-1D15F867926E}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='isapi_shib.dll' />\r
-          </Component>\r
-          <Component Id='mod_shib_13.so' Guid='{5C85940B-7644-4AA4-9948-9EFFC1729EFB}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='mod_shib_13.so' />\r
-          </Component>\r
-          <Component Id='mod_shib_20.so' Guid='{FFC2D560-FD06-42BB-9EA7-B0CC988AC4A6}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='mod_shib_20.so' />\r
-          </Component>\r
-          <Component Id='mod_shib_22.so' Guid='{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='mod_shib_22.so' />\r
-          </Component>\r
-          <Component Id='mod_shib_24.so' Guid='{8CAE4DF0-C8A8-4A48-A213-F4B3AFE6F439}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='mod_shib_24.so' />\r
-          </Component>\r
-          <Component Id='nsapi_shib.dll' Guid='{F199DD8A-292F-4C7D-AACB-7283852D6335}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='nsapi_shib.dll' />\r
-          </Component>\r
-          <Component Id='odbc_store.so' Guid='{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='odbc-store.so' />\r
-          </Component>\r
-          <Component Id='plugins.so' Guid='{F738E29B-903B-4C86-BE27-4C72EC69915E}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='plugins.so' />\r
-          </Component>\r
-          <Component Id='plugins_lite.so' Guid='{FF18A6B4-EDC7-4A9A-8BFE-C166DCE5243E}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='plugins-lite.so' />\r
-          </Component>\r
-          <Component Id='shibauthorizer.exe' Guid='{7C7C1C24-902A-4003-AE59-599E79161782}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='shibauthorizer.exe' />\r
-          </Component>\r
-          <Component Id='shibresponder.exe' Guid='{510267D9-61F2-47EF-99D2-CB3D21CB14EB}'>\r
-            <File KeyPath='yes' Checksum='yes' Name='shibresponder.exe' />\r
-          </Component>\r
-          <Directory Id='lib_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >\r
-            <Component Id='adfs.so_debug' Guid='{9B8E071F-B251-4373-A786-8966FD0D22EF}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='adfs.so_debug' Name='adfs.so' />\r
-            </Component>\r
-            <Component Id='adfs_lite.so_debug' Guid='{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='adfs_lite.so_debug' Name='adfs-lite.so' />\r
-            </Component>\r
-            <Component Id='isapi_shib.dll_debug' Guid='{F8212D30-0BA8-4F02-B595-E8E5D312342B}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='isapi_shib.dll_debug' Name='isapi_shib.dll' />\r
-            </Component>\r
-            <Component Id='mod_shib_13.so_debug' Guid='{E8B798AB-D772-428D-8033-2A77CB437CF0}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='mod_shib_13.so_debug' Name='mod_shib_13.so' />\r
-            </Component>\r
-            <Component Id='mod_shib_20.so_debug' Guid='{468806BF-6924-47D5-B319-608C2D63FDDC}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='mod_shib_20.so_debug' Name='mod_shib_20.so' />\r
-            </Component>\r
-            <Component Id='mod_shib_22.so_debug' Guid='{3DA4492F-C0EA-4286-9C37-13F82342FA67}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='mod_shib_22.so_debug' Name='mod_shib_22.so' />\r
-            </Component>\r
-            <Component Id='mod_shib_24.so_debug' Guid='{E04003DF-8C61-4C9E-87AB-89223C5E65DC}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='mod_shib_24.so_debug' Name='mod_shib_24.so'/>\r
-            </Component>\r
-            <Component Id='nsapi_shib.dll_debug' Guid='{492A5D72-4FE0-417E-9023-311E1BF34816}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='nsapi_shib.dll_debug' Name='nsapi_shib.dll' />\r
-            </Component>\r
-            <Component Id='odbc_store.so_debug' Guid='{F217D7CF-91C1-4318-901D-709C710803C6}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='odbc_store.so_debug' Name='odbc-store.so' />\r
-            </Component>\r
-            <Component Id='plugins.so_debug' Guid='{6D3F2ABC-EFD4-4BF7-889D-3FD0DBE3727C}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='plugins.so_debug' Name='plugins.so' />\r
-            </Component>\r
-            <Component Id='plugins_lite.so_debug' Guid='{83A9DA0D-774C-4F96-9446-D5A1B61BB4A2}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='plugins_lite.so_debug' Name='plugins-lite.so' />\r
-            </Component>\r
-            <Component Id='shibauthorizer.exe_debug' Guid='{83360639-DDC0-4B76-8168-21FB77EE6CD6}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='shibauthorizer.exe_debug' Name='shibauthorizer.exe' />\r
-            </Component>\r
-            <Component Id='shibresponder.exe_debug' Guid='{760124EA-67E5-4393-B3DF-657DCC92F04C}'>\r
-              <File KeyPath='yes' Checksum='yes' Id='shibresponder.exe_debug' Name='shibresponder.exe' />\r
-            </Component>\r
-          </Directory><!-- lib_shibboleth_debug -->\r
-        </Directory><!-- lib_shibboleth -->\r
-      </Directory><!-- lib -->\r
-      <!-- the service bin -->\r
-      <Directory Id='sbin' Name='sbin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release' >\r
-        <Component Id='shibd.exe' Guid='{2476BB80-9384-4026-86F5-E1569A685187}'>\r
-          <File KeyPath='yes' Checksum='yes' Name='shibd.exe' />\r
-          <!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->\r
-          <ServiceInstall Id='shibd' Name='shibd_Default' \r
-                          DisplayName='Shibboleth 2 Daemon (Default)'\r
-                          Description='Manages shared state and offloads SAML processing from Shibboleth web server modules.'\r
-                          Arguments='-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"'\r
-                          Type='ownProcess' Start='auto' ErrorControl='ignore' />\r
-          <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='both'  \r
-                          Remove='uninstall' Start='install' Wait='no' />\r
-        </Component>\r
-        <Directory Id='sbin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >\r
-          <Component Id='shibd.exe_debug' Guid='{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}'>\r
-            <File KeyPath='yes' Checksum='yes' Id='shibd.exe_debug' Name='shibd.exe' />\r
-          </Component>\r
-        </Directory><!-- sbin_debug -->\r
-      </Directory><!-- sbin -->\r
-    </DirectoryRef><!-- INSTALLDIR -->\r
-  </Fragment>\r
-</Wix>\r
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- This is where we put all executables & so & dlls which make up the SP X86 installer -->
+  <Fragment>
+    <!-- Configuration, licenses and documentation -->
+    <DirectoryRef Id='INSTALLDIR'>
+      <Directory Id='bin' Name='bin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release' >
+        <Component Id='resolvertest.exe' Guid='{D381B6FA-2971-457B-804E-F08DD517866F}'>
+          <File KeyPath='yes' Checksum='yes' Name='resolvertest.exe' />
+        </Component>
+        <Component Id='mdquery.exe' Guid='{5F322597-3B26-48E5-95BA-CF991CF6D6DB}'>
+          <File KeyPath='yes' Checksum='yes' Name='mdquery.exe' />
+        </Component>
+        <Directory Id='bin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >
+          <Component Id='resolvertest.exe_debug' Guid='{4FA03A33-961A-42E5-8D7A-5F2E207757DD}'>
+            <File KeyPath='yes' Checksum='yes' Id='resolvertest.exe_debug' Name='resolvertest.exe' />
+          </Component>
+          <Component Id='mdquery.exe_debug' Guid='{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}'>
+            <File KeyPath='yes' Checksum='yes' Id='mdquery.exe_debug' Name='mdquery.exe' />
+          </Component>
+        </Directory><!-- bin_debug -->
+      </Directory><!-- bin -->
+      <Directory Id='lib' Name='lib' >
+        <Directory Id='lib_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release' >
+          <Component Id='adfs.so' Guid='{9C92C803-E905-4B43-8723-05678DC73B88}'>
+            <File KeyPath='yes' Checksum='yes' Name='adfs.so' />
+          </Component>
+          <Component Id='adfs_lite.so' Guid='{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}'>
+            <File KeyPath='yes' Checksum='yes' Name='adfs-lite.so' />
+          </Component>
+          <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>
+          <Component Id='nsapi_shib.dll' Guid='{F199DD8A-292F-4C7D-AACB-7283852D6335}'>
+            <File KeyPath='yes' Checksum='yes' Name='nsapi_shib.dll' />
+          </Component>
+          <Component Id='odbc_store.so' Guid='{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}'>
+            <File KeyPath='yes' Checksum='yes' Name='odbc-store.so' />
+          </Component>
+          <Component Id='plugins.so' Guid='{F738E29B-903B-4C86-BE27-4C72EC69915E}'>
+            <File KeyPath='yes' Checksum='yes' Name='plugins.so' />
+          </Component>
+          <Component Id='plugins_lite.so' Guid='{FF18A6B4-EDC7-4A9A-8BFE-C166DCE5243E}'>
+            <File KeyPath='yes' Checksum='yes' Name='plugins-lite.so' />
+          </Component>
+          <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>
+          <Directory Id='lib_shibboleth_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >
+            <Component Id='adfs.so_debug' Guid='{9B8E071F-B251-4373-A786-8966FD0D22EF}'>
+              <File KeyPath='yes' Checksum='yes' Id='adfs.so_debug' Name='adfs.so' />
+            </Component>
+            <Component Id='adfs_lite.so_debug' Guid='{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}'>
+              <File KeyPath='yes' Checksum='yes' Id='adfs_lite.so_debug' Name='adfs-lite.so' />
+            </Component>
+            <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>
+            <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>
+            <Component Id='odbc_store.so_debug' Guid='{F217D7CF-91C1-4318-901D-709C710803C6}'>
+              <File KeyPath='yes' Checksum='yes' Id='odbc_store.so_debug' Name='odbc-store.so' />
+            </Component>
+            <Component Id='plugins.so_debug' Guid='{6D3F2ABC-EFD4-4BF7-889D-3FD0DBE3727C}'>
+              <File KeyPath='yes' Checksum='yes' Id='plugins.so_debug' Name='plugins.so' />
+            </Component>
+            <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>
+            <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>
+          </Directory><!-- lib_shibboleth_debug -->
+        </Directory><!-- lib_shibboleth -->
+      </Directory><!-- lib -->
+      <!-- the service bin -->
+      <Directory Id='sbin' Name='sbin' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release' >
+        <Component Id='shibd.exe' Guid='{2476BB80-9384-4026-86F5-E1569A685187}'>
+          <File KeyPath='yes' Checksum='yes' Name='shibd.exe' />
+          <!-- NOTE - whether this actually happens is predicated in noarch on whether this is an upgrade or not -->
+          <ServiceInstall Id='shibd' Name='shibd_Default' 
+                          DisplayName='Shibboleth 2 Daemon (Default)'
+                          Description='Manages shared state and offloads SAML processing from Shibboleth web server modules.'
+                          Arguments='-stdout "[INSTALLDIR]var\log\shibboleth\stdout.log" -stderr "[INSTALLDIR]var\log\shibboleth\stderr.log"'
+                          Type='ownProcess' Start='auto' ErrorControl='ignore' />
+          <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='both'  
+                          Remove='uninstall' Start='install' Wait='no' />
+        </Component>
+        <Directory Id='sbin_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >
+          <Component Id='shibd.exe_debug' Guid='{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}'>
+            <File KeyPath='yes' Checksum='yes' Id='shibd.exe_debug' Name='shibd.exe' />
+          </Component>
+        </Directory><!-- sbin_debug -->
+      </Directory><!-- sbin -->
+    </DirectoryRef><!-- INSTALLDIR -->
+  </Fragment>
+</Wix>
index 8f19527..d8d7119 100644 (file)
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-     Development, Inc. (UCAID) under one or more contributor license\r
-     agreements.  See the NOTICE file distributed with this work for\r
-     additional information regarding copyright ownership. The UCAID\r
-     licenses this file to You under the Apache License, Version 2.0\r
-     (the 'License'); you may not use this file except in compliance\r
-     with the License.  You may obtain a copy of the License at\r
-     \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
-     \r
-     Unless required by applicable law or agreed to in writing, software\r
-     distributed under the License is distributed on an 'AS IS' BASIS,\r
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-     implied.  See the License for the specific language governing\r
-     permissions and limitations under the License.  -->\r
-\r
-<?include Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->\r
-  <Fragment>\r
-\r
-    <WixVariable Id="WixUILicenseRtf" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\license.rtf" />\r
-    <WixVariable Id="WixUIBannerBmp" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\TopBanner.bmp" />\r
-    <WixVariable Id="WixUIDialogBmp" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\Dialog.bmp" />\r
-    <WixVariable Id="WixUICostingPopupOptOut" Value="1" />    \r
-\r
-    <!-- GUI For Shibboleth installer.  Uses the Wix packages, but linked in\r
-         blindly by looking at documentation (for sizes and dialog names) \r
-         and the generated.msi -->\r
-\r
-    <!-- Property that Light complained for -->\r
-    <Property Id='DefaultUIFont' Value='WixUI_Font_Normal' />\r
-\r
-    <!-- "You must set a property named WIXUI_INSTALLDIR with a value\r
-         of the ID of the directory you want the user to be able to specify\r
-         the location of." -->\r
-\r
-    <Property Id='WIXUI_INSTALLDIR' Value='INSTALLDIR' />\r
-\r
-    <UI Id='ShibbolethInstallDir' >\r
-\r
-      <!-- "WixUI_InstallDir includes the following dialogs:" -->\r
-      <DialogRef Id='BrowseDlg' />\r
-      <DialogRef Id='DiskCostDlg' />\r
-      <DialogRef Id='InvalidDirDlg' />\r
-      <DialogRef Id='LicenseAgreementDlg' />\r
-      <DialogRef Id='WelcomeDlg' />\r
-\r
-      <!-- "In addition, WixUI_InstallDir includes the following common\r
-           dialogs that appear in all WixUI dialog sets:" -->\r
-      <DialogRef Id='CancelDlg' />\r
-      <DialogRef Id='ErrorDlg' />\r
-      <DialogRef Id='ExitDialog' />\r
-      <DialogRef Id='FatalError' />\r
-      <DialogRef Id='FilesInUse' />\r
-      <DialogRef Id='MaintenanceTypeDlg' />\r
-      <DialogRef Id='MaintenanceWelcomeDlg' />\r
-      <DialogRef Id='MsiRMFilesInUse' />\r
-      <DialogRef Id='OutOfDiskDlg' />\r
-      <DialogRef Id='OutOfRbDiskDlg' />\r
-      <DialogRef Id='PrepareDlg' />\r
-      <DialogRef Id='ProgressDlg' />\r
-      <DialogRef Id='ResumeDlg' />\r
-      <DialogRef Id='UserExit' />\r
-      <DialogRef Id='VerifyReadyDlg' />\r
-      <DialogRef Id='WaitForCostingDlg' />\r
-\r
-      <!-- We also define two dialogs -->\r
-      <DialogRef Id='UpdateDlgShib' />\r
-      <DialogRef Id='InstallDirDlgShib' />\r
-\r
-      <!-- Text Styles (from Orca) -->\r
-      <TextStyle Id='WixUI_Font_Normal' FaceName='Tahoma' Size='8' />\r
-      <TextStyle Id='WixUI_Font_Bigger' FaceName='Tahoma' Size='12' />\r
-      <TextStyle Id='WixUI_Font_Title' FaceName='Tahoma' Size='9' Bold='yes'/>\r
-\r
-      <!-- Events (from Orca\ControlEvent and from light's complaints) -->\r
-      <Publish Dialog='BrowseDlg' Control='OK' Event='DoAction' Value='WixUIValidatePath' Order='3'>1</Publish>\r
-      <Publish Dialog='BrowseDlg' Control='OK' Event='SpawnDialog' Value='InvalidDirDlg' Order='4'>\r
-       WIXUI_INSTALLDIR_VALID&lt;&gt;"1"\r
-      </Publish>\r
-\r
-      <Publish Dialog='LicenseAgreementDlg' Control='Next' Event='NewDialog' Value='InstallDirDlgShib'>\r
-       LicenseAccepted = "1"\r
-      </Publish>\r
-\r
-      <Publish Dialog='MaintenanceTypeDlg' Control='RepairButton' Event='NewDialog' Value='VerifyReadyDlg'>1</Publish>\r
-      <Publish Dialog='MaintenanceTypeDlg' Control='RemoveButton' Event='NewDialog' Value='VerifyReadyDlg'>1</Publish>\r
-\r
-\r
-      <Publish Dialog='MaintenanceWelcomeDlg' Control='Next' Event='NewDialog' Value='MaintenanceTypeDlg'>1</Publish>\r
-\r
-      <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='LicenseAgreementDlg'>\r
-        (NOT Installed) AND (NOT ALREADYINSTALLED)\r
-      </Publish>\r
-      <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='UpdateDlgShib'>\r
-        (NOT Installed) AND ALREADYINSTALLED\r
-      </Publish>\r
-      <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='VerifyReadyDlg'>\r
-        Installed AND PATCH\r
-      </Publish>\r
-\r
-      <Publish Dialog='ExitDialog' Control='Finish' Event='EndDialog' Value='Return'>1</Publish>\r
-      <Publish Dialog='LicenseAgreementDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg'>1</Publish>\r
-      <Publish Dialog='MaintenanceTypeDlg' Control='Back' Event='NewDialog' Value='MaintenanceWelcomeDlg'>1</Publish>\r
-      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg'>\r
-        Installed AND PATCH\r
-      </Publish>\r
-      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='InstallDirDlgShib'>\r
-        (NOT Installed) AND (NOT ALREADYINSTALLED)\r
-      </Publish>\r
-      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='UpdateDlgShib'>\r
-        (NOT Installed) AND ALREADYINSTALLED\r
-      </Publish>\r
-      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='MaintenanceTypeDlg'>\r
-        Installed AND NOT PATCH\r
-      </Publish>\r
-\r
-    </UI>\r
-  </Fragment>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the 'License'); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an 'AS IS' BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<?include Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->
+  <Fragment>
+
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\license.rtf" />
+    <WixVariable Id="WixUIBannerBmp" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\TopBanner.bmp" />
+    <WixVariable Id="WixUIDialogBmp" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\Dialog.bmp" />
+    <WixVariable Id="WixUICostingPopupOptOut" Value="1" />    
+
+    <!-- GUI For Shibboleth installer.  Uses the Wix packages, but linked in
+         blindly by looking at documentation (for sizes and dialog names) 
+         and the generated.msi -->
+
+    <!-- Property that Light complained for -->
+    <Property Id='DefaultUIFont' Value='WixUI_Font_Normal' />
+
+    <!-- "You must set a property named WIXUI_INSTALLDIR with a value
+         of the ID of the directory you want the user to be able to specify
+         the location of." -->
+
+    <Property Id='WIXUI_INSTALLDIR' Value='INSTALLDIR' />
+
+    <UI Id='ShibbolethInstallDir' >
+
+      <!-- "WixUI_InstallDir includes the following dialogs:" -->
+      <DialogRef Id='BrowseDlg' />
+      <DialogRef Id='DiskCostDlg' />
+      <DialogRef Id='InvalidDirDlg' />
+      <DialogRef Id='LicenseAgreementDlg' />
+      <DialogRef Id='WelcomeDlg' />
+
+      <!-- "In addition, WixUI_InstallDir includes the following common
+           dialogs that appear in all WixUI dialog sets:" -->
+      <DialogRef Id='CancelDlg' />
+      <DialogRef Id='ErrorDlg' />
+      <DialogRef Id='ExitDialog' />
+      <DialogRef Id='FatalError' />
+      <DialogRef Id='FilesInUse' />
+      <DialogRef Id='MaintenanceTypeDlg' />
+      <DialogRef Id='MaintenanceWelcomeDlg' />
+      <DialogRef Id='MsiRMFilesInUse' />
+      <DialogRef Id='OutOfDiskDlg' />
+      <DialogRef Id='OutOfRbDiskDlg' />
+      <DialogRef Id='PrepareDlg' />
+      <DialogRef Id='ProgressDlg' />
+      <DialogRef Id='ResumeDlg' />
+      <DialogRef Id='UserExit' />
+      <DialogRef Id='VerifyReadyDlg' />
+      <DialogRef Id='WaitForCostingDlg' />
+
+      <!-- We also define two dialogs -->
+      <DialogRef Id='UpdateDlgShib' />
+      <DialogRef Id='InstallDirDlgShib' />
+
+      <!-- Text Styles (from Orca) -->
+      <TextStyle Id='WixUI_Font_Normal' FaceName='Tahoma' Size='8' />
+      <TextStyle Id='WixUI_Font_Bigger' FaceName='Tahoma' Size='12' />
+      <TextStyle Id='WixUI_Font_Title' FaceName='Tahoma' Size='9' Bold='yes'/>
+
+      <!-- Events (from Orca\ControlEvent and from light's complaints) -->
+      <Publish Dialog='BrowseDlg' Control='OK' Event='DoAction' Value='WixUIValidatePath' Order='3'>1</Publish>
+      <Publish Dialog='BrowseDlg' Control='OK' Event='SpawnDialog' Value='InvalidDirDlg' Order='4'>
+       WIXUI_INSTALLDIR_VALID&lt;&gt;"1"
+      </Publish>
+
+      <Publish Dialog='LicenseAgreementDlg' Control='Next' Event='NewDialog' Value='InstallDirDlgShib'>
+       LicenseAccepted = "1"
+      </Publish>
+
+      <Publish Dialog='MaintenanceTypeDlg' Control='RepairButton' Event='NewDialog' Value='VerifyReadyDlg'>1</Publish>
+      <Publish Dialog='MaintenanceTypeDlg' Control='RemoveButton' Event='NewDialog' Value='VerifyReadyDlg'>1</Publish>
+
+
+      <Publish Dialog='MaintenanceWelcomeDlg' Control='Next' Event='NewDialog' Value='MaintenanceTypeDlg'>1</Publish>
+
+      <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='LicenseAgreementDlg'>
+        (NOT Installed) AND (NOT ALREADYINSTALLED)
+      </Publish>
+      <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='UpdateDlgShib'>
+        (NOT Installed) AND ALREADYINSTALLED
+      </Publish>
+      <Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='VerifyReadyDlg'>
+        Installed AND PATCH
+      </Publish>
+
+      <Publish Dialog='ExitDialog' Control='Finish' Event='EndDialog' Value='Return'>1</Publish>
+      <Publish Dialog='LicenseAgreementDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg'>1</Publish>
+      <Publish Dialog='MaintenanceTypeDlg' Control='Back' Event='NewDialog' Value='MaintenanceWelcomeDlg'>1</Publish>
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg'>
+        Installed AND PATCH
+      </Publish>
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='InstallDirDlgShib'>
+        (NOT Installed) AND (NOT ALREADYINSTALLED)
+      </Publish>
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='UpdateDlgShib'>
+        (NOT Installed) AND ALREADYINSTALLED
+      </Publish>
+      <Publish Dialog='VerifyReadyDlg' Control='Back' Event='NewDialog' Value='MaintenanceTypeDlg'>
+        Installed AND NOT PATCH
+      </Publish>
+
+    </UI>
+  </Fragment>
+</Wix>
index f6d1310..80091a4 100644 (file)
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-     Development, Inc. (UCAID) under one or more contributor license\r
-     agreements.  See the NOTICE file distributed with this work for\r
-     additional information regarding copyright ownership. The UCAID\r
-     licenses this file to You under the Apache License, Version 2.0\r
-     (the 'License'); you may not use this file except in compliance\r
-     with the License.  You may obtain a copy of the License at\r
-     \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
-     \r
-     Unless required by applicable law or agreed to in writing, software\r
-     distributed under the License is distributed on an 'AS IS' BASIS,\r
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-     implied.  See the License for the specific language governing\r
-     permissions and limitations under the License.  -->\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <!-- This file contains the description of the dialog which captures installation\r
-       values for first time installs -->\r
-  <Fragment>\r
-\r
-    <UI>\r
-\r
-      <!-- This Dialog sets up:\r
-           - INSTALLDIR\r
-           - INSTALL_32BIT (if a 64bit machine)\r
-           - INSTALL_ISAPI_FILTER (if IIS about)\r
-           - SHIB_FILE_EXTENSION (if IIS about)\r
-        -->\r
-\r
-      <Dialog Id='InstallDirDlgShib' Width='370' Height='270' Title='[ProductName] Setup'>\r
-        <!-- Stuff at the top: picture, some text, a line -->\r
-        <Control Id='TopBitMap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' Text='WixUI_Bmp_Banner' />\r
-        <Control Id='TopInfo' Type='Text' X='15' Y='6' Width='150' Height='12' \r
-                 Text='{\WixUI_Font_Title}Configure Shibboleth' Transparent='yes'/>\r
-        <Control Id='TopDetailed' Type='Text' X='25' Y='24' Width='320' Height='12' \r
-                 Text='Please choose where to install the Shibboleth SP and other installation options' Transparent='yes'/>\r
-        <Control Id='TopLine' Type='Line' X='0' Y='44' Width='370' Height='1' />\r
-\r
-        <!-- Buttons to control Shibboleth Setup -->\r
-        <Control Id='DescriptionLine1' Type='Text' X='25' Y='51' Height='12' Width='320' \r
-                 Text='The files for [ProductName] will be installed in the following folder.'/>\r
-\r
-        <Control Id='DescriptionLine2' Type='Text' X='25' Y='70' Height='12' Width='320' \r
-                 Text='To install into a different folder, click the Browse button, and select another folder.'/>\r
-\r
-        <Control Id='DescriptionLine3' Type='Text' X='25' Y='90' Height='24' Width='320' \r
-                 Text='You can choose not to install [ProductName] by clicking Cancel to exit the installer.' />\r
-\r
-        <!-- Where? -->\r
-        <Control Id='Dest' Type='Edit' X='25' Y='115' Width='228' Height='17' Property='INSTALLDIR' Text='[INSTALLDIR]' />\r
-        <Control Id='ChangeFolder' Type='PushButton' X='265' Y='115' Height='17' Width='56' Text='B&amp;rowse...'>\r
-          <Publish Event='SpawnDialog' Value='BrowseDlg' Order='1'>1</Publish>\r
-          <Publish Event='[_BrowseProperty]' Value='[WIXUI_INSTALLDIR]' Order='1'>1</Publish>\r
-        </Control>\r
-\r
-        <!-- Service? -->\r
-        <Control Id='InstallShibd' Type='Text' X='25' Y='148' Height='17' Width='235' \r
-                 Text='The Shibboleth Daemon will be installed as a service.' />\r
-\r
-        <!-- 32 Bits? -->\r
-        <Control Id='Install32Bit' Type='CheckBox' X='265' Y='146' Height='17' Width='80'\r
-                 Property='INSTALL_32BIT' CheckBoxValue='TRUE' \r
-                 Text='Run as 32-Bit'>\r
-          <Condition Action='show'>IS64BITINSTALL = "TRUE"</Condition>\r
-          <Condition Action='hide'>IS64BITINSTALL &lt;&gt; "TRUE"</Condition>\r
-        </Control>\r
-\r
-        <!-- ISAPI? -->\r
-        <Control Id='InstallISAPI' Type='CheckBox' X='25' Y='175' Height='17' Width='160'\r
-                 Property='INSTALL_ISAPI_FILTER' CheckBoxValue='TRUE' \r
-                 Text='Install ISAPI modules into IIS'>\r
-          <Condition Action='show'>IISMAJORVERSION</Condition>\r
-          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>\r
-        </Control>\r
-        <Control Id='FileExtensionText' Type='Text' X='185' Y='178' Height='17' Width='96'\r
-                 Text='IIS Script Extension'>\r
-          <Condition Action='show'>IISMAJORVERSION</Condition>\r
-          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>\r
-        </Control>\r
-        <Control Id='FileExtensionEdit' Type='Edit' X='285' Y='175' Height='17' Width='50'\r
-                 Property='SHIB_FILE_EXTENSION' Text='[SHIB_FILE_EXTENSION]'>\r
-          <Condition Action='show'>IISMAJORVERSION</Condition>\r
-          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>\r
-          <Condition Action='enable'>INSTALL_ISAPI_FILTER = "TRUE"</Condition>\r
-          <Condition Action='disable'>INSTALL_ISAPI_FILTER &lt;&gt; "TRUE"</Condition>\r
-        </Control>\r
-\r
-        <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->\r
-        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='1' />\r
-        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' Text='&amp;Back'>\r
-          <Publish  Event='NewDialog' Value='LicenseAgreementDlg'>1</Publish>\r
-        </Control>\r
-\r
-        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Text='&amp;Next' Default='yes'>\r
-          <Publish Event='SetTargetPath' Value='[WIXUI_INSTALLDIR]'>1</Publish>\r
-          <Publish Event='DoAction' Value='WixUIValidatePath' >\r
-            NOT WIXUI_DONTVALIDATEPATH\r
-          </Publish>\r
-          <Publish Event='SpawnDialog' Value='InvalidDirDlg' >\r
-            NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;"1"\r
-          </Publish>\r
-          <Publish Event='NewDialog' Value='VerifyReadyDlg'>\r
-            WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"\r
-          </Publish>\r
-        </Control>\r
-\r
-        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Text='&amp;Cancel' Cancel='yes'>\r
-          <Publish  Event='SpawnDialog' Value='CancelDlg'>1</Publish>\r
-        </Control>\r
-      </Dialog>\r
-\r
-    </UI>\r
-  </Fragment>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the 'License'); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an 'AS IS' BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- This file contains the description of the dialog which captures installation
+       values for first time installs -->
+  <Fragment>
+
+    <UI>
+
+      <!-- This Dialog sets up:
+           - INSTALLDIR
+           - INSTALL_32BIT (if a 64bit machine)
+           - INSTALL_ISAPI_FILTER (if IIS about)
+           - SHIB_FILE_EXTENSION (if IIS about)
+        -->
+
+      <Dialog Id='InstallDirDlgShib' Width='370' Height='270' Title='[ProductName] Setup'>
+        <!-- Stuff at the top: picture, some text, a line -->
+        <Control Id='TopBitMap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' Text='WixUI_Bmp_Banner' />
+        <Control Id='TopInfo' Type='Text' X='15' Y='6' Width='150' Height='12' 
+                 Text='{\WixUI_Font_Title}Configure Shibboleth' Transparent='yes'/>
+        <Control Id='TopDetailed' Type='Text' X='25' Y='24' Width='320' Height='12' 
+                 Text='Please choose where to install the Shibboleth SP and other installation options' Transparent='yes'/>
+        <Control Id='TopLine' Type='Line' X='0' Y='44' Width='370' Height='1' />
+
+        <!-- Buttons to control Shibboleth Setup -->
+        <Control Id='DescriptionLine1' Type='Text' X='25' Y='51' Height='12' Width='320' 
+                 Text='The files for [ProductName] will be installed in the following folder.'/>
+
+        <Control Id='DescriptionLine2' Type='Text' X='25' Y='70' Height='12' Width='320' 
+                 Text='To install into a different folder, click the Browse button, and select another folder.'/>
+
+        <Control Id='DescriptionLine3' Type='Text' X='25' Y='90' Height='24' Width='320' 
+                 Text='You can choose not to install [ProductName] by clicking Cancel to exit the installer.' />
+
+        <!-- Where? -->
+        <Control Id='Dest' Type='Edit' X='25' Y='115' Width='228' Height='17' Property='INSTALLDIR' Text='[INSTALLDIR]' />
+        <Control Id='ChangeFolder' Type='PushButton' X='265' Y='115' Height='17' Width='56' Text='B&amp;rowse...'>
+          <Publish Event='SpawnDialog' Value='BrowseDlg' Order='1'>1</Publish>
+          <Publish Event='[_BrowseProperty]' Value='[WIXUI_INSTALLDIR]' Order='1'>1</Publish>
+        </Control>
+
+        <!-- Service? -->
+        <Control Id='InstallShibd' Type='Text' X='25' Y='148' Height='17' Width='235' 
+                 Text='The Shibboleth Daemon will be installed as a service.' />
+
+        <!-- 32 Bits? -->
+        <Control Id='Install32Bit' Type='CheckBox' X='265' Y='146' Height='17' Width='80'
+                 Property='INSTALL_32BIT' CheckBoxValue='TRUE' 
+                 Text='Run as 32-Bit'>
+          <Condition Action='show'>IS64BITINSTALL = "TRUE"</Condition>
+          <Condition Action='hide'>IS64BITINSTALL &lt;&gt; "TRUE"</Condition>
+        </Control>
+
+        <!-- ISAPI? -->
+        <Control Id='InstallISAPI' Type='CheckBox' X='25' Y='175' Height='17' Width='160'
+                 Property='INSTALL_ISAPI_FILTER' CheckBoxValue='TRUE' 
+                 Text='Install ISAPI modules into IIS'>
+          <Condition Action='show'>IISMAJORVERSION</Condition>
+          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>
+        </Control>
+        <Control Id='FileExtensionText' Type='Text' X='185' Y='178' Height='17' Width='96'
+                 Text='IIS Script Extension'>
+          <Condition Action='show'>IISMAJORVERSION</Condition>
+          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>
+        </Control>
+        <Control Id='FileExtensionEdit' Type='Edit' X='285' Y='175' Height='17' Width='50'
+                 Property='SHIB_FILE_EXTENSION' Text='[SHIB_FILE_EXTENSION]'>
+          <Condition Action='show'>IISMAJORVERSION</Condition>
+          <Condition Action='hide'>NOT IISMAJORVERSION</Condition>
+          <Condition Action='enable'>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
+          <Condition Action='disable'>INSTALL_ISAPI_FILTER &lt;&gt; "TRUE"</Condition>
+        </Control>
+
+        <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
+        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='1' />
+        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' Text='&amp;Back'>
+          <Publish  Event='NewDialog' Value='LicenseAgreementDlg'>1</Publish>
+        </Control>
+
+        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Text='&amp;Next' Default='yes'>
+          <Publish Event='SetTargetPath' Value='[WIXUI_INSTALLDIR]'>1</Publish>
+          <Publish Event='DoAction' Value='WixUIValidatePath' >
+            NOT WIXUI_DONTVALIDATEPATH
+          </Publish>
+          <Publish Event='SpawnDialog' Value='InvalidDirDlg' >
+            NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID&lt;&gt;"1"
+          </Publish>
+          <Publish Event='NewDialog' Value='VerifyReadyDlg'>
+            WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"
+          </Publish>
+        </Control>
+
+        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Text='&amp;Cancel' Cancel='yes'>
+          <Publish  Event='SpawnDialog' Value='CancelDlg'>1</Publish>
+        </Control>
+      </Dialog>
+
+    </UI>
+  </Fragment>
+</Wix>
index 79a1660..569e3cd 100644 (file)
-<?xml version='1.0' encoding='UTF-8'?>\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-     Development, Inc. (UCAID) under one or more contributor license\r
-     agreements.  See the NOTICE file distributed with this work for\r
-     additional information regarding copyright ownership. The UCAID\r
-     licenses this file to You under the Apache License, Version 2.0\r
-     (the 'License'); you may not use this file except in compliance\r
-     with the License.  You may obtain a copy of the License at\r
-     \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
-     \r
-     Unless required by applicable law or agreed to in writing, software\r
-     distributed under the License is distributed on an 'AS IS' BASIS,\r
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-     implied.  See the License for the specific language governing\r
-     permissions and limitations under the License.  -->\r
-\r
-<?include Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <!--\r
-    This is where we put all the architecture neutral bits of the\r
-    Shibboleth install.  It turns out that it may not be all the\r
-    architecture insenstive stuff since some GUIDS may have moved\r
-  -->\r
-  <Fragment>\r
-    <!-- Files First -->\r
-    <!-- Configuration, licenses and documentation -->\r
-\r
-    <DirectoryRef Id='INSTALLDIR'>\r
-      <Directory Id='doc' Name='doc' >\r
-        <Directory Id='doc_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\doc' >\r
-          <Component Id='main.css' Guid='{EA1366EE-0FD1-42E7-9F3F-C19E6C0D12D6}'>\r
-            <File KeyPath='yes' Name='main.css' />\r
-          </Component>\r
-          <Component Id='CREDITS.txt' Guid='{9A792E0C-61F1-4D08-9672-BE82FFB6B7F1}'>\r
-            <File KeyPath='yes' Name='CREDITS.txt' />\r
-          </Component>\r
-          <Component Id='LICENSE.txt' Guid='{404E7A3C-22C2-4A02-8DC0-7D5C0B25DED1}'>\r
-            <File KeyPath='yes' Name='LICENSE.txt' />\r
-          </Component>\r
-          <Component Id='NOTICE.txt' Guid='{80619251-6754-480A-AFAA-D7398482053C}'>\r
-            <File KeyPath='yes' Name='NOTICE.txt' />\r
-          </Component>\r
-          <Component Id='README.txt' Guid='{2E5A28EE-B70B-402B-8E6F-72E8EC1EEF0D}'>\r
-            <File KeyPath='yes' Name='README.txt'/>\r
-          </Component>\r
-          <Component Id='RELEASE.txt' Guid='{5822AF4E-BE53-4952-B662-6BE2D3913D31}'>\r
-            <File KeyPath='yes' Name='RELEASE.txt' />\r
-          </Component>\r
-        </Directory><!-- doc_shibboleth -->\r
-      </Directory><!-- doc -->\r
-      <Directory Id='etc' Name='etc' >\r
-        <Directory Id='etc_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>\r
-          <Component Id='upgrade.xsl' Guid='{D8D1270C-2F85-4465-8EC0-F5F30A2B3EDD}'>\r
-            <File KeyPath='yes' Name='upgrade.xsl' />\r
-          </Component>\r
-          <Component Id='example_metadata.xml' Guid='{D9852008-249D-405D-8059-5DAD307D2723}' Permanent='yes'>\r
-            <File KeyPath='yes' Name='example-metadata.xml' />\r
-          </Component>\r
-          <Component Id='example_shibboleth2.xml' Guid='{85415A41-2B4E-406F-9CFC-63CFC360A9C7}' Permanent='yes'>\r
-            <File KeyPath='yes' Name='example-shibboleth2.xml' />\r
-          </Component>\r
-          <Component Id='keygen.bat' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'>\r
-            <File KeyPath='yes' Name='keygen.bat'/>\r
-          </Component>\r
-          <Component Id='xsltproc.js' Guid='{B87F4A53-3C37-45DA-BE6F-C46790FA7C2D}'>\r
-            <File KeyPath='yes' Name='xsltproc.js' />\r
-          </Component>\r
-          <Directory Id='etc_shibboleth_dist' Name='dist' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>\r
-            <Component Id='apache.config.in' Guid='{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}'>\r
-              <File KeyPath='yes' Name='apache.config.in' />\r
-            </Component>\r
-            <Component Id='apache2.config.in' Guid='{85BF72A1-FBA8-4955-ACCF-ABC83B1292C9}'>\r
-              <File KeyPath='yes' Name='apache2.config.in' />\r
-            </Component>\r
-            <Component Id='apache22.config.in' Guid='{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}'>\r
-              <File KeyPath='yes' Name='apache22.config.in' />\r
-            </Component>\r
-            <Component Id='apache24.config.in' Guid='{3562B68A-E54A-4F1B-9F10-BDACB5FFE8CB}'>\r
-              <File KeyPath='yes' Name='apache24.config.in' />\r
-            </Component>\r
-            <Component Id='sslError.html' Guid='{A74BA230-C49F-4151-BBF4-AA80D554D099}'>\r
-              <File KeyPath='yes' Name='sslError.html' />\r
-            </Component>\r
-            <Component Id='bindingTemplate.html' Guid='{F5A3A434-9209-43EC-9314-1F705055DDEC}'>\r
-              <File KeyPath='yes' Name='bindingTemplate.html' />\r
-            </Component>\r
-            <Component Id='globalLogout.html' Guid='{E65F580D-5489-4D79-A8FC-F9FFED666FC1}'>\r
-              <File KeyPath='yes' Name='globalLogout.html' />\r
-            </Component>\r
-            <Component Id='localLogout.html' Guid='{70FA3A47-A950-4074-BC13-C56D94497BD9}'>\r
-              <File KeyPath='yes' Name='localLogout.html' />\r
-            </Component>\r
-            <Component Id='attribute_map.xml' Guid='{878C9456-E65F-4541-A0FA-975379EAC6B6}'>\r
-              <File KeyPath='yes' Name='attribute-map.xml' />\r
-            </Component>\r
-            <Component Id='attribute_policy.xml' Guid='{55B88F7B-E2EA-4B70-87B7-33C566B9F992}'>\r
-              <File KeyPath='yes' Name='attribute-policy.xml'/>\r
-            </Component>\r
-            <Component Id='shibboleth2.xml' Guid='{E520FEDE-3F0E-47C6-9345-47223B82825A}'>\r
-              <File KeyPath='yes' Name='shibboleth2.xml' Source='$(var.SPBuildDirectory)\cpp-sp\configs\win-shibboleth2.xml' />\r
-            </Component>\r
-            <Component Id='console.logger' Guid='{8AC85980-32B9-4EA2-9245-167FB1AB2570}'>\r
-              <File KeyPath='yes' Name='console.logger' />\r
-            </Component>\r
-            <Component Id='discoveryTemplate.html' Guid='{A9573113-4387-46DD-A636-84482AF2C672}'>\r
-              <File KeyPath='yes' Name='discoveryTemplate.html' />\r
-            </Component>\r
-            <Component Id='postTemplate.html' Guid='{5B7111E8-8E04-42F1-AB02-E47AFB7C3D28}'>\r
-              <File KeyPath='yes' Name='postTemplate.html' />\r
-            </Component>\r
-            <Component Id='partialLogout.html' Guid='{E1F6208B-3C70-4632-B84C-C7D141DC4192}'>\r
-              <File KeyPath='yes' Name='partialLogout.html' />\r
-            </Component>\r
-            <Component Id='protocols.xml' Guid='{B226CAAC-2D18-411A-9FBF-3FE237EBEF4D}'>\r
-              <File KeyPath='yes' Name='protocols.xml' />\r
-            </Component>\r
-            <Component Id='security_policy.xml' Guid='{0EC04525-FCCF-4B60-8797-9B0CEC222B8C}'>\r
-              <File KeyPath='yes' Name='security-policy.xml' />\r
-            </Component>\r
-            <Component Id='accessError.html' Guid='{6FAA81A0-A020-4E60-A37D-1EC4D0D5FD06}'>\r
-              <File KeyPath='yes' Name='accessError.html' />\r
-            </Component>\r
-            <Component Id='attrChecker.html' Guid='{BDF4837C-A887-4F1C-841C-DC13DFF8A46E}'>\r
-              <File KeyPath='yes' Name='attrChecker.html' />\r
-            </Component>\r
-            <Component Id='metadataError.html' Guid='{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}'>\r
-              <File KeyPath='yes' Name='metadataError.html' />\r
-            </Component>\r
-            <Component Id='native.logger.in' Guid='{8586D4C7-E237-4C7F-BC79-DE0B06473395}'>\r
-              <File KeyPath='yes' Name='native.logger.in' />\r
-            </Component>\r
-            <Component Id='sessionError.html' Guid='{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}'>\r
-              <File KeyPath='yes' Name='sessionError.html' />\r
-            </Component>\r
-            <Component Id='shibd.logger.in' Guid='{D8DA3D14-F779-4691-A883-4995158D2A74}'>\r
-              <File KeyPath='yes' Name='shibd.logger.in' />\r
-            </Component>\r
-          </Directory><!-- etc_shibboleth_dist -->\r
-        </Directory><!-- etc_shibboleth -->\r
-      </Directory><!-- etc_dist -->\r
-      <Directory Id='var' Name='var'>\r
-        <Directory Id='var_cache' Name='cache'>\r
-          <Directory Id='var_cache_shibboleth' Name='shibboleth'>\r
-            <Component Id='var_cache_shibboleth_folder' Guid='{6C978639-DDCF-40BD-90F8-690B3E05586C}'>\r
-              <CreateFolder />\r
-              <!-- Kill off old env variable from pre 2.5 install.\r
-                   Do it here so it is in the correct tables -->\r
-              <Environment Id='SHIBSP_SCHEMAS' Action='remove' Name='SHIBSP_SCHEMAS'/>\r
-            </Component>\r
-          </Directory><!-- var_cache_shibboleth -->\r
-        </Directory><!-- var_cache -->\r
-        <Directory Id='var_log' Name='log'>\r
-          <Directory Id='var_log_shibboleth' Name='shibboleth'>\r
-            <Component Id='var_log_shibboleth_folder' Guid='{2BFC84E4-634B-4D70-910A-D5640739C8C8}'>\r
-              <CreateFolder />\r
-            </Component>\r
-          </Directory><!-- var_log_shibboleth -->\r
-        </Directory><!-- var_log -->\r
-        <Directory Id='var_run' Name='run'>\r
-          <Directory Id='var_run_shibboleth' Name='shibboleth'>\r
-            <Component Id='var_run_shibboleth_folder' Guid='{35E176B1-965A-4571-B24E-E0C8E69B0459}'>\r
-              <CreateFolder />\r
-            </Component>\r
-          </Directory><!-- var_run_shibboleth -->\r
-        </Directory><!-- var_run -->\r
-      </Directory><!-- var -->\r
-    </DirectoryRef>\r
-\r
-    <!-- Stuff to do the editing and copy of the files -->\r
-\r
-    <Binary Id='EditConfigFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />\r
-\r
-    <CustomAction Id='EditConfigFiles' \r
-                  BinaryKey='EditConfigFileSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR];@;[IS64BITINSTALL];@;[INSTALL_32BIT]' />\r
-\r
-    <CustomAction Id='KeyGen' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetKeyGen' Property='KeyGen' Value='&quot;[INSTALLDIR]etc\shibboleth\keygen.bat&quot;' />\r
-\r
-    <!-- Stuff to configure IIS.  This is a one-shot (first install/last uninstall) -->\r
-\r
-    <Binary Id='install_isapi'\r
-            SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_install_isapi_filter.vbs-wix'/>\r
-    <Binary Id='uninstall_isapi' \r
-            SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_uninstall_isapi_filter.vbs-wix'/>\r
-\r
-    <CustomAction Id='SetShibInstallISAPIFilter32' Property='ShibInstallISAPIFilter' \r
-                  Value='[INSTALLDIR];@;[INSTALLDIR]lib\shibboleth\isapi_shib.dll;@;[SHIB_FILE_EXTENSION]' />\r
-    <CustomAction Id='SetShibInstallISAPIFilter64' Property='ShibInstallISAPIFilter' \r
-                  Value='[INSTALLDIR];@;[INSTALLDIR]lib64\shibboleth\isapi_shib.dll;@;[SHIB_FILE_EXTENSION]' />\r
-    <CustomAction Id='ShibInstallISAPIFilter' BinaryKey='install_isapi' \r
-                  VBScriptCall='' Execute='deferred' Impersonate='no' />\r
-\r
-    <CustomAction Id='SetShibUninstallISAPIFilter' Property='ShibUninstallISAPIFilter' Value='[INSTALLDIR]'/>\r
-    <CustomAction Id='ShibUninstallISAPIFilter' BinaryKey='uninstall_isapi' \r
-                  VBScriptCall='' Execute='deferred' Impersonate='no' />\r
-\r
-    <CustomAction Id='ServicePath64' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetServicePath64' Property='ServicePath64' Value='&quot;[INSTALLDIR]etc\shibboleth\SetService64.bat&quot;' />\r
-\r
-    <!-- Inherit the installation dir if one was set -->\r
-    <CustomAction Id='InheritInstallDir' Property='INSTALLDIR' Value='[OLD_INSTALLDIR]' />\r
-    <CustomAction Id='InheritInstallDir64' Property='INSTALLDIR' Value='[OLD_INSTALLDIR64]' />\r
-\r
-    <InstallUISequence>\r
-      <!-- All we need to sequence here is setting up inherited INSTALLDIR -->\r
-\r
-      <!-- inherit installationDir if there is something to inherit -->\r
-      <Custom Action='InheritInstallDir' After='AppSearch'>\r
-        OLD_INSTALLDIR\r
-      </Custom>\r
-      <Custom Action='InheritInstallDir64' After='InheritInstallDir'>\r
-        (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64\r
-      </Custom>\r
-    </InstallUISequence>\r
-\r
-    <InstallExecuteSequence>\r
-      <Custom Action='SetEditConfigFiles' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='EditConfigFiles' After='InstallFiles'>NOT Installed</Custom>\r
-\r
-      <Custom Action='SetKeyGen' Before='CostInitialize'>NOT Installed</Custom>\r
-      <!-- Run KeyGen after WriteEnvironmentStrings so the path is set -->\r
-      <Custom Action='KeyGen' After='WriteEnvironmentStrings'>NOT Installed</Custom>\r
-\r
-      <!-- Install IIS if\r
-           - this is an install\r
-           - AND we were told to\r
-           - AND this is NOT an upgrade\r
-        -->\r
-      <Custom Action='SetShibInstallISAPIFilter32' Before='CostInitialize'>\r
-        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND (INSTALL_32BIT) AND IISMAJORVERSION\r
-      </Custom>\r
-      <Custom Action='SetShibInstallISAPIFilter64' Before='CostInitialize'>\r
-        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND IISMAJORVERSION\r
-      </Custom>\r
-      <Custom Action='ShibInstallISAPIFilter' After='InstallFiles'>\r
-        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND IISMAJORVERSION\r
-      </Custom>\r
-      <ScheduleReboot Before='InstallFinalize'>\r
-        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND IISMAJORVERSION\r
-      </ScheduleReboot>\r
-\r
-\r
-      <!-- (try to) Uninstall IIS if\r
-           - this is an uninstall\r
-           - this is not an upgrade\r
-           -->\r
-      <Custom Action='SetShibUninstallISAPIFilter' \r
-              After='CostFinalize'>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</Custom>\r
-      <Custom Action='ShibUninstallISAPIFilter' \r
-              Before='RemoveFiles'>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</Custom>\r
-\r
-      <!-- set service path to 64 bit one if this is an install and if we were told to -->\r
-\r
-      <Custom Action='SetServicePath64' Before='CostInitialize'>\r
-        (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")\r
-      </Custom>\r
-      <Custom Action='ServicePath64' After='InstallServices'>\r
-        (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")\r
-      </Custom>\r
-\r
-      <!-- Duplicate actions from the UI case -->\r
-      <Custom Action='InheritInstallDir' After='AppSearch'>\r
-        OLD_INSTALLDIR\r
-      </Custom>\r
-      <Custom Action='InheritInstallDir64' After='InheritInstallDir'>\r
-        (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64\r
-      </Custom>\r
-\r
-      <!-- Do not mess with SCM if this is an upgrade -->\r
-\r
-      <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED)</InstallServices>\r
-      <StartServices>(NOT Installed)</StartServices>\r
-      <DeleteServices>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</DeleteServices>\r
-\r
-    </InstallExecuteSequence>\r
-  </Fragment>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the 'License'); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an 'AS IS' BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<?include Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!--
+    This is where we put all the architecture neutral bits of the
+    Shibboleth install.  It turns out that it may not be all the
+    architecture insenstive stuff since some GUIDS may have moved
+  -->
+  <Fragment>
+    <!-- Files First -->
+    <!-- Configuration, licenses and documentation -->
+
+    <DirectoryRef Id='INSTALLDIR'>
+      <Directory Id='doc' Name='doc' >
+        <Directory Id='doc_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\doc' >
+          <Component Id='main.css' Guid='{EA1366EE-0FD1-42E7-9F3F-C19E6C0D12D6}'>
+            <File KeyPath='yes' Name='main.css' />
+          </Component>
+          <Component Id='CREDITS.txt' Guid='{9A792E0C-61F1-4D08-9672-BE82FFB6B7F1}'>
+            <File KeyPath='yes' Name='CREDITS.txt' />
+          </Component>
+          <Component Id='LICENSE.txt' Guid='{404E7A3C-22C2-4A02-8DC0-7D5C0B25DED1}'>
+            <File KeyPath='yes' Name='LICENSE.txt' />
+          </Component>
+          <Component Id='NOTICE.txt' Guid='{80619251-6754-480A-AFAA-D7398482053C}'>
+            <File KeyPath='yes' Name='NOTICE.txt' />
+          </Component>
+          <Component Id='README.txt' Guid='{2E5A28EE-B70B-402B-8E6F-72E8EC1EEF0D}'>
+            <File KeyPath='yes' Name='README.txt'/>
+          </Component>
+          <Component Id='RELEASE.txt' Guid='{5822AF4E-BE53-4952-B662-6BE2D3913D31}'>
+            <File KeyPath='yes' Name='RELEASE.txt' />
+          </Component>
+        </Directory><!-- doc_shibboleth -->
+      </Directory><!-- doc -->
+      <Directory Id='etc' Name='etc' >
+        <Directory Id='etc_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>
+          <Component Id='upgrade.xsl' Guid='{D8D1270C-2F85-4465-8EC0-F5F30A2B3EDD}'>
+            <File KeyPath='yes' Name='upgrade.xsl' />
+          </Component>
+          <Component Id='example_metadata.xml' Guid='{D9852008-249D-405D-8059-5DAD307D2723}' Permanent='yes'>
+            <File KeyPath='yes' Name='example-metadata.xml' />
+          </Component>
+          <Component Id='example_shibboleth2.xml' Guid='{85415A41-2B4E-406F-9CFC-63CFC360A9C7}' Permanent='yes'>
+            <File KeyPath='yes' Name='example-shibboleth2.xml' />
+          </Component>
+          <Component Id='keygen.bat' Guid='{A5BBCB8B-42B3-4402-B66D-66D2971F509F}'>
+            <File KeyPath='yes' Name='keygen.bat'/>
+          </Component>
+          <Component Id='xsltproc.js' Guid='{B87F4A53-3C37-45DA-BE6F-C46790FA7C2D}'>
+            <File KeyPath='yes' Name='xsltproc.js' />
+          </Component>
+          <Directory Id='etc_shibboleth_dist' Name='dist' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>
+            <Component Id='apache.config.in' Guid='{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}'>
+              <File KeyPath='yes' Name='apache.config.in' />
+            </Component>
+            <Component Id='apache2.config.in' Guid='{85BF72A1-FBA8-4955-ACCF-ABC83B1292C9}'>
+              <File KeyPath='yes' Name='apache2.config.in' />
+            </Component>
+            <Component Id='apache22.config.in' Guid='{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}'>
+              <File KeyPath='yes' Name='apache22.config.in' />
+            </Component>
+            <Component Id='apache24.config.in' Guid='{3562B68A-E54A-4F1B-9F10-BDACB5FFE8CB}'>
+              <File KeyPath='yes' Name='apache24.config.in' />
+            </Component>
+            <Component Id='sslError.html' Guid='{A74BA230-C49F-4151-BBF4-AA80D554D099}'>
+              <File KeyPath='yes' Name='sslError.html' />
+            </Component>
+            <Component Id='bindingTemplate.html' Guid='{F5A3A434-9209-43EC-9314-1F705055DDEC}'>
+              <File KeyPath='yes' Name='bindingTemplate.html' />
+            </Component>
+            <Component Id='globalLogout.html' Guid='{E65F580D-5489-4D79-A8FC-F9FFED666FC1}'>
+              <File KeyPath='yes' Name='globalLogout.html' />
+            </Component>
+            <Component Id='localLogout.html' Guid='{70FA3A47-A950-4074-BC13-C56D94497BD9}'>
+              <File KeyPath='yes' Name='localLogout.html' />
+            </Component>
+            <Component Id='attribute_map.xml' Guid='{878C9456-E65F-4541-A0FA-975379EAC6B6}'>
+              <File KeyPath='yes' Name='attribute-map.xml' />
+            </Component>
+            <Component Id='attribute_policy.xml' Guid='{55B88F7B-E2EA-4B70-87B7-33C566B9F992}'>
+              <File KeyPath='yes' Name='attribute-policy.xml'/>
+            </Component>
+            <Component Id='shibboleth2.xml' Guid='{E520FEDE-3F0E-47C6-9345-47223B82825A}'>
+              <File KeyPath='yes' Name='shibboleth2.xml' Source='$(var.SPBuildDirectory)\cpp-sp\configs\win-shibboleth2.xml' />
+            </Component>
+            <Component Id='console.logger' Guid='{8AC85980-32B9-4EA2-9245-167FB1AB2570}'>
+              <File KeyPath='yes' Name='console.logger' />
+            </Component>
+            <Component Id='discoveryTemplate.html' Guid='{A9573113-4387-46DD-A636-84482AF2C672}'>
+              <File KeyPath='yes' Name='discoveryTemplate.html' />
+            </Component>
+            <Component Id='postTemplate.html' Guid='{5B7111E8-8E04-42F1-AB02-E47AFB7C3D28}'>
+              <File KeyPath='yes' Name='postTemplate.html' />
+            </Component>
+            <Component Id='partialLogout.html' Guid='{E1F6208B-3C70-4632-B84C-C7D141DC4192}'>
+              <File KeyPath='yes' Name='partialLogout.html' />
+            </Component>
+            <Component Id='protocols.xml' Guid='{B226CAAC-2D18-411A-9FBF-3FE237EBEF4D}'>
+              <File KeyPath='yes' Name='protocols.xml' />
+            </Component>
+            <Component Id='security_policy.xml' Guid='{0EC04525-FCCF-4B60-8797-9B0CEC222B8C}'>
+              <File KeyPath='yes' Name='security-policy.xml' />
+            </Component>
+            <Component Id='accessError.html' Guid='{6FAA81A0-A020-4E60-A37D-1EC4D0D5FD06}'>
+              <File KeyPath='yes' Name='accessError.html' />
+            </Component>
+            <Component Id='attrChecker.html' Guid='{BDF4837C-A887-4F1C-841C-DC13DFF8A46E}'>
+              <File KeyPath='yes' Name='attrChecker.html' />
+            </Component>
+            <Component Id='metadataError.html' Guid='{8C46D04A-A943-4FA4-AFCB-9B040306C2C0}'>
+              <File KeyPath='yes' Name='metadataError.html' />
+            </Component>
+            <Component Id='native.logger.in' Guid='{8586D4C7-E237-4C7F-BC79-DE0B06473395}'>
+              <File KeyPath='yes' Name='native.logger.in' />
+            </Component>
+            <Component Id='sessionError.html' Guid='{8AA240B3-DC5D-4687-B321-4F5E1BAEA820}'>
+              <File KeyPath='yes' Name='sessionError.html' />
+            </Component>
+            <Component Id='shibd.logger.in' Guid='{D8DA3D14-F779-4691-A883-4995158D2A74}'>
+              <File KeyPath='yes' Name='shibd.logger.in' />
+            </Component>
+          </Directory><!-- etc_shibboleth_dist -->
+        </Directory><!-- etc_shibboleth -->
+      </Directory><!-- etc_dist -->
+      <Directory Id='var' Name='var'>
+        <Directory Id='var_cache' Name='cache'>
+          <Directory Id='var_cache_shibboleth' Name='shibboleth'>
+            <Component Id='var_cache_shibboleth_folder' Guid='{6C978639-DDCF-40BD-90F8-690B3E05586C}'>
+              <CreateFolder />
+              <!-- Kill off old env variable from pre 2.5 install.
+                   Do it here so it is in the correct tables -->
+              <Environment Id='SHIBSP_SCHEMAS' Action='remove' Name='SHIBSP_SCHEMAS'/>
+            </Component>
+          </Directory><!-- var_cache_shibboleth -->
+        </Directory><!-- var_cache -->
+        <Directory Id='var_log' Name='log'>
+          <Directory Id='var_log_shibboleth' Name='shibboleth'>
+            <Component Id='var_log_shibboleth_folder' Guid='{2BFC84E4-634B-4D70-910A-D5640739C8C8}'>
+              <CreateFolder />
+            </Component>
+          </Directory><!-- var_log_shibboleth -->
+        </Directory><!-- var_log -->
+        <Directory Id='var_run' Name='run'>
+          <Directory Id='var_run_shibboleth' Name='shibboleth'>
+            <Component Id='var_run_shibboleth_folder' Guid='{35E176B1-965A-4571-B24E-E0C8E69B0459}'>
+              <CreateFolder />
+            </Component>
+          </Directory><!-- var_run_shibboleth -->
+        </Directory><!-- var_run -->
+      </Directory><!-- var -->
+    </DirectoryRef>
+
+    <!-- Stuff to do the editing and copy of the files -->
+
+    <Binary Id='EditConfigFileSrc' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />
+
+    <CustomAction Id='EditConfigFiles' 
+                  BinaryKey='EditConfigFileSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR];@;[IS64BITINSTALL];@;[INSTALL_32BIT]' />
+
+    <CustomAction Id='KeyGen' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetKeyGen' Property='KeyGen' Value='&quot;[INSTALLDIR]etc\shibboleth\keygen.bat&quot;' />
+
+    <!-- Stuff to configure IIS.  This is a one-shot (first install/last uninstall) -->
+
+    <Binary Id='install_isapi'
+            SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_install_isapi_filter.vbs-wix'/>
+    <Binary Id='uninstall_isapi' 
+            SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\scripts\shib_uninstall_isapi_filter.vbs-wix'/>
+
+    <CustomAction Id='SetShibInstallISAPIFilter32' Property='ShibInstallISAPIFilter' 
+                  Value='[INSTALLDIR];@;[INSTALLDIR]lib\shibboleth\isapi_shib.dll;@;[SHIB_FILE_EXTENSION]' />
+    <CustomAction Id='SetShibInstallISAPIFilter64' Property='ShibInstallISAPIFilter' 
+                  Value='[INSTALLDIR];@;[INSTALLDIR]lib64\shibboleth\isapi_shib.dll;@;[SHIB_FILE_EXTENSION]' />
+    <CustomAction Id='ShibInstallISAPIFilter' BinaryKey='install_isapi' 
+                  VBScriptCall='' Execute='deferred' Impersonate='no' />
+
+    <CustomAction Id='SetShibUninstallISAPIFilter' Property='ShibUninstallISAPIFilter' Value='[INSTALLDIR]'/>
+    <CustomAction Id='ShibUninstallISAPIFilter' BinaryKey='uninstall_isapi' 
+                  VBScriptCall='' Execute='deferred' Impersonate='no' />
+
+    <CustomAction Id='ServicePath64' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />
+    <CustomAction Id='SetServicePath64' Property='ServicePath64' Value='&quot;[INSTALLDIR]etc\shibboleth\SetService64.bat&quot;' />
+
+    <!-- Inherit the installation dir if one was set -->
+    <CustomAction Id='InheritInstallDir' Property='INSTALLDIR' Value='[OLD_INSTALLDIR]' />
+    <CustomAction Id='InheritInstallDir64' Property='INSTALLDIR' Value='[OLD_INSTALLDIR64]' />
+
+    <InstallUISequence>
+      <!-- All we need to sequence here is setting up inherited INSTALLDIR -->
+
+      <!-- inherit installationDir if there is something to inherit -->
+      <Custom Action='InheritInstallDir' After='AppSearch'>
+        OLD_INSTALLDIR
+      </Custom>
+      <Custom Action='InheritInstallDir64' After='InheritInstallDir'>
+        (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64
+      </Custom>
+    </InstallUISequence>
+
+    <InstallExecuteSequence>
+      <Custom Action='SetEditConfigFiles' Before='CostInitialize'>NOT Installed</Custom>
+      <Custom Action='EditConfigFiles' After='InstallFiles'>NOT Installed</Custom>
+
+      <Custom Action='SetKeyGen' Before='CostInitialize'>NOT Installed</Custom>
+      <!-- Run KeyGen after WriteEnvironmentStrings so the path is set -->
+      <Custom Action='KeyGen' After='WriteEnvironmentStrings'>NOT Installed</Custom>
+
+      <!-- Install IIS if
+           - this is an install
+           - AND we were told to
+           - AND this is NOT an upgrade
+        -->
+      <Custom Action='SetShibInstallISAPIFilter32' Before='CostInitialize'>
+        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND (INSTALL_32BIT) AND IISMAJORVERSION
+      </Custom>
+      <Custom Action='SetShibInstallISAPIFilter64' Before='CostInitialize'>
+        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND IISMAJORVERSION
+      </Custom>
+      <Custom Action='ShibInstallISAPIFilter' After='InstallFiles'>
+        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND IISMAJORVERSION
+      </Custom>
+      <ScheduleReboot Before='InstallFinalize'>
+        (NOT Installed) AND (INSTALL_ISAPI_FILTER = "TRUE") AND (NOT ALREADYINSTALLED) AND IISMAJORVERSION
+      </ScheduleReboot>
+
+
+      <!-- (try to) Uninstall IIS if
+           - this is an uninstall
+           - this is not an upgrade
+           -->
+      <Custom Action='SetShibUninstallISAPIFilter' 
+              After='CostFinalize'>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</Custom>
+      <Custom Action='ShibUninstallISAPIFilter' 
+              Before='RemoveFiles'>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</Custom>
+
+      <!-- set service path to 64 bit one if this is an install and if we were told to -->
+
+      <Custom Action='SetServicePath64' Before='CostInitialize'>
+        (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
+      </Custom>
+      <Custom Action='ServicePath64' After='InstallServices'>
+        (NOT Installed) AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")
+      </Custom>
+
+      <!-- Duplicate actions from the UI case -->
+      <Custom Action='InheritInstallDir' After='AppSearch'>
+        OLD_INSTALLDIR
+      </Custom>
+      <Custom Action='InheritInstallDir64' After='InheritInstallDir'>
+        (NOT OLD_INSTALLDIR) AND OLD_INSTALLDIR64
+      </Custom>
+
+      <!-- Do not mess with SCM if this is an upgrade -->
+
+      <InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED)</InstallServices>
+      <StartServices>(NOT Installed)</StartServices>
+      <DeleteServices>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</DeleteServices>
+
+    </InstallExecuteSequence>
+  </Fragment>
+</Wix>
index 99e1cf2..fa04af6 100644 (file)
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the 'License'); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an 'AS IS' BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <!--\r
-    This is where we put all the architecture neutral bits of the\r
-    Shibboleth install.  It turns out that it may not be all the\r
-    architecture insenstive stuff since some GUIDS may have moved\r
-  -->\r
-  <Fragment>\r
-\r
-    <!-- Previous version search -->\r
-    <Property Id='SHIB_OLDVERSION_64' Value='none' Secure='yes'>\r
-      <RegistrySearch Id='SP_2_2_1_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_4_1_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_4_2_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP_2_4_3_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_3_0_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_4_0_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}' \r
-                      Name='DisplayName' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_1_0_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_2_0_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-      <RegistrySearch Id='SP2_3_1_64' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}' \r
-                      Name='DisplayVersion' Type='raw' Win64='yes' />\r
-    </Property>\r
-\r
-    <Property Id='OLD_INSTALLDIR64' Secure='yes'>\r
-      <RegistrySearch Id='OldInstallDir64' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                      Name='InstallDir' Type='directory' Win64='yes'/>\r
-    </Property>\r
-\r
-    <Property Id='OLD_INSTALL_ISAPI_FILTER64' Secure='yes'>\r
-      <RegistrySearch Id='OldInstallIsapi64' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                      Name='InstallIsapi' Type='raw' Win64='yes'/>\r
-    </Property>\r
-\r
-    <!-- 64 bit only -->\r
-    <Property Id='OLD_INSTALL_32BIT' Secure='yes'>\r
-      <RegistrySearch Id='OldInstall32Bit' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                      Name='Install32Bit' Type='raw' Win64='yes'/>\r
-    </Property>\r
-\r
-    <DirectoryRef Id='bin64'>\r
-      <!-- Save the Captured parameters into the registry -->\r
-      <Component Id='TargetDir64' Guid='{E89D3028-5415-4874-9CBC-806A2064C613}' Win64='yes'>\r
-        <RegistryValue Id='TargetDir64'  Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                       Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />\r
-      </Component>\r
-\r
-      <Component Id='Install32Bit64' Guid='{9A0181FE-6252-4C2E-8828-70281DCC3825}' Win64='yes'>\r
-        <RegistryValue Id='Install32Bit64'  Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                       Name='Install32Bit' Value='[INSTALL_32BIT]' Type='string' KeyPath='yes' />\r
-      </Component>\r
-\r
-      <Component Id='InstallIsapi64' Guid='{288F97F5-E2E8-48DB-8291-B8445B77BA45}' Win64='yes'>\r
-        <Condition>IISMAJORVERSION</Condition>\r
-        <RegistryValue Id='InstallIsapi64'  Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                       Name='InstallIsapi' Value='[INSTALL_ISAPI_FILTER]' Type='string' KeyPath='yes' />\r
-      </Component>\r
-\r
-      <Component Id='file_extension64' Guid='{F17BED16-5988-4F9E-82E0-1D4DCB69EC26}' Win64='yes'>\r
-        <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>\r
-        <RegistryValue Id='FileExtension64' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                       Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />\r
-      </Component>\r
-\r
-      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'  Permanent='yes'>\r
-        <File Id='shib64.ico' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico'/>\r
-        <RegistryValue Id='DisplayIcon64' Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' \r
-                       Name='DisplayIcon' Value='[#shib64.ico],0' Type='string' />\r
-      </Component>\r
-    </DirectoryRef>\r
-  </Fragment>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!--
+    This is where we put all the architecture neutral bits of the
+    Shibboleth install.  It turns out that it may not be all the
+    architecture insenstive stuff since some GUIDS may have moved
+  -->
+  <Fragment>
+
+    <!-- Previous version search -->
+    <Property Id='SHIB_OLDVERSION_64' Value='none' Secure='yes'>
+      <RegistrySearch Id='SP_2_2_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_2_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP_2_4_3_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_3_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_4_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}' 
+                      Name='DisplayName' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_1_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_2_0_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+      <RegistrySearch Id='SP2_3_1_64' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}' 
+                      Name='DisplayVersion' Type='raw' Win64='yes' />
+    </Property>
+
+    <Property Id='OLD_INSTALLDIR64' Secure='yes'>
+      <RegistrySearch Id='OldInstallDir64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallDir' Type='directory' Win64='yes'/>
+    </Property>
+
+    <Property Id='OLD_INSTALL_ISAPI_FILTER64' Secure='yes'>
+      <RegistrySearch Id='OldInstallIsapi64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallIsapi' Type='raw' Win64='yes'/>
+    </Property>
+
+    <!-- 64 bit only -->
+    <Property Id='OLD_INSTALL_32BIT' Secure='yes'>
+      <RegistrySearch Id='OldInstall32Bit' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='Install32Bit' Type='raw' Win64='yes'/>
+    </Property>
+
+    <DirectoryRef Id='bin64'>
+      <!-- Save the Captured parameters into the registry -->
+      <Component Id='TargetDir64' Guid='{E89D3028-5415-4874-9CBC-806A2064C613}' Win64='yes'>
+        <RegistryValue Id='TargetDir64'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='Install32Bit64' Guid='{9A0181FE-6252-4C2E-8828-70281DCC3825}' Win64='yes'>
+        <RegistryValue Id='Install32Bit64'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='Install32Bit' Value='[INSTALL_32BIT]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='InstallIsapi64' Guid='{288F97F5-E2E8-48DB-8291-B8445B77BA45}' Win64='yes'>
+        <Condition>IISMAJORVERSION</Condition>
+        <RegistryValue Id='InstallIsapi64'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallIsapi' Value='[INSTALL_ISAPI_FILTER]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='file_extension64' Guid='{F17BED16-5988-4F9E-82E0-1D4DCB69EC26}' Win64='yes'>
+        <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
+        <RegistryValue Id='FileExtension64' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'  Permanent='yes'>
+        <File Id='shib64.ico' KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico'/>
+        <RegistryValue Id='DisplayIcon64' Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' 
+                       Name='DisplayIcon' Value='[#shib64.ico],0' Type='string' />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+</Wix>
index c9b4906..d100099 100644 (file)
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the 'License'); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an 'AS IS' BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<?include Versions.wxi ?>\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <!--\r
-    This is where we put all the architecture neutral bits of the\r
-    Shibboleth install.  It turns out that it may not be all the\r
-    architecture insenstive stuff since some GUIDS may have moved\r
-  -->\r
-  <Fragment>\r
-    <!-- Previous version search -->\r
-    <Property Id='SHIB_OLDVERSION' Value='none' Secure='yes'>\r
-      <RegistrySearch Id='SP2_2_1' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2A19CDBC-E0DA-452C-8B38-1AA9DB4D579F}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_4_1_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A5D2DE8D-2A4A-4D74-98B5-BA448DD4DC39}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_4_2_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8280E58C-D290-42CD-9425-BCC0BA439649}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_4_3_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B9F4513-3141-4270-B1F5-43A467235B6B}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_2_0_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EAAAD296-3942-4535-B39B-81A57E94FCF7}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_3_0_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{790EE9BA-BB63-43D3-9080-F9AF7AC43114}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_1_0_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E80BF81-72BC-4E9C-8A79-D7D7EA20AAE4}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='AppReg2' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A9A0D770-C658-4659-BC75-6F8289DDEAA3}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_4_0_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{56028A6A-D5A3-47C5-9494-092E1C840A8F}' \r
-                      Name='DisplayName' Type='raw' />\r
-      <RegistrySearch Id='AppReg1' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{6E62498D-162E-45AA-87C7-157308552043}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_0_0_32' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D62F990B-2A8A-442B-BF85-7FE075B2CE0C}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-      <RegistrySearch Id='SP2_3_1' Root='HKLM' \r
-                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}' \r
-                      Name='DisplayVersion' Type='raw' />\r
-    </Property>\r
-\r
-    <Property Id='OLD_INSTALLDIR' Secure='yes'>\r
-      <RegistrySearch Id='OldInstallDir' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                      Name='InstallDir' Type='directory' />\r
-    </Property>\r
-\r
-    <Property Id='OLD_INSTALL_ISAPI_FILTER' Secure='yes'>\r
-      <RegistrySearch Id='OldInstallIsapi' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                      Name='InstallIsapi' Type='raw' />\r
-    </Property>\r
-\r
-    <!-- non virtualized registry setting -->\r
-    <Property Id='OLD_SERVICEINSTALLED' Secure='yes'>\r
-      <RegistrySearch Id='OldServiceInstalled' Root='HKLM' Key='SYSTEM\CurrentControlSet\services\shibd_Default'\r
-                      Name='ImagePath' Type='raw' />\r
-    </Property>\r
-\r
-    <DirectoryRef Id='bin'>\r
-      <!-- Save the Captured parameters into the registry -->\r
-      <Component Id='TargetDir' Guid='{F02FB6E5-1146-4EC5-9D59-07BA6732C4DD}' >\r
-        <RegistryValue Id='TargetDir'  Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                       Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />\r
-      </Component>\r
-\r
-      <Component Id='InstallIsapi' Guid='{4F81E47D-B406-42B6-A702-90ACA666075E}' >\r
-        <Condition>IISMAJORVERSION</Condition>\r
-        <RegistryValue Id='InstallIsapi'  Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                       Name='InstallIsapi' Value='[INSTALL_ISAPI_FILTER]' Type='string' KeyPath='yes' />\r
-      </Component>\r
-\r
-      <Component Id='file_extension' Guid='{88D0BEF3-6E15-4688-8492-9FF23B6221DF}'>\r
-        <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>\r
-        <RegistryValue Root='HKLM' Key='SOFTWARE\Shibboleth' \r
-                       Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />\r
-      </Component>\r
-\r
-      <!-- pretty icon for the "install programs" page -->\r
-      <Component Id='shib.ico' Guid='{FA0F86A1-0731-4D66-8216-BC74D231B598}'>\r
-        <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico' />\r
-        <RegistryValue Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' \r
-                       Name='DisplayIcon' Value='[#shib.ico],0' Type='string' />\r
-      </Component>\r
-    </DirectoryRef>\r
-  </Fragment>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<?include Versions.wxi ?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!--
+    This is where we put all the architecture neutral bits of the
+    Shibboleth install.  It turns out that it may not be all the
+    architecture insenstive stuff since some GUIDS may have moved
+  -->
+  <Fragment>
+    <!-- Previous version search -->
+    <Property Id='SHIB_OLDVERSION' Value='none' Secure='yes'>
+      <RegistrySearch Id='SP2_2_1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2A19CDBC-E0DA-452C-8B38-1AA9DB4D579F}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_1_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A5D2DE8D-2A4A-4D74-98B5-BA448DD4DC39}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_2_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8280E58C-D290-42CD-9425-BCC0BA439649}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_3_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B9F4513-3141-4270-B1F5-43A467235B6B}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_2_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EAAAD296-3942-4535-B39B-81A57E94FCF7}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_3_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{790EE9BA-BB63-43D3-9080-F9AF7AC43114}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_1_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E80BF81-72BC-4E9C-8A79-D7D7EA20AAE4}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='AppReg2' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A9A0D770-C658-4659-BC75-6F8289DDEAA3}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_4_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{56028A6A-D5A3-47C5-9494-092E1C840A8F}' 
+                      Name='DisplayName' Type='raw' />
+      <RegistrySearch Id='AppReg1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{6E62498D-162E-45AA-87C7-157308552043}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_0_0_32' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D62F990B-2A8A-442B-BF85-7FE075B2CE0C}' 
+                      Name='DisplayVersion' Type='raw' />
+      <RegistrySearch Id='SP2_3_1' Root='HKLM' 
+                      Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}' 
+                      Name='DisplayVersion' Type='raw' />
+    </Property>
+
+    <Property Id='OLD_INSTALLDIR' Secure='yes'>
+      <RegistrySearch Id='OldInstallDir' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallDir' Type='directory' />
+    </Property>
+
+    <Property Id='OLD_INSTALL_ISAPI_FILTER' Secure='yes'>
+      <RegistrySearch Id='OldInstallIsapi' Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                      Name='InstallIsapi' Type='raw' />
+    </Property>
+
+    <!-- non virtualized registry setting -->
+    <Property Id='OLD_SERVICEINSTALLED' Secure='yes'>
+      <RegistrySearch Id='OldServiceInstalled' Root='HKLM' Key='SYSTEM\CurrentControlSet\services\shibd_Default'
+                      Name='ImagePath' Type='raw' />
+    </Property>
+
+    <DirectoryRef Id='bin'>
+      <!-- Save the Captured parameters into the registry -->
+      <Component Id='TargetDir' Guid='{F02FB6E5-1146-4EC5-9D59-07BA6732C4DD}' >
+        <RegistryValue Id='TargetDir'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallDir' Value='[INSTALLDIR]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='InstallIsapi' Guid='{4F81E47D-B406-42B6-A702-90ACA666075E}' >
+        <Condition>IISMAJORVERSION</Condition>
+        <RegistryValue Id='InstallIsapi'  Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='InstallIsapi' Value='[INSTALL_ISAPI_FILTER]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <Component Id='file_extension' Guid='{88D0BEF3-6E15-4688-8492-9FF23B6221DF}'>
+        <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
+        <RegistryValue Root='HKLM' Key='SOFTWARE\Shibboleth' 
+                       Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />
+      </Component>
+
+      <!-- pretty icon for the "install programs" page -->
+      <Component Id='shib.ico' Guid='{FA0F86A1-0731-4D66-8216-BC74D231B598}'>
+        <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-sp\msi\shib.ico' />
+        <RegistryValue Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Uninstall\[ProductCode]' 
+                       Name='DisplayIcon' Value='[#shib.ico],0' Type='string' />
+      </Component>
+    </DirectoryRef>
+  </Fragment>
+</Wix>
index bdb1fd8..5ab77a1 100644 (file)
@@ -1,53 +1,53 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-     Development, Inc. (UCAID) under one or more contributor license\r
-     agreements.  See the NOTICE file distributed with this work for\r
-     additional information regarding copyright ownership. The UCAID\r
-     licenses this file to You under the Apache License, Version 2.0\r
-     (the 'License'); you may not use this file except in compliance\r
-     with the License.  You may obtain a copy of the License at\r
-     \r
-     http://www.apache.org/licenses/LICENSE-2.0\r
-     \r
-     Unless required by applicable law or agreed to in writing, software\r
-     distributed under the License is distributed on an 'AS IS' BASIS,\r
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-     implied.  See the License for the specific language governing\r
-     permissions and limitations under the License.  -->\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <!-- The dialog to display if we sense an upgrade -->\r
-  <Fragment>\r
-\r
-    <UI>\r
-      <Dialog Id='UpdateDlgShib' Width='370' Height='270' Title='[ProductName] Update'>\r
-        <!-- Stuff at the top: picture, some text, a line -->\r
-        <Control Id='TopBitMap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' Text='WixUI_Bmp_Banner' />\r
-        <Control Id='TopInfo' Type='Text' X='15' Y='6' Width='150' Height='12' \r
-                 Text='{\WixUI_Font_Title}Update Shibboleth' Transparent='yes'/>\r
-        <Control Id='TopDetailed' Type='Text' X='25' Y='24' Width='320' Height='12' \r
-                 Text='Update to [ProductName]' Transparent='yes'/>\r
-        <Control Id='TopLine' Type='Line' X='0' Y='44' Width='370' Height='1' />\r
-\r
-        <!-- Buttons to control Shibboleth Setup -->\r
-        <Control Id='DescriptionLine1' Type='Text' X='25' Y='51' Height='12' Width='320' \r
-                 Text='The updated files for [ProductName] will be installed to [INSTALLDIR]'/>\r
-\r
-        <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->\r
-        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='1' />\r
-        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' Text='&amp;Back'>\r
-          <Publish  Event='NewDialog' Value='WelcomeDlg'>1</Publish>\r
-        </Control>\r
-\r
-        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Text='&amp;Next' Default='yes'>\r
-          <Publish Event='NewDialog' Value='VerifyReadyDlg'/>\r
-        </Control>\r
-\r
-        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Text='&amp;Cancel' Cancel='yes'>\r
-          <Publish  Event='SpawnDialog' Value='CancelDlg'>1</Publish>\r
-        </Control>\r
-      </Dialog>\r
-    </UI>\r
-  </Fragment>\r
-</Wix>\r
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the 'License'); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an 'AS IS' BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <!-- The dialog to display if we sense an upgrade -->
+  <Fragment>
+
+    <UI>
+      <Dialog Id='UpdateDlgShib' Width='370' Height='270' Title='[ProductName] Update'>
+        <!-- Stuff at the top: picture, some text, a line -->
+        <Control Id='TopBitMap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' Text='WixUI_Bmp_Banner' />
+        <Control Id='TopInfo' Type='Text' X='15' Y='6' Width='150' Height='12' 
+                 Text='{\WixUI_Font_Title}Update Shibboleth' Transparent='yes'/>
+        <Control Id='TopDetailed' Type='Text' X='25' Y='24' Width='320' Height='12' 
+                 Text='Update to [ProductName]' Transparent='yes'/>
+        <Control Id='TopLine' Type='Line' X='0' Y='44' Width='370' Height='1' />
+
+        <!-- Buttons to control Shibboleth Setup -->
+        <Control Id='DescriptionLine1' Type='Text' X='25' Y='51' Height='12' Width='320' 
+                 Text='The updated files for [ProductName] will be installed to [INSTALLDIR]'/>
+
+        <!-- Stuff at the bottom: line, Back,Next, [space] Cancel -->
+        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='1' />
+        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' Text='&amp;Back'>
+          <Publish  Event='NewDialog' Value='WelcomeDlg'>1</Publish>
+        </Control>
+
+        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Text='&amp;Next' Default='yes'>
+          <Publish Event='NewDialog' Value='VerifyReadyDlg'/>
+        </Control>
+
+        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Text='&amp;Cancel' Cancel='yes'>
+          <Publish  Event='SpawnDialog' Value='CancelDlg'>1</Publish>
+        </Control>
+      </Dialog>
+    </UI>
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/tes.wxs b/msi/WiX/tes.wxs
deleted file mode 100644 (file)
index 02ebb6c..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033'\r
-           Version='1.0.0.0' Manufacturer='Shibboleth Consortium'>\r
-    <Package Description='TEST Windows Installer package'\r
-             Comments='Ignore Ignore Ignore Ignore'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Compressed='yes' />\r
-\r
-    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
-    <!-- Files -->\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <Directory Id='SystemFolder' >\r
-        <Merge Id='Microsoft_VC100_CRT_x86' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />\r
-      </Directory>\r
-    </Directory>\r
-\r
-    <!-- Feature -->\r
-    <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>\r
-      <MergeRef Id='Microsoft_VC100_CRT_x86' />\r
-<!--      <MergeRef Id='Microsoft_VC100_DebugCRT_x86' /> -->\r
-    </Feature>\r
-  </Product>\r
-</Wix>\r
diff --git a/msi/WiX/testInstall.wxs b/msi/WiX/testInstall.wxs
deleted file mode 100644 (file)
index 068aee3..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>\r
-\r
-<!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
\r
-     http://www.apache.org/licenses/LICENSE-2.0\r
\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
-\r
-<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
-  <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033'\r
-           Version='1.0.0.0' Manufacturer='Shibboleth Consortium'>\r
-    <Package Description='TEST Windows Installer package'\r
-             Comments='Ignore Ignore Ignore Ignore'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Compressed='yes' />\r
-\r
-    <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
-    <!-- Files -->\r
-    <Directory Id='TARGETDIR' Name='SourceDir'>\r
-      <!-- The test bit -->\r
-      <Directory Id='OPT' Name='opt'>\r
-        <Directory Id='INSTALLDIR' Name='shibboleth-sp'>\r
-          <Component Id='MyComponent' Guid='74DBAA41-4C46-4944-80F6-27F925991CB2'>\r
-            <File Source='FileCounts.txt' />\r
-          </Component>\r
-        </Directory>\r
-      </Directory>\r
-      <Directory Id='ProgramFilesFolder' Name='PFiles'>\r
-        <!-- The merge modules -->\r
-        <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='MergeModules\Curl-x86.msm' DiskId='1' />\r
-        <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='MergeModules\FastCGI-x86.msm' DiskId='1' />\r
-        <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='MergeModules\Log4Shib-x86.msm' DiskId='1' />\r
-        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSAML-x86.msm' DiskId='1' />\r
-        <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />\r
-        <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />\r
-        <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />\r
-        <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />\r
-        <Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />\r
-        <Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='MergeModules\Zlib-x86.msm' DiskId='1' />\r
-        <!-- the schema -->\r
-        <Directory Id='shibboleth' Name='Shibboleth'>\r
-          <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='SHARE_DIR' Name='Share'/>\r
-          </Directory>\r
-        </Directory>\r
-      </Directory>\r
-      <Directory Id='SystemFolder' >\r
-        <!-- Note that this will cause warning at link time which can\r
-        be safely ignored\r
-        http://blogs.msdn.com/b/astebner/archive/2007/02/13/building-an-msi-using-wix-v3-0-that-includes-the-vc-8-0-runtime-merge-modules.aspx-->\r
-       <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm' DiskId='1' />\r
-        <Merge Id='Microsoft_VC100_CRT_x86' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />\r
-      </Directory>\r
-    </Directory>\r
-\r
-    <!-- Feature -->\r
-    <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>\r
-      <ComponentRef Id='MyComponent' />\r
-      <ComponentRef Id='doc_shibboleth'/>\r
-      <ComponentRef Id='etc_shibboleth_perm'/>\r
-      <ComponentRef Id='etc_shibboleth_nonperm'/>\r
-      <ComponentRef Id='dist_noperm'/>\r
-      <ComponentRef Id='accessError.html'/>\r
-      <ComponentRef Id='apache.config'/>\r
-      <ComponentRef Id='apache2.config'/>\r
-      <ComponentRef Id='metadataError.html'/>\r
-      <ComponentRef Id='native.logger'/>\r
-      <ComponentRef Id='sessionError.html'/>\r
-      <ComponentRef Id='shibd.logger'/>\r
-      <ComponentRef Id='var_log_shibboleth_folder'/>\r
-      <ComponentRef Id='share_xml_shibboleth'/>\r
-      <ComponentRef Id='share_xml_shibboleth_xsd'/>\r
-      <!--exe's -->\r
-      <ComponentRef Id='resolvertest.exe'/>\r
-      <ComponentRef Id='mdquery.exe'/>\r
-      <ComponentRef Id='resolvertest.exe_debug'/>\r
-      <ComponentRef Id='mdquery.exe_debug'/>\r
-      <!-- plugins  -->\r
-      <ComponentRef Id='adfs.so'/>\r
-      <ComponentRef Id='adfslite.so'/>\r
-      <ComponentRef Id='isapi_shib.dll'/>\r
-      <ComponentRef Id='mod_shib_13.so'/>\r
-      <ComponentRef Id='mod_shib_20.so'/>\r
-      <ComponentRef Id='mod_shib_22.so'/>\r
-      <ComponentRef Id='nsapi_shib.dll'/>\r
-      <ComponentRef Id='odbcstore.so'/>\r
-      <ComponentRef Id='shibauthorizer.exe'/>\r
-      <ComponentRef Id='shibresponder.exe'/>\r
-      <!-- debug plugins -->\r
-      <ComponentRef Id='adfsD.so'/>\r
-      <ComponentRef Id='adfsliteD.so'/>\r
-      <ComponentRef Id='isapi_shibD.dll'/>\r
-      <ComponentRef Id='mod_shib_13D.so'/>\r
-      <ComponentRef Id='mod_shib_20D.so'/>\r
-      <ComponentRef Id='mod_shib_22D.so'/>\r
-      <ComponentRef Id='nsapi_shibD.dll'/>\r
-      <ComponentRef Id='odbcstoreD.so'/>\r
-      <ComponentRef Id='shibauthorizerD.exe'/>\r
-      <ComponentRef Id='shibresponderD.exe'/>\r
-      <!-- the service -->\r
-      <ComponentRef Id='shibd.exe'/>\r
-      <ComponentRef Id='shibdD.exe'/>\r
-      <!-- The merge modules -->\r
-      <MergeRef Id='CurlMergeModule_x86' />\r
-      <MergeRef Id='FastCGIMergeModule_x86' />\r
-      <MergeRef Id='OpenSAMLMergeModule_x86' />\r
-      <MergeRef Id='OpenSSLMergeModule_x86' />\r
-      <MergeRef Id='Log4ShibMergeModule_x86' />\r
-      <MergeRef Id='ShibbolethMergeModule_x86' />\r
-      <MergeRef Id='ZlibMergeModule_x86' />\r
-      <MergeRef Id='XercesMergeModule_x86' />\r
-      <MergeRef Id='XmlSecMergeModule_x86' />\r
-      <MergeRef Id='XmlToolingMergeModule_x86' />\r
-      <MergeRef Id='Microsoft_VC100_CRT_x86' />\r
-      <MergeRef Id='Microsoft_VC100_DebugCRT_x86' />\r
-    </Feature>\r
-  </Product>\r
-</Wix>\r