<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'\r
- Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.x64\libcurl.dll'/>\r
+ <File KeyPath='yes' Checksum='yes'\r
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\release-dll-ssl-dll-zlib-dll.64\libcurl.dll'/>\r
</Component>\r
<Component Id='curl.exe' Guid='{52103377-AEF6-4533-B0CE-D3A786D2D17E}' Win64='yes'>\r
- <File KeyPath='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' \r
- Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.x64\libcurld.dll'/>\r
+ <File KeyPath='yes' Checksum='yes'\r
+ Source='$(var.BuildDirectory)\curl-$(var.CurlVersion)\lib\debug-dll-ssl-dll-zlib-dll.64\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' \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 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' \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' \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' \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' \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 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' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />\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' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />\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' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />\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 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' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Release\libfcgi.dll' />\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' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\Debug\libfcgid.dll' />\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' Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />\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 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='{DA7E5213-363E-4E13-B05D-90905BE9FB94}' Win64='yes'>\r
- <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>\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' Name='NTEventLogAppender.dll'/>\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='{792E6762-70FE-418A-9336-39DDF1A6BAE7}' Win64='yes'>\r
- <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>\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='NTEventLogAppenderD.dll' KeyPath='yes' Name='NTEventLogAppender.dll'/>\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='shibboleth_SP' Name='SP'>\r
<Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\Release\'>\r
<Component Id='log4shib.dll' Guid='{2FDE8ED0-774A-4F44-88D5-C7089350D895}'>\r
- <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion).dll'/>\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' Name='NTEventLogAppender.dll'/>\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='{B8D2E797-F5A8-4E0D-B57F-9A7D4E699942}'>\r
- <File KeyPath='yes' Name='log4shib$(var.LogForShibFileVersion)D.dll'/>\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='NTEventLogAppenderD.dll' KeyPath='yes' Name='NTEventLogAppender.dll'/>\r
+ <File Id='NTEventLogAppender.dll_debug' KeyPath='yes' Checksum='yes' Name='NTEventLogAppender.dll'/>\r
</Component>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- lib -->\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
\r
- <Module Id='OpenSAMLMergeModule_schemas' Language='1033' Version='$(var.OpenSAMLVersion)'>\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
<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='cs-sstc-schema-assertion-01.xsd' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>\r
- <File KeyPath='yes' Name='cs-sstc-schema-assertion-01.xsd'/>\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='cs-sstc-schema-assertion-1.1.xsd' Guid='{D01E45CD-41D8-4029-AB27-103D36734D07}'>\r
- <File KeyPath='yes' Name='cs-sstc-schema-assertion-1.1.xsd' />\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='cs-sstc-schema-protocol-01.xsd' Guid='{333BABD7-1EDF-4F7C-85A7-4FDD804E57D3}'>\r
- <File KeyPath='yes' Name='cs-sstc-schema-protocol-01.xsd' />\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='cs-sstc-schema-protocol-1.1.xsd' Guid='{CB8A87E7-A8FE-44E7-AE2F-D5C41F66A1C0}'>\r
- <File KeyPath='yes' Name='cs-sstc-schema-protocol-1.1.xsd' />\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
+ <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
+ <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
+ <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='saml-schema-assertion-2.0.xsd' Guid='{6A785715-2E2E-4DFC-948B-94711E1DC355}'>\r
- <File KeyPath='yes' Name='saml-schema-assertion-2.0.xsd' />\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='saml-schema-authn-context-2.0.xsd' Guid='{7EC7E7A6-464C-4137-8E20-DDE9BD4F7706}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-2.0.xsd' />\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='saml-schema-authn-context-auth-telephony-2.0.xsd' Guid='{81BDD012-6863-45DF-86CB-138B627D7D17}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-auth-telephony-2.0.xsd' />\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='saml-schema-authn-context-ip-2.0.xsd' Guid='{A47F07CA-77B4-40E5-A8FA-955C626E6E38}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-ip-2.0.xsd' />\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='saml-schema-authn-context-ippword-2.0.xsd' Guid='{9052E8FD-D9B5-42CB-836A-C1A825DA6B3F}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-ippword-2.0.xsd' />\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='saml-schema-authn-context-kerberos-2.0.xsd' Guid='{03D7CD55-AF85-4B1A-A09F-991D5BCC3C71}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-kerberos-2.0.xsd' />\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='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd' Guid='{B934A845-5027-4B80-9C8B-DE6BA42E1D1C}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd' />\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='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd' Guid='{B2DCED0E-E97E-448E-83D1-6CDFC8711EA9}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd' />\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='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd' Guid='{70C79D92-D7AF-49FB-A332-72F431582C6A}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd' />\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='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd' Guid='{195F5D51-1FD6-410A-9A48-9C4AAF1202FB}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd' />\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='saml-schema-authn-context-nomad-telephony-2.0.xsd' Guid='{13686CA3-58F4-4176-9297-3E797D075A6E}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' />\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='saml-schema-authn-context-personal-telephony-2.0.xsd' Guid='{10BFBEF9-B458-4CF2-930A-404D1BDCF4B8}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-personal-telephony-2.0.xsd' />\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='saml-schema-authn-context-pgp-2.0.xsd' Guid='{4514C6C6-0DFB-4A4B-BD93-36D856937199}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-pgp-2.0.xsd' />\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='saml-schema-authn-context-ppt-2.0.xsd' Guid='{8AB6A86E-DEDC-49C3-B1BB-92DAFBE49351}'>\r
- <File KeyPath='yes' Name='saml-schema-authn-context-ppt-2.0.xsd' />\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='samlschema18' Guid='{77793E85-3003-4D75-862E-7164AB576D6D}'>\r
- <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd' />\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='samlschema19' Guid='{D426514A-1A01-4B70-9375-C5240E9267FB}'>\r
- <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd' />\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='samlschema20' Guid='{3A57FE98-237B-4993-ACCE-6BC5ECAF0E54}'>\r
- <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd' />\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='samlschema1a' Guid='{CBAE6C22-E0B1-42E5-BF3F-AAD55EAA6193}'>\r
- <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd' />\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='samlschema1b' Guid='{BB0D6BE0-9C42-4EDA-88B6-C791809B5092}'>\r
- <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd' />\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='samlschema1c' Guid='{76840C0F-8991-4B6D-A32F-6053B93B60B6}'>\r
- <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd' />\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='samlschema1d' Guid='{C07DFE86-DCCA-4289-BEB8-D8B7A146EBBB}'>\r
- <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd' />\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='samlschema1e' Guid='{72BE1F0B-E2B5-40D3-A086-24D0011E718C}'>\r
- <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd' />\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='samlschema1f' Guid='{BDD9E146-8AEB-4AE9-A99F-6B2072587A4C}'>\r
- <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd' />\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='samlschema1g' Guid='{8220805B-A2D3-4952-BF20-AA763B77C243}'>\r
- <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd' />\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='samlschema1h' Guid='{E0ED6CFB-C41E-4E8D-AC78-ADBC22A28893}'>\r
- <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd' />\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='samlschema1i' Guid='{514D0A27-C204-43BC-A8B1-47E51C4E4FE2}'>\r
- <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd' />\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='samlschema1j' Guid='{8BD5727A-0DE4-4739-8CCA-CC0BEA03D7B1}'>\r
- <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd' />\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
- \r
- <Component Id='samlschema1k' Guid='{669A1D43-AB09-4BCD-A989-B42DE5D50EB1}'>\r
- <File Name='saml-schema-dce-2.0.xsd'/>\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='samlschema1l' Guid='{D4E12A26-39B7-407B-9177-D67799CEF333}'>\r
- <File Name='saml-schema-ecp-2.0.xsd'/>\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='samlschema1m' Guid='{02823006-3999-4F7B-979E-4BE0C32B6109}'>\r
- <File Name='saml-schema-metadata-2.0.xsd'/>\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='samlschema1n' Guid='{20E92615-EA8B-482C-80A2-6EEB103DA945}'>\r
- <File Name='saml-schema-protocol-2.0.xsd'/>\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='samlschema1o' Guid='{1C737F49-4B66-47FD-A1CA-754342DFF868}'>\r
- <File Name='saml-schema-x500-2.0.xsd'/>\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='samlschema1p' Guid='{36D94CC5-8DB9-4986-B7A2-D71303966307}'>\r
- <File Name='saml-schema-xacml-2.0.xsd'/>\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
- \r
- <Component Id='samlschema1q' Guid='{87188F0C-D1CF-4990-91E7-A10D23EDDFE7}'>\r
- <File Name='sstc-metadata-attr.xsd'/>\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='samlschema1r' Guid='{F824BCC5-467B-4AEB-B2CA-BE8F465B34F5}'>\r
- <File Name='sstc-request-initiation.xsd'/>\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='samlschema1s' Guid='{1F5DD1A1-A7EB-44C7-9FC5-A15E2263804F}'>\r
- <File Name='sstc-saml1x-metadata.xsd'/>\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='samlschema1t' Guid='{E81FA4D6-C58D-4D04-8167-A4BB9E3675E9}'>\r
- <File Name='sstc-saml-attribute-ext.xsd'/>\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='samlschema1u' Guid='{48AA3869-C62B-47B2-8E1E-80BE6AB056BE}'>\r
- <File Name='sstc-saml-delegation.xsd'/>\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='samlschema1v' Guid='{9A16BE14-D5AA-40F3-8416-709B7C96E8C6}'>\r
- <File Name='sstc-saml-idp-discovery.xsd' />\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='samlschema1w' Guid='{97489B89-9651-4131-82A7-0B9F638FD25C}'>\r
- <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>\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='samlschema1x' Guid='{5F1380C9-7327-4D11-BC9E-CD59CC362B21}'>\r
- <File Name='sstc-saml-metadata-ext-query.xsd'/>\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='samlschema1y' Guid='{C203B8C4-0056-46F6-96DE-E831933437D3}'>\r
- <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>\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='samlschema1z' Guid='{EEFDA0C0-F1F4-4C09-82CD-873F037A4296}'>\r
- <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>\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
</Directory><!-- opensaml -->\r
- <Directory Id='xmltooling' Name='xmltooling'\r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\' >\r
- <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>\r
- <File Name='xenc-schema.xsd'/>\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='xmldsigcoreschema.xsd' Guid='{72871706-1D8F-4695-B573-AF2EB0635281}'>\r
- <File Name='xmldsig-core-schema.xsd'/>\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='soapenvelope.xsd' Guid='{A2B2255D-344E-44E9-B894-5AB3416D8CBC}'>\r
- <File Name='soap-envelope.xsd' />\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 Name='xml.xsd' />\r
+ <File KeyPath='yes' Name='xml.xsd' />\r
</Component>\r
<Component Id='xmltooling.xsd' Guid='{E99A5CCE-C0A9-483C-BB02-A147E0C1A609}'>\r
- <File Name='xmltooling.xsd' />\r
- </Component>\r
- <Component Id='log.xml' Guid='{CD84FD26-CCB0-4FC6-9B51-E72CC23046D8}'>\r
- <File Id='XMLToolingcatalog' Name='catalog.xml' \r
- Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in'/>\r
+ <File KeyPath='yes' Name='xmltooling.xsd' />\r
</Component>\r
- <Component Id='xmldsig11schema.xsd' Guid='{A0E6F269-77F0-47E6-B59A-887977ECE06A}'>\r
- <File Name='xmldsig11-schema.xsd'/>\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><!-- Shibboleth -->\r
</Directory><!-- CommonAppDataFolder -->\r
</Directory><!-- TargetDir -->\r
- \r
- <Binary Id='EditCatalogFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />\r
- <CustomAction Id='EditCatalogSAML10' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \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='SetEditCatalogSAML10' Property='EditCatalogSAML10' \r
- Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />\r
- \r
- <CustomAction Id='EditCatalogSAML11' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
+ <CustomAction Id='EditCatalogSAML10' BinaryKey='EditCatalogFileSrc' VBScriptCall=''\r
Execute='deferred' Impersonate='no' />\r
- <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11' \r
- Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />\r
- \r
- <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
+ <CustomAction Id='EditCatalogSAML11' BinaryKey='EditCatalogFileSrc' VBScriptCall=''\r
Execute='deferred' Impersonate='no' />\r
- <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20' \r
- Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml20-catalog.xml' />\r
- \r
- <CustomAction Id='EditXMLToolingCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
+ <CustomAction Id='EditCatalogSAML20' BinaryKey='EditCatalogFileSrc' VBScriptCall=''\r
Execute='deferred' Impersonate='no' />\r
- <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog' \r
+ <CustomAction Id='SetEditXMLToolingCatalog' Property='EditXMLToolingCatalog'\r
Value='[CommonAppDataFolder]Shibboleth\SP\xml\xmltooling\;@;catalog.xml' />\r
-\r
+ <CustomAction Id='SetEditCatalogSAML10' Property='EditCatalogSAML10'\r
+ Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml10-catalog.xml' />\r
+ <CustomAction Id='SetEditCatalogSAML11' Property='EditCatalogSAML11'\r
+ Value='[CommonAppDataFolder]Shibboleth\SP\xml\opensaml\;@;saml11-catalog.xml' />\r
+ <CustomAction Id='SetEditCatalogSAML20' Property='EditCatalogSAML20'\r
+ Value='[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='EditCatalogSAML10' After='InstallFiles'>NOT Installed</Custom>\r
<Custom Action='SetEditCatalogSAML11' Before='CostInitialize'>NOT Installed</Custom>\r
- <Custom Action='EditCatalogSAML11' After='InstallFiles'>NOT Installed</Custom>\r
<Custom Action='SetEditCatalogSAML20' Before='CostInitialize'>NOT Installed</Custom>\r
- <Custom Action='EditCatalogSAML20' After='InstallFiles'>NOT Installed</Custom>\r
-\r
- <Custom Action='SetEditXMLToolingCatalog' 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
<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='{9EE0A8D1-A6DC-4E2A-904F-BBEF70A0D67B}' Win64='yes'>\r
- <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\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' Name='samlsign.exe' />\r
+ <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />\r
</Component>\r
<Component Id='xmltooling.dll' Guid='{7BBFB3D8-A9F8-429B-96BE-C1B283EBFDFB}' Win64='yes'>\r
- <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
+ <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
</Component>\r
- <Component Id='xmltoolinglite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' Win64='yes'>\r
- <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
+ <Component Id='xmltooling_lite.dll' Guid='{060F61B9-36E9-4F33-9B5B-C59A43709052}' 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='{00836378-7FB9-4A09-AF49-3AA33DEF9BC6}' Win64='yes'>\r
- <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\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' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
+ <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
</Component>\r
<Component Id='xmltoolingD.dll' Guid='{C380627F-9D45-4626-A249-3831FC7C83FC}' Win64='yes'>\r
- <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
+ <File KeyPath='yes' Checksum='yes'\r
+ Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
</Component>\r
- <Component Id='xmltoolingliteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' Win64='yes'>\r
- <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\x64\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
+ <Component Id='xmltooling_liteD.dll' Guid='{2786A98E-763C-41A1-A6D5-363DB22F17E9}' 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='shibboleth_SP' Name='SP'>\r
<Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-opensaml\Release\'>\r
<Component Id='saml.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>\r
- <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\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' Name='samlsign.exe' />\r
+ <File KeyPath='yes' Checksum='yes' Name='samlsign.exe' />\r
</Component>\r
<Component Id='xmltooling.dll' Guid='{53533A59-A563-439D-B13D-A4D7090C42D3}'>\r
- <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
+ <File KeyPath='yes' Checksum='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling$(var.XmlToolingFileVersion).dll' />\r
</Component>\r
- <Component Id='xmltoolinglite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>\r
- <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Release\xmltooling-lite$(var.XmlToolingFileVersion).dll' />\r
+ <Component Id='xmltooling_lite.dll' Guid='{5045A722-D6D6-4E55-9196-CB7C50B4446F}'>\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='{7B934257-5F7F-428E-930E-A793A11573D7}'>\r
- <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\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' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
+ <File KeyPath='yes' Checksum='yes' Id='samlsign.exe_debug' Name='samlsign.exe' />\r
</Component>\r
<Component Id='xmltoolingD.dll' Guid='{380E59DF-24F8-4F60-97A7-CC67FB76B4CC}'>\r
- <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
+ <File KeyPath='yes' Checksum='yes'\r
+ Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling$(var.XmlToolingFileVersion)D.dll' />\r
</Component>\r
- <Component Id='xmltoolingliteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>\r
- <File KeyPath='yes' Source='$(var.SPBuildDirectory)\cpp-xmltooling\Debug\xmltooling-lite$(var.XmlToolingFileVersion)D.dll' />\r
+ <Component Id='xmltooling_liteD.dll' Guid='{DB6D8737-4E3D-4C06-87F1-C59C7D7CB47A}'>\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_debug -->\r
</Directory><!-- lib -->\r
<Directory Id='doc' Name='doc'>\r
<Component Id='doc' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>\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><!-- doc -->\r
</Directory><!-- shibboleth_SP -->\r
</Directory><!-- shibboleth -->\r
</Directory><!-- ProgramFilesFolder -->\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='{49ED7AFD-EB3D-4296-84BC-E40C0E40DE5D}' Win64='yes'>\r
- <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
+ <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
</Component>\r
<Component Id='ssleay32.dll' Guid='{649A8C33-1F00-40BD-BBA4-0D8FD7C258CD}' Win64='yes'>\r
- <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\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' Name='openssl.exe' />\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='libeay32.dll_debug' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='yes'>\r
- <File Id='libeay32.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ <Component Id='libeay32D.dll' Guid='{77010CF4-1367-4E42-86EA-C29D72EDAEC5}' Win64='yes'>\r
+ <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
</Component>\r
- <Component Id='ssleay32.dll_debug' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' Win64='yes'>\r
- <File Id='ssleay32.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ <Component Id='ssleay32D.dll' Guid='{52C30BD0-3769-4021-85F7-4AE539DCED41}' 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' Name='openssl.exe' />\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='shibboleth_sp' Name='SP'>\r
<Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out32dll\'>\r
<Component Id='libeay32.dll' Guid='{38378D46-4CF2-4DE5-A30D-79F92AD6DD06}'>\r
- <File KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
+ <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion).dll' />\r
</Component>\r
<Component Id='ssleay32.dll' Guid='{9C1CAE5E-F8E9-4EBA-961B-1DD149097702}'>\r
- <File KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion).dll' />\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' Name='openssl.exe' />\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='libeay32.dll_debug' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>\r
- <File Id='libeay32.dll_debug' KeyPath='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ <Component Id='libeay32D.dll' Guid='{86C4099A-1E75-4676-8F6D-BF5748F657B6}'>\r
+ <File KeyPath='yes' Checksum='yes' Name='libeay32_$(var.OpenSSLFileVersion)D.dll' />\r
</Component>\r
- <Component Id='ssleay32.dll_debug' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>\r
- <File Id='ssleay32.dll_debug' KeyPath='yes' Name='ssleay32_$(var.OpenSSLFileVersion)D.dll' />\r
+ <Component Id='ssleay32D.dll' Guid='{2097A37D-650E-45F4-96C0-94C748DEA49C}'>\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' Name='openssl.exe' />\r
+ <File Id='openssl.exe_debug' KeyPath='yes' Checksum='yes' Name='openssl.exe' />\r
</Component>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- lib -->\r
<?include ..\Versions.wxi ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
- <Module Id='Shibboleth_schemas' Language='1033' Version='$(var.ShibbolethDllVersion)'>\r
- <Package Id='{5AC5161D-114D-4BFB-AF7C-4E8E7F964965}' Description='Merge Module for Shibboleth schemas'\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='Shibboleth' Name='Shibboleth' >\r
<Directory Id='SP' Name='SP' >\r
<Directory Id='xml' Name='xml' >\r
- <Directory Id='xml_shibboleth' Name='shibboleth'\r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas' >\r
- <Component Id='share_xml_shibboleth' Guid='{E2740531-4A6C-43C8-9E1A-9F7CA87862B7}'>\r
- <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />\r
- </Component>\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 Id='ShibbolethCatalog' Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />\r
+ <File KeyPath='yes' Name='catalog.xml' Source='$(var.SPBuildDirectory)\cpp-sp\schemas\catalog.xml.in' />\r
</Component>\r
- <Component Id='attributemap.xsd' Guid='{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}'>\r
- <File Name='shibboleth-2.0-attribute-map.xsd' />\r
+ <Component Id='shibboleth.xsd' Guid='{18F3DD83-0C0A-480E-8C87-043C9296DFE5}'>\r
+ <File KeyPath='yes' Name='shibboleth.xsd' />\r
</Component>\r
- <Component Id='afp.xsd' Guid='{9672ADDF-8053-41C3-A58A-C8B99C710336}'>\r
- <File Name='shibboleth-2.0-afp.xsd' />\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='afpmfsaml.xsd' Guid='{40B8AEF3-0A31-4204-95E7-F8079CB55979}'>\r
- <File Name='shibboleth-2.0-afp-mf-saml.xsd' />\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='WSTrust.xsd' Guid='{91EA82B5-A19C-40C0-8D1C-40FA020A484E}'>\r
- <File Name='WS-Trust.xsd' />\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='spnotify.xsd' Guid='{65EBC9F1-C958-4B17-9554-7F86186A15C1}'>\r
- <File Name='shibboleth-2.0-sp-notify.xsd' />\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='nativespconfig.xsd' Guid='{5514B435-94AB-4A92-9737-0BEB78C146C8}'>\r
- <File Name='shibboleth-2.0-native-sp-config.xsd' />\r
+ <Component Id='WSTrust.xsd' Guid='{91EA82B5-A19C-40C0-8D1C-40FA020A484E}'>\r
+ <File KeyPath='yes' Name='WS-Trust.xsd' />\r
</Component>\r
- <Component Id='afpmfbasic.xsd' Guid='{D1C32485-D3DF-414C-B2FF-721F169CAC05}'>\r
- <File Name='shibboleth-2.0-afp-mf-basic.xsd' />\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='nativespprotocols' Guid='{AE42FFFB-1A59-4F1D-9935-15D727B99929}'>\r
- <File Id='nativespprotocols' Name='shibboleth-2.0-native-sp-protocols.xsd' />\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='shibboleth.xsd' Guid='{18F3DD83-0C0A-480E-8C87-043C9296DFE5}'>\r
- <File Name='shibboleth.xsd' KeyPath='yes' />\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><!--Shibboleth-->\r
</Directory><!--CommonAppDataFolder-->\r
</Directory><!--TargetDir-->\r
-\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='[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />\r
-\r
-\r
<InstallExecuteSequence>\r
- <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>\r
- <Custom Action='EditCatalogSAML10' After='InstallFiles'>NOT Installed</Custom>\r
- <Custom Action='SetEditCatalogSAML11' Before='CostInitialize'>NOT Installed</Custom>\r
- <Custom Action='EditCatalogSAML11' After='InstallFiles'>NOT Installed</Custom>\r
- <Custom Action='SetEditCatalogSAML20' Before='CostInitialize'>NOT Installed</Custom>\r
- <Custom Action='EditCatalogSAML20' After='InstallFiles'>NOT Installed</Custom>\r
-\r
- <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
- <Custom Action='EditXMLToolingCatalog' After='InstallFiles'>NOT Installed</Custom>\r
-\r
<Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
<Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>\r
</InstallExecuteSequence>\r
\r
-\r
-\r
</Module>\r
</Wix>\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 DLLs (x64)'\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='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)\cvs\2.0\cpp-sp\x64\Release'>\r
- <Component Id='shibsplite.dll' Guid='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' Win64='yes'>\r
- <File Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />\r
- </Component>\r
+ <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-sp\x64\Release'>\r
<Component Id='shibsp.dll' Guid='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' Win64='yes'>\r
- <File Name='shibsp$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />\r
</Component>\r
- <Directory Id='lib_debug' Name='debug' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >\r
- <Component Id='shibspliteD.dll' Guid='{5EF6FF17-0510-484B-9F24-523B29EB416C}' Win64='yes'>\r
- <File Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\r
- </Component>\r
+ <Component Id='shibsp_lite.dll' Guid='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' 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='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' Win64='yes'>\r
- <File Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='shibsp_liteD.dll' Guid='{5EF6FF17-0510-484B-9F24-523B29EB416C}' 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
+ <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
\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 DLLs (x86)'\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='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)\cvs\2.0\cpp-sp\Release'>\r
- <Component Id='shibsplite.dll' Guid='{10475E33-434D-4805-B983-195092549BED}'>\r
- <File Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />\r
- </Component>\r
+ <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release'>\r
<Component Id='shibsp.dll' Guid='{9DE384BF-C286-4A72-AED9-AA34384005C0}'>\r
- <File Name='shibsp$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />\r
</Component>\r
- <Directory Id='lib_debug' Name='debug' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >\r
- <Component Id='shibspliteD.dll' Guid='{8E070220-2992-4D45-BF98-459022CD268F}'>\r
- <File Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\r
- </Component>\r
+ <Component Id='shibsp_lite.dll' Guid='{10475E33-434D-4805-B983-195092549BED}'>\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='{4196D799-1162-4D62-9F7A-1F59E90F19F1}'>\r
- <File Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />\r
+ </Component>\r
+ <Component Id='shibsp_liteD.dll' Guid='{8E070220-2992-4D45-BF98-459022CD268F}'>\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
+ <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
-\r
- \r
<Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
<Directory Id='shibboleth' Name='Shibboleth'>\r
<Directory Id='shibboleth_sp' Name='SP'>\r
- \r
<Directory Id='lib' Name='lib'>\r
<Component Id='xercesc.dll' Guid='{5C2BA2C6-36EC-4EB3-A343-8C1C9D499B9C}' Win64='yes'>\r
- <File Id='xercesc.dll' KeyPath='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='{236B6A7F-73C0-4EBF-9C06-90C1BE160ACE}' Win64='yes'>\r
- <File Id='xercescD.dll' KeyPath='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><!-- TARGETDIR -->\r
</Module>\r
</Wix>\r
-\r
- \r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
<Directory Id='shibboleth' Name='Shibboleth'>\r
<Directory Id='shibboleth_sp' Name='SP'>\r
- \r
<Directory Id='lib' Name='lib'>\r
<Component Id='xercesc.dll' Guid='{64C16FA9-685C-4612-B9C2-0B56C84A69E1}'>\r
- <File Id='xercesc.dll' KeyPath='yes'\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='{3F92209F-35C7-4D7C-BAC3-B0A96DF0CBDF}'>\r
- <File Id='xercescD.dll' KeyPath='yes'\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><!-- TARGETDIR -->\r
</Module>\r
</Wix>\r
-\r
- \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='{3EB5B168-1FB1-476D-8E7C-2469D9B55162}' Win64='yes'>\r
- <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\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' Name='c14n.exe'/>\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' Name='checksig.exe'/>\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' Name='cipher.exe'/>\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' Name='siginf.exe'/>\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' Name='templatesign.exe'/>\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' Name='txfmout.exe'/>\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='{EC1CCD0D-028D-4C92-846D-88C1C24B66E6}' Win64='yes'>\r
- <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\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' Name='c14n.exe'/>\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' Name='checksig.exe'/>\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' Name='cipher.exe'/>\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' Name='siginf.exe'/>\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' Name='templatesign.exe'/>\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' Name='txfmout.exe'/>\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}'>\r
- <File KeyPath='yes' Name='SANTUARIO.LICENSE' Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE' />\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><!-- TARGETDIR -->\r
</Module>\r
</Wix> \r
-\r
- \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='{8920023D-92CA-4012-8BF8-6D80D791375D}'>\r
- <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion).dll'/>\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' Name='c14n.exe'/>\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' Name='checksig.exe'/>\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' Name='cipher.exe'/>\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' Name='siginf.exe'/>\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' Name='templatesign.exe'/>\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' Name='txfmout.exe'/>\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='{9FF121C0-9C75-428E-A8A2-5DD0F499CA73}'>\r
- <File KeyPath='yes' Name='xsec_$(var.XmlSecFileVersion)D.dll'/>\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' Name='c14n.exe'/>\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' Name='checksig.exe'/>\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' Name='cipher.exe'/>\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' Name='siginf.exe'/>\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' Name='templatesign.exe'/>\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' Name='txfmout.exe'/>\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' Source='$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\LICENSE' />\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><!-- TARGETDIR -->\r
</Module>\r
</Wix> \r
-\r
- \r
<Directory Id='shibboleth_sp' Name='SP'>\r
<Directory Id='lib' Name='lib'>\r
<Component Id='zlib1.dll' Guid='{792D44C3-3DCE-465D-AAFF-520AB2F20DA2}' Win64='yes'>\r
- <File KeyPath='yes'\r
+ <File KeyPath='yes' Checksum='yes'\r
Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win64_DLL_Release\zlib$(var.ZlibFileVersion).dll'/>\r
</Component>\r
<Directory Id='lib_debug' Name='debug'>\r
<Component Id='zlib1d.dll' Guid='{74D67C6F-655E-4E4D-A147-39F32DB6E796}' Win64='yes'>\r
- <File Id='zlib1d.dll' KeyPath='yes' \r
+ <File KeyPath='yes' Checksum='yes'\r
Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win64_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
</Component>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- TARGETDIR -->\r
</Module>\r
</Wix>\r
-\r
- \r
<Directory Id='shibboleth_sp' Name='SP'>\r
<Directory Id='lib' Name='lib'>\r
<Component Id='zlib1.dll' Guid='{059557A8-7311-47BB-8A5F-CC85F72AE495}'>\r
- <File KeyPath='yes'\r
+ <File KeyPath='yes' Checksum='yes'\r
Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'/>\r
</Component>\r
<Directory Id='lib_debug' Name='debug'>\r
<Component Id='zlib1d.dll' Guid='{3DA71CD4-F204-49D5-A689-7B1B4C2D395A}'>\r
- <File Id='zlib1d.dll' KeyPath='yes' \r
+ <File KeyPath='yes' Checksum='yes'\r
Source='$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Debug\zlib$(var.ZlibFileVersion)d.dll'/>\r
</Component>\r
</Directory><!-- lib_debug-->\r
</Directory><!-- TARGETDIR -->\r
</Module>\r
</Wix>\r
-\r
- \r
<!-- Files -->\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' >\r
- <Merge Id='OpenSAML-schemas' Language='1033' SourceFile='.\OpenSAML-schemas.msm' DiskId='1' />\r
-\r
- <Merge Id='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' /> \r
- <Merge Id='OpenSSL-32' Language='1033' SourceFile='.\OpenSSL-x86.msm' DiskId='1' />\r
- <Merge Id='XmlTooling-32' Language='1033' SourceFile='.\XmlTooling-x86.msm' DiskId='1' /> \r
-\r
- <Merge Id='XmlTooling-Schemas' Language='1033' SourceFile='.\XmlTooling-schemas.msm' DiskId='1' />\r
<Merge Id='Curl-32' Language='1033' SourceFile='.\Curl-x86.msm' DiskId='1' />\r
<Merge Id='FastCGI-32' Language='1033' SourceFile='.\FastCGI-x86.msm' DiskId='1' />\r
<Merge Id='Log4Shib-32' Language='1033' SourceFile='.\Log4Shib-x86.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-32' Language='1033' SourceFile='.\OpenSAML-x86.msm' DiskId='1' /> \r
+ <Merge Id='OpenSSL-32' Language='1033' SourceFile='.\OpenSSL-x86.msm' DiskId='1' />\r
<Merge Id='Shibboleth-32' Language='1033' SourceFile='.\Shibboleth-x86.msm' DiskId='1' />\r
<Merge Id='Xerces-32' Language='1033' SourceFile='.\Xerces-x86.msm' DiskId='1' />\r
<Merge Id='XmlSec-32' Language='1033' SourceFile='.\XmlSec-x86.msm' DiskId='1' />\r
<Merge Id='Zlib-32' Language='1033' SourceFile='.\Zlib-x86.msm' DiskId='1' />\r
</Directory>\r
- <Directory Id='ProgramFiles64Folder' >\r
- <Merge Id='OpenSSL-64' Language='1033' SourceFile='.\OpenSSL-x64.msm' DiskId='1' />\r
- <Merge Id='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' />\r
+ <Directory Id='ProgramFiles64Folder'>\r
<Merge Id='Curl-64' Language='1033' SourceFile='.\Curl-x64.msm' DiskId='1' />\r
<Merge Id='FastCGI-64' Language='1033' SourceFile='.\FastCGI-x64.msm' DiskId='1' />\r
<Merge Id='Log4Shib-64' Language='1033' SourceFile='.\Log4Shib-x64.msm' DiskId='1' />\r
+ <Merge Id='OpenSAML-64' Language='1033' SourceFile='.\OpenSAML-x64.msm' DiskId='1' />\r
+ <Merge Id='OpenSSL-64' Language='1033' SourceFile='.\OpenSSL-x64.msm' DiskId='1' />\r
<Merge Id='Shibboleth-64' Language='1033' SourceFile='.\Shibboleth-x64.msm' DiskId='1' />\r
<Merge Id='Xerces-64' Language='1033' SourceFile='.\Xerces-x64.msm' DiskId='1' />\r
<Merge Id='XmlSec-64' Language='1033' SourceFile='.\XmlSec-x64.msm' DiskId='1' />\r
- <Merge Id='XmlTooling-64' Language='1033' SourceFile='.\XmlTooling-x64.msm' DiskId='1' />\r
<Merge Id='Zlib-64' Language='1033' SourceFile='.\Zlib-x64.msm' DiskId='1' />\r
</Directory>\r
+ <Directory Id='CommonAppDataFolder'>\r
+ <Merge Id='OpenSAML-schemas' Language='1033' SourceFile='.\OpenSAML-schemas.msm' DiskId='1' />\r
+ <Merge Id='Shibboleth-schemas' Language='1033' SourceFile='.\Shibboleth-schemas.msm' DiskId='1' />\r
+ </Directory>\r
</Directory>\r
\r
<!-- Feature -->\r
<Feature Id='MyFeature' Title='My 1st Feature' Level='1'>\r
- <MergeRef Id='OpenSAML-schemas'/>\r
- <MergeRef Id='OpenSAML-32'/> \r
- <MergeRef Id='OpenSSL-32'/>\r
- <MergeRef Id='OpenSSL-64'/>\r
- <MergeRef Id='OpenSAML-64'/>\r
<MergeRef Id='Curl-32'/>\r
<MergeRef Id='Curl-64'/>\r
<MergeRef Id='FastCGI-32'/>\r
<MergeRef Id='FastCGI-64'/>\r
- <MergeRef Id='FastCGI-32'/>\r
- <MergeRef Id='FastCGI-64'/>\r
<MergeRef Id='Log4Shib-32'/>\r
<MergeRef Id='Log4Shib-64'/>\r
+ <MergeRef Id='OpenSAML-schemas'/>\r
+ <MergeRef Id='OpenSAML-32'/> \r
+ <MergeRef Id='OpenSAML-64'/>\r
+ <MergeRef Id='OpenSSL-32'/>\r
+ <MergeRef Id='OpenSSL-64'/>\r
+ <MergeRef Id='Shibboleth-schemas'/>\r
<MergeRef Id='Shibboleth-32'/>\r
<MergeRef Id='Shibboleth-64'/>\r
<MergeRef Id='Xerces-32'/>\r
<MergeRef Id='Xerces-64'/>\r
<MergeRef Id='XmlSec-32'/>\r
<MergeRef Id='XmlSec-64'/>\r
- <MergeRef Id='XmlTooling-Schemas'/> \r
- <MergeRef Id='XmlTooling-64'/>\r
<MergeRef Id='Zlib-32'/>\r
<MergeRef Id='Zlib-64'/>\r
- <MergeRef Id='XmlTooling-32'/>\r
</Feature>\r
</Product>\r
</Wix>\r
\r
<ComponentRef Id='openssl.cnf'/>\r
<ComponentRef Id='upgrade.xsl'/>\r
- <ComponentRef Id='examplemetadata.xml'/>\r
- <ComponentRef Id='exampleshibboleth2.xml'/> \r
+ <ComponentRef Id='example_metadata.xml'/>\r
+ <ComponentRef Id='example_shibboleth2.xml'/> \r
<ComponentRef Id='xsltproc.js'/>\r
<ComponentRef Id='keygen.bat'/>\r
-\r
- <ComponentRef Id='dist_noperm'/>\r
+ <ComponentRef Id='attrChecker.html'/>\r
<ComponentRef Id='sslError.html'/>\r
<ComponentRef Id='bindingTemplate.html'/>\r
<ComponentRef Id='globalLogout.html'/>\r
<ComponentRef Id='localLogout.html'/>\r
- <ComponentRef Id='attributemap'/>\r
- <ComponentRef Id='attributepolicy'/>\r
+ <ComponentRef Id='attribute_map.xml'/>\r
+ <ComponentRef Id='attribute_policy.xml'/>\r
<ComponentRef Id='shibboleth2.xml'/>\r
<ComponentRef Id='console.logger'/>\r
<ComponentRef Id='discoveryTemplate.html'/>\r
<ComponentRef Id='postTemplate.html'/>\r
<ComponentRef Id='partialLogout.html'/>\r
<ComponentRef Id='protocols.xml'/>\r
- <ComponentRef Id='securitypolicy.xml'/>\r
-\r
+ <ComponentRef Id='security_policy.xml'/>\r
<ComponentRef Id='accessError.html'/>\r
<ComponentRef Id='apache.config'/>\r
<ComponentRef Id='apache2.config'/>\r
+ <ComponentRef Id='apache22.config.in'/>\r
+ <ComponentRef Id='apache24.config.in'/>\r
<ComponentRef Id='metadataError.html'/>\r
- <ComponentRef Id='native.logger'/>\r
+ <ComponentRef Id='native.logger.in'/>\r
<ComponentRef Id='sessionError.html'/>\r
- <ComponentRef Id='shibd.logger'/>\r
+ <ComponentRef Id='shibd.logger.in'/>\r
+ <ComponentRef Id='var_cache_shibboleth_folder'/>\r
<ComponentRef Id='var_log_shibboleth_folder'/>\r
<ComponentRef Id='var_run_shibboleth_folder'/>\r
\r
- <!-- ShibbolethSP-exe-x64-->\r
+ <!-- ShibbolethSP-exe-x86-->\r
\r
<ComponentRef Id='resolvertest.exe'/>\r
<ComponentRef Id='mdquery.exe'/>\r
<ComponentRef Id='mod_shib_13.so'/>\r
<ComponentRef Id='mod_shib_20.so'/>\r
<ComponentRef Id='mod_shib_22.so'/>\r
+ <ComponentRef Id='mod_shib_24.so'/>\r
<ComponentRef Id='nsapi_shib.dll'/>\r
- <ComponentRef Id='odbcstore.so'/>\r
+ <ComponentRef Id='odbc_store.so'/>\r
+ <ComponentRef Id='plugins.so'/>\r
<ComponentRef Id='shibauthorizer.exe'/>\r
<ComponentRef Id='shibresponder.exe'/>\r
\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
+ <ComponentRef Id='adfs.so_debug'/>\r
+ <ComponentRef Id='adfs_lite.so_debug'/>\r
+ <ComponentRef Id='isapi_shib.dll_debug'/>\r
+ <ComponentRef Id='mod_shib_13.so_debug'/>\r
+ <ComponentRef Id='mod_shib_20.so_debug'/>\r
+ <ComponentRef Id='mod_shib_22.so_debug'/>\r
+ <ComponentRef Id='mod_shib_24.so_debug'/>\r
+ <ComponentRef Id='nsapi_shib.dll_debug'/>\r
+ <ComponentRef Id='odbc_store.so_debug'/>\r
+ <ComponentRef Id='plugins.so_debug'/>\r
+ <ComponentRef Id='shibauthorizer.exe_debug'/>\r
+ <ComponentRef Id='shibresponder.exe_debug'/>\r
\r
<ComponentRef Id='shibd.exe'/>\r
- <ComponentRef Id='shibdD.exe'/>\r
+ <ComponentRef Id='shibd.exe_debug'/>\r
\r
<!-- ShibbolethSP-registry-x32 -->\r
<ComponentRef Id='file_extension'/>\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
- -->\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' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release' >\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 Id='resolvertest64.exe' Name='resolvertest.exe' KeyPath='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 Id='mdquery64.exe' Name='mdquery.exe' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Id='mdquery64.exe' Name='mdquery.exe' />\r
</Component>\r
- <Directory Id='bin64_debug' Name='debug' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >\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 Id='resolvertest64.exe_debug' Name='resolvertest.exe' KeyPath='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 Id='mdquery64.exe_debug' Name='mdquery.exe' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Id='mdquery64.exe_debug' Name='mdquery.exe' />\r
</Component>\r
</Directory><!-- bin_debug -->\r
</Directory><!-- bin -->\r
-\r
<Directory Id='lib64' Name='lib64' >\r
- <Directory Id='lib64_shibboleth' Name='shibboleth' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release' >\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 Id='adfs64.so' Name='adfs.so' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Id='adfs64.so' Name='adfs.so' />\r
</Component>\r
<Component Id='adfslite64.so' Guid='{1162CDA0-C3F8-4599-B01E-9EDAA73B2C0B}' Win64='yes'>\r
- <File Id='adfslite64.so' Name='adfs-lite.so' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Id='adfslite64.so' Name='adfs-lite.so' />\r
</Component>\r
<Component Id='isapi_shib64.dll' Guid='{3BC7260B-D035-4F79-A39E-EDA0181BBB1B}' Win64='yes'>\r
- <File Id='isapi_shib64.dll' Name='isapi_shib.dll' KeyPath='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 Id='mod_shib_2264.so' Name='mod_shib_22.so' KeyPath='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='odbcstore64.so' Guid='{D9CF6BD3-4BDB-4BC5-9EB3-6C68CA7544B6}' Win64='yes'>\r
- <File Id='odbcstore64.so' Name='odbc-store.so' KeyPath='yes' />\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='shibauthorizer64.exe' Guid='{5A323F4F-AE87-451A-9253-1965E46C9C5F}' Win64='yes'>\r
- <File Id='shibauthorizer64.exe' Name='shibauthorizer.exe' KeyPath='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 Id='shibresponder64.exe' Name='shibresponder.exe' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Id='shibresponder64.exe' Name='shibresponder.exe' />\r
</Component>\r
- <Directory Id='lib64_shibboleth_debug' Name='debug' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >\r
- <Component Id='adfsD64.so' Guid='{BFF58DDD-CF04-49B1-A172-C84087705D2A}' Win64='yes'>\r
- <File Id='adfsD64.so' Name='adfs.so' KeyPath='yes' />\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='adfsliteD64.so' Guid='{2A3D71BE-BF8F-4CBD-B890-B25F391B09FA}' Win64='yes'>\r
- <File Id='adfs_liteD64.so' Name='adfs-lite.so' KeyPath='yes' />\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='isapi_shibD64.dll' Guid='{60BC5679-A40E-42E5-9FC0-CCE924E660ED}' Win64='yes'>\r
- <File Id='isapi_shibD64.dll' Name='isapi_shib.dll' KeyPath='yes' />\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='mod_shib_22D64.so' Guid='{59FE3C18-1920-48A0-80BC-7ECF8579E441}' Win64='yes'>\r
- <File Id='mod_shib_22D64.so' Name='mod_shib_22.so' KeyPath='yes' />\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='odbcstoreD64.so' Guid='{586CE55A-F089-4541-96D5-5EE26F8FC471}' Win64='yes'>\r
- <File Id='odbc_storeD64.so' Name='odbc-store.so' KeyPath='yes' />\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='shibauthorizerD64.exe' Guid='{642C9137-66C8-4E2E-A76C-4D9F65B17157}' Win64='yes'>\r
- <File Id='shibauthorizer64.exe_Debug' Name='shibauthorizer.exe' KeyPath='yes' />\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='shibresponderD64.exe' Guid='{7947F31A-1429-44FC-85B2-BF1E7AA50D20}' Win64='yes'>\r
- <File Id='shibresponder64.exe_Debug' Name='shibresponder.exe' KeyPath='yes' />\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'\r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release' >\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 Id='shibd64.exe' Name='shibd.exe' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Id='shibd64.exe' Name='shibd.exe' />\r
</Component>\r
- <Directory Id='sbin64_debug' Name='debug'\r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >\r
- <Component Id='shibdD64.exe' Guid='{657A1902-0104-47C7-84A7-AEB5F736B02F}' Win64='yes'>\r
- <File Id='shibd64.exe_debug' Name='shibd.exe' KeyPath='yes' />\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
-\r
- <!-- Components\r
- <ComponentRef Id='resolvertest64.exe'/>\r
- <ComponentRef Id='mdquery64.exe'/>\r
- <ComponentRed Id='resolvertest64.exe_debug'/>\r
- <ComponentRef Id='mdquery64.exe_debug' />\r
-\r
- <ComponentRef Id='adfs64.so'/>\r
- <ComponentRef Id='adfslite64.so'/>\r
- <ComponentRef Id='isapi_shib64.dll'/>\r
- <ComponentRef Id='mod_shib_2264.so'/>\r
- <ComponentRef Id='odbcstore64.so'/>\r
- <ComponentRef Id='shibauthorizer64.exe'/>\r
- <ComponentRef Id='shibresponder64.exe'/>\r
-\r
- <ComponentRef Id='adfsD64.so'/>\r
- <ComponentRef Id='adfsliteD64.so'/>\r
- <ComponentRef Id='isapi_shibD64.dll'/>\r
- <ComponentRef Id='mod_shib_22D64.so'/>\r
- <ComponentRef Id='odbcstoreD64.so'/>\r
- <ComponentRef Id='shibauthorizerD64.exe'/>\r
- <ComponentRef Id='shibresponderD64.exe'/>\r
-\r
- <ComponentRef Id='shibd64.exe'/>\r
- <ComponentRef Id='shibdD64.exe'/>\r
- -->\r
-\r
</Fragment>\r
</Wix>\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
- -->\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' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >\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 Name='resolvertest.exe' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Name='resolvertest.exe' />\r
</Component>\r
<Component Id='mdquery.exe' Guid='{5F322597-3B26-48E5-95BA-CF991CF6D6DB}'>\r
- <File Name='mdquery.exe' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Name='mdquery.exe' />\r
</Component>\r
- <Directory Id='bin_debug' Name='debug' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >\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 Name='resolvertest.exe' Id='resolvertest.exe_debug' KeyPath='yes'/>\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 Name='mdquery.exe' Id='mdquery.exe_debug' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Id='mdquery.exe_debug' Name='mdquery.exe' />\r
</Component>\r
</Directory><!-- bin_debug -->\r
</Directory><!-- bin -->\r
-\r
<Directory Id='lib' Name='lib' >\r
- <Directory Id='lib_shibboleth' Name='shibboleth' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >\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 Name='adfs.so' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Name='adfs.so' />\r
</Component>\r
- <Component Id='adfslite.so' Guid='{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}'>\r
- <File Name='adfs-lite.so' KeyPath='yes' />\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 Name='isapi_shib.dll' KeyPath='yes' />\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 Name='mod_shib_13.so' KeyPath='yes' />\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 Name='mod_shib_20.so' KeyPath='yes' />\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 Name='mod_shib_22.so' KeyPath='yes' />\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 Name='nsapi_shib.dll' KeyPath='yes' />\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='odbcstore.so' Guid='{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}'>\r
- <File Name='odbc-store.so' KeyPath='yes' />\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='shibauthorizer.exe' Guid='{7C7C1C24-902A-4003-AE59-599E79161782}'>\r
- <File Name='shibauthorizer.exe' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Name='shibauthorizer.exe' />\r
</Component>\r
<Component Id='shibresponder.exe' Guid='{510267D9-61F2-47EF-99D2-CB3D21CB14EB}'>\r
- <File Name='shibresponder.exe' KeyPath='yes' />\r
+ <File KeyPath='yes' Checksum='yes' Name='shibresponder.exe' />\r
</Component>\r
- <Directory Id='lib_shibboleth_debug' Name='debug' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >\r
- <Component Id='adfsD.so' Guid='{9B8E071F-B251-4373-A786-8966FD0D22EF}'>\r
- <File Id='adfsD.so' Name='adfs.so' KeyPath='yes' />\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='adfsliteD.so' Guid='{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}'>\r
- <File Id='adfs_liteD.so' Name='adfs-lite.so' KeyPath='yes' />\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_shibD.dll' Guid='{F8212D30-0BA8-4F02-B595-E8E5D312342B}'>\r
- <File Id='isapi_shibD.dll' Name='isapi_shib.dll' KeyPath='yes' />\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_13D.so' Guid='{E8B798AB-D772-428D-8033-2A77CB437CF0}'>\r
- <File Id='mod_shib_13D.so' Name='mod_shib_13.so' KeyPath='yes' />\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_20D.so' Guid='{468806BF-6924-47D5-B319-608C2D63FDDC}'>\r
- <File Id='mod_shib_20D.so' Name='mod_shib_20.so' KeyPath='yes' />\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_22D.so' Guid='{3DA4492F-C0EA-4286-9C37-13F82342FA67}'>\r
- <File Id='mod_shib_22D.so' Name='mod_shib_22.so' KeyPath='yes' />\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='nsapi_shibD.dll' Guid='{492A5D72-4FE0-417E-9023-311E1BF34816}'>\r
- <File Id='nsapi_shibD.dll' Name='nsapi_shib.dll' KeyPath='yes' />\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='odbcstoreD.so' Guid='{F217D7CF-91C1-4318-901D-709C710803C6}'>\r
- <File Id='odbc_storeD.so' Name='odbc-store.so' KeyPath='yes' />\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='shibauthorizerD.exe' Guid='{83360639-DDC0-4B76-8168-21FB77EE6CD6}'>\r
- <File Id='shibauthorizer.exe_Debug' Name='shibauthorizer.exe' KeyPath='yes' />\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='shibresponderD.exe' Guid='{760124EA-67E5-4393-B3DF-657DCC92F04C}'>\r
- <File Id='shibresponder.exe_Debug' Name='shibresponder.exe' KeyPath='yes' />\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='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'\r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >\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 Name='shibd.exe' KeyPath='yes' />\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)' Type='ownProcess' \r
<ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='uninstall' \r
Remove='uninstall' Start='install' Wait='yes' />\r
</Component>\r
- <Directory Id='sbin_debug' Name='debug'\r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >\r
- <Component Id='shibdD.exe' Guid='{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}'>\r
- <File Id='shibd.exe_debug' Name='shibd.exe' KeyPath='yes' />\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
-\r
- <!-- Components\r
-\r
- <ComponentRef Id='resolvertest.exe'/>\r
- <ComponentRef Id='mdquery.exe'/>\r
- <ComponentRef Id='resolvertest.exe_debug'/>\r
- <ComponentRef Id='mdquery.exe_debug'/>\r
-\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
-\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
-\r
- <ComponentRef Id='shibd.exe'/>\r
- <ComponentRef Id='shibdD.exe'/>\r
- -->\r
-\r
</Fragment>\r
</Wix>\r
\r
<Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
\r
-\r
<?include ShibbolethSP-properties.wxi?>\r
\r
<!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->\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='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='MergeModules\OpenSAML-schemas.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='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />\r
<Merge Id='CurlMergeModule_x64' Language='1033' SourceFile='MergeModules\Curl-x64.msm' DiskId='1' />\r
<Merge Id='FastCGIMergeModule_x64' Language='1033' SourceFile='MergeModules\FastCGI-x64.msm' DiskId='1' />\r
<Merge Id='Log4ShibMergeModule_x64' Language='1033' SourceFile='MergeModules\Log4Shib-x64.msm' DiskId='1' />\r
+ <Merge Id='OpenSAMLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSAML-x64.msm' DiskId='1' />\r
<Merge Id='OpenSSLMergeModule_x64' Language='1033' SourceFile='MergeModules\OpenSSL-x64.msm' DiskId='1' />\r
<Merge Id='ShibbolethMergeModule_x64' Language='1033' SourceFile='MergeModules\Shibboleth-x64.msm' DiskId='1' />\r
<Merge Id='XercesMergeModule_x64' Language='1033' SourceFile='MergeModules\Xerces-x64.msm' DiskId='1' />\r
<Environment Id='SetPath' Name='PATH' Action='set' Part='last' System='yes'\r
Value='[ProgramFilesFolder]Shibboleth\SP\lib' />\r
</Component>\r
-\r
</Directory><!--TARGETDIR-->\r
\r
- <DirectoryRef Id='etc_shibboleth' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs'>\r
+ <DirectoryRef Id='etc_shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs'>\r
<Component Id='SetService64' Guid='{8DE75314-84B5-4BD1-ABD2-9FC1DEE399DC}' Permanent='yes'>\r
<File KeyPath='yes' Name='SetService64.bat' />\r
</Component>\r
</Component>\r
</DirectoryRef><!-- etc_shibboleth -->\r
\r
- <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' \r
- ConfigurableDirectory='INSTALLDIR'>\r
+ <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' ConfigurableDirectory='INSTALLDIR'>\r
<MergeRef Id='CurlMergeModule_x86'/>\r
<MergeRef Id='FastCGIMergeModule_x86'/>\r
<MergeRef Id='Log4ShibMergeModule_x86'/>\r
+ <MergeRef Id='OpenSAMLMergeModule_x86'/>\r
+ <MergeRef Id='OpenSAMLMergeModule_schemas'/>\r
<MergeRef Id='OpenSSLMergeModule_x86'/>\r
<MergeRef Id='ShibbolethMergeModule_x86'/>\r
<MergeRef Id='ShibbolethMergeModule_schemas'/>\r
<MergeRef Id='CurlMergeModule_x64'/>\r
<MergeRef Id='FastCGIMergeModule_x64'/>\r
<MergeRef Id='Log4ShibMergeModule_x64'/>\r
+ <MergeRef Id='OpenSAMLMergeModule_x64'/>\r
<MergeRef Id='OpenSSLMergeModule_x64'/>\r
<MergeRef Id='ShibbolethMergeModule_x64'/>\r
<MergeRef Id='XercesMergeModule_x64'/>\r
<ComponentRef Id='mdquery64.exe_debug' />\r
\r
<ComponentRef Id='adfs64.so'/>\r
- <ComponentRef Id='adfslite64.so'/>\r
+ <ComponentRef Id='adfs_lite64.so'/>\r
<ComponentRef Id='isapi_shib64.dll'/>\r
<ComponentRef Id='mod_shib_2264.so'/>\r
- <ComponentRef Id='odbcstore64.so'/>\r
+ <ComponentRef Id='mod_shib_2464.so'/>\r
+ <ComponentRef Id='odbc_store64.so'/>\r
+ <ComponentRef Id='plugins64.so'/>\r
<ComponentRef Id='shibauthorizer64.exe'/>\r
<ComponentRef Id='shibresponder64.exe'/>\r
\r
- <ComponentRef Id='adfsD64.so'/>\r
- <ComponentRef Id='adfsliteD64.so'/>\r
- <ComponentRef Id='isapi_shibD64.dll'/>\r
- <ComponentRef Id='mod_shib_22D64.so'/>\r
- <ComponentRef Id='odbcstoreD64.so'/>\r
- <ComponentRef Id='shibauthorizerD64.exe'/>\r
- <ComponentRef Id='shibresponderD64.exe'/>\r
+ <ComponentRef Id='adfs64.so_debug'/>\r
+ <ComponentRef Id='adfs_lite64.so_debug'/>\r
+ <ComponentRef Id='isapi_shib64.dll_debug'/>\r
+ <ComponentRef Id='mod_shib_2264.so_debug'/>\r
+ <ComponentRef Id='mod_shib_2464.so_debug'/>\r
+ <ComponentRef Id='odbc_store64.so_debug'/>\r
+ <ComponentRef Id='plugins64.so_debug'/>\r
+ <ComponentRef Id='shibauthorizer64.exe_debug'/>\r
+ <ComponentRef Id='shibresponder64.exe_debug'/>\r
\r
<ComponentRef Id='shibd64.exe'/>\r
- <ComponentRef Id='shibdD64.exe'/>\r
+ <ComponentRef Id='shibd64.exe_debug'/>\r
\r
<!-- ShibbolethSP-registry-x64 -->\r
\r
<Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' \r
Manufacturer='Shibboleth Consortium' Name='Shibboleth $(var.ShibbolethVersion)' \r
UpgradeCode='$(var.ShibbolethUpgradeCode)' Version='$(var.ShibbolethVersion)'>\r
- <Package Description='Installer for Shibboleth SP (x86 and x64)' Compressed='yes'\r
+ <Package Description='Installer for Shibboleth SP (32-bit only)' Compressed='yes'\r
Manufacturer='Shibboleth Consortium' InstallerVersion='300'/>\r
\r
<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." \r
<Condition Message='Shibboleth requires a Windows NT-based operating system.'>NOT Version9X</Condition>\r
<Condition Message='You must uninstall recent versions of Shibboleth before using this installer. To uninstall, use the "Change" option from the Add/Remove dialog and then Remove. Attempting to uninstall directly causes the installer to hang on most systems.'>SHIB_OLDVERSION = "none"</Condition>\r
\r
- <Condition Message='For a 32 installation on a 64 architecture, install the 64bit msi but specify a 32 bit shibd'>NOT VersionNT64</Condition>\r
+ <Condition Message='For a 32 installation on a 64 architecture, install the 64-bit MSI but specify the 32-bit Service'>NOT VersionNT64</Condition>\r
\r
<Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
\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='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='MergeModules\OpenSAML-schemas.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='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />\r
<MergeRef Id='CurlMergeModule_x86'/>\r
<MergeRef Id='FastCGIMergeModule_x86'/>\r
<MergeRef Id='Log4ShibMergeModule_x86'/>\r
+ <MergeRef Id='OpenSAMLMergeModule_x86'/>\r
+ <MergeRef Id='OpenSAMLMergeModule_schemas'/>\r
<MergeRef Id='OpenSSLMergeModule_x86'/>\r
<MergeRef Id='ShibbolethMergeModule_x86'/>\r
<MergeRef Id='ShibbolethMergeModule_schemas'/>\r
<?include Versions.wxi ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\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
+ <!--\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' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\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 Name='main.css' KeyPath='yes'/>\r
+ <File KeyPath='yes' Name='main.css' />\r
</Component>\r
<Component Id='logo.jpg' Guid='{7F05E91A-A390-4A72-B4DC-1A4FE950B30A}'>\r
- <File Name='logo.jpg' />\r
+ <File KeyPath='yes' Name='logo.jpg' />\r
</Component>\r
<Component Id='CREDITS.txt' Guid='{9A792E0C-61F1-4D08-9672-BE82FFB6B7F1}'>\r
- <File Name='CREDITS.txt' />\r
+ <File KeyPath='yes' Name='CREDITS.txt' />\r
</Component>\r
<Component Id='LICENSE.txt' Guid='{404E7A3C-22C2-4A02-8DC0-7D5C0B25DED1}'>\r
- <File Name='LICENSE.txt' />\r
+ <File KeyPath='yes' Name='LICENSE.txt' />\r
</Component>\r
<Component Id='NOTICE.txt' Guid='{80619251-6754-480A-AFAA-D7398482053C}'>\r
- <File Name='NOTICE.txt' />\r
+ <File KeyPath='yes' Name='NOTICE.txt' />\r
</Component>\r
<Component Id='README.txt' Guid='{2E5A28EE-B70B-402B-8E6F-72E8EC1EEF0D}'>\r
- <File Name='README.txt'/>\r
+ <File KeyPath='yes' Name='README.txt'/>\r
</Component>\r
<Component Id='RELEASE.txt' Guid='{5822AF4E-BE53-4952-B662-6BE2D3913D31}'>\r
- <File Name='RELEASE.txt' />\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' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs' >\r
+ <Directory Id='etc_shibboleth' Name='shibboleth' FileSource='$(var.SPBuildDirectory)\cpp-sp\configs' >\r
<Component Id='openssl.cnf' Guid='{1F1B9F9B-6437-46F1-ACE8-8D135612336C}' Permanent='yes'>\r
- <File KeyPath='yes' \r
- Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\apps\openssl.cnf' />\r
+ <File KeyPath='yes' Source='$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\apps\openssl.cnf' />\r
</Component>\r
<Component Id='upgrade.xsl' Guid='{D8D1270C-2F85-4465-8EC0-F5F30A2B3EDD}' Permanent='yes'>\r
- <File Name='upgrade.xsl' />\r
+ <File KeyPath='yes' Name='upgrade.xsl' />\r
</Component>\r
- <Component Id='examplemetadata.xml' Guid='{D9852008-249D-405D-8059-5DAD307D2723}' \r
- Permanent='yes'>\r
- <File Name='example-metadata.xml' />\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='exampleshibboleth2.xml' Guid='{85415A41-2B4E-406F-9CFC-63CFC360A9C7}' \r
- Permanent='yes'>\r
- <File Name='example-shibboleth2.xml' />\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}' Permanent='yes'>\r
- <File Name='keygen.bat' KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs\keygen.bat-wix'/>\r
+ <File KeyPath='yes' Name='keygen.bat' Source='$(var.SPBuildDirectory)\cpp-sp\configs\keygen.bat-wix'/>\r
</Component>\r
<Component Id='xsltproc.js' Guid='{B87F4A53-3C37-45DA-BE6F-C46790FA7C2D}' Permanent='yes'>\r
- <File Name='xsltproc.js' />\r
+ <File KeyPath='yes' Name='xsltproc.js' />\r
</Component>\r
- <Directory Id='etc_shibboleth_dist' Name='dist' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\configs' >\r
- <Component Id='dist_noperm' Guid='{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}'>\r
-\r
- <File Name='apache22.config.in' KeyPath='yes' />\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='{6AEBA525-8F52-4D14-BAEE-0292A2E214D1}'>\r
+ <File KeyPath='yes' Name='apache24.config.in' />\r
</Component>\r
<Component Id='sslError.html' Guid='{A74BA230-C49F-4151-BBF4-AA80D554D099}'>\r
- <File Name='sslError.html' />\r
+ <File KeyPath='yes' Name='sslError.html' />\r
</Component>\r
<Component Id='bindingTemplate.html' Guid='{F5A3A434-9209-43EC-9314-1F705055DDEC}'>\r
- <File Name='bindingTemplate.html' />\r
+ <File KeyPath='yes' Name='bindingTemplate.html' />\r
</Component>\r
<Component Id='globalLogout.html' Guid='{E65F580D-5489-4D79-A8FC-F9FFED666FC1}'>\r
- <File Name='globalLogout.html' />\r
+ <File KeyPath='yes' Name='globalLogout.html' />\r
</Component>\r
<Component Id='localLogout.html' Guid='{70FA3A47-A950-4074-BC13-C56D94497BD9}'>\r
- <File Name='localLogout.html' />\r
+ <File KeyPath='yes' Name='localLogout.html' />\r
</Component>\r
- <Component Id='attributemap' Guid='{878C9456-E65F-4541-A0FA-975379EAC6B6}'>\r
- <File Name='attribute-map.xml' />\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='attributepolicy' Guid='{55B88F7B-E2EA-4B70-87B7-33C566B9F992}'>\r
- <File Name='attribute-policy.xml'/>\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 Name='shibboleth2.xml' />\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 Name='console.logger' />\r
+ <File KeyPath='yes' Name='console.logger' />\r
</Component>\r
<Component Id='discoveryTemplate.html' Guid='{A9573113-4387-46DD-A636-84482AF2C672}'>\r
- <File Name='discoveryTemplate.html' />\r
+ <File KeyPath='yes' Name='discoveryTemplate.html' />\r
</Component>\r
<Component Id='postTemplate.html' Guid='{5B7111E8-8E04-42F1-AB02-E47AFB7C3D28}'>\r
- <File Name='postTemplate.html' />\r
+ <File KeyPath='yes' Name='postTemplate.html' />\r
</Component>\r
<Component Id='partialLogout.html' Guid='{E1F6208B-3C70-4632-B84C-C7D141DC4192}'>\r
- <File Name='partialLogout.html' />\r
+ <File KeyPath='yes' Name='partialLogout.html' />\r
</Component>\r
<Component Id='protocols.xml' Guid='{B226CAAC-2D18-411A-9FBF-3FE237EBEF4D}'>\r
- <File Name='protocols.xml' />\r
+ <File KeyPath='yes' Name='protocols.xml' />\r
</Component>\r
- <Component Id='securitypolicy.xml' Guid='{0EC04525-FCCF-4B60-8797-9B0CEC222B8C}'>\r
- <File Name='security-policy.xml' />\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 Name='accessError.html' />\r
- </Component>\r
- <Component Id='apache.config' Guid='{AF4EB2B1-2489-4E39-A89E-1CA7AC2B7483}'>\r
- <File Name='apache.config.in' />\r
+ <File KeyPath='yes' Name='accessError.html' />\r
</Component>\r
- <Component Id='apache2.config' Guid='{85BF72A1-FBA8-4955-ACCF-ABC83B1292C9}'>\r
- <File Name='apache2.config.in' KeyPath='yes' />\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 Name='metadataError.html' KeyPath='yes' />\r
+ <File KeyPath='yes' Name='metadataError.html' />\r
</Component>\r
- <Component Id='native.logger' Guid='{8586D4C7-E237-4C7F-BC79-DE0B06473395}'>\r
- <File Name='native.logger.in' KeyPath='yes' />\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 Name='sessionError.html' KeyPath='yes' />\r
+ <File KeyPath='yes' Name='sessionError.html' />\r
</Component>\r
- <Component Id='shibd.logger' Guid='{D8DA3D14-F779-4691-A883-4995158D2A74}'>\r
- <File Name='shibd.logger.in' KeyPath='yes' />\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
+ </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
<Component Id='var_run_shibboleth_folder' Guid='{35E176B1-965A-4571-B24E-E0C8E69B0459}'>\r
<CreateFolder />\r
</Component>\r
- </Directory>\r
+ </Directory><!-- var_run_shibboleth -->\r
</Directory><!-- var_run -->\r
</Directory><!-- var -->\r
</DirectoryRef>\r
\r
- <Binary Id='EditConfigFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />\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='KeyGen' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='deferred' Impersonate='no' />\r
<CustomAction Id='SetKeyGen' Property='KeyGen' Value='"[INSTALLDIR]etc\shibboleth\keygen.bat"' />\r
\r
- <Binary Id='install_isapi' \r
- SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_install_isapi_filter.vbs-wix'/>\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.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_uninstall_isapi_filter.vbs-wix'/>\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='ShibInstallISAPIFilter' BinaryKey='install_isapi' \r
VBScriptCall='' Execute='deferred' Impersonate='no' />\r
\r
- <CustomAction Id='SetShibUninstallISAPIFilter' Property='ShibUninstallISAPIFilter' \r
- Value='[INSTALLDIR]'/>\r
+ <CustomAction Id='SetShibUninstallISAPIFilter' Property='ShibUninstallISAPIFilter' Value='[INSTALLDIR]'/>\r
<CustomAction Id='ShibUninstallISAPIFilter' BinaryKey='uninstall_isapi' \r
VBScriptCall='' Execute='deferred' Impersonate='no' />\r
\r
(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")\r
</Custom>\r
\r
-\r
<!-- Do not mess with SCM if this is an upgrade -->\r
\r
<InstallServices>(NOT Installed) AND (NOT ALREADYINSTALLED) AND (INSTALL_SHIBD_SERVICE = "TRUE")</InstallServices>\r
<DeleteServices>(REMOVE="ALL") AND (NOT UPGRADINGPRODUCTCODE)</DeleteServices>\r
\r
</InstallExecuteSequence>\r
- \r
- <!-- Components\r
- <ComponentRef Id='main.css'/>\r
- <ComponentRef Id='logo.jpg'/>\r
- <ComponentRef Id='CREDITS.txt'/>\r
- <ComponentRef Id='LICENSE.txt'/>\r
- <ComponentRef Id='NOTICE.txt'/>\r
- <ComponentRef Id='README.txt'/>\r
- <ComponentRef Id='RELEASE.txt'/>\r
- \r
- <ComponentRef Id='openssl.cnf'/>\r
- <ComponentRef Id='upgrade.xsl'/>\r
- <ComponentRef Id='examplemetadata.xml'/>\r
- <ComponentRef Id='exampleshibboleth2.xml' \r
- <ComponentRef Id='xsltproc.js'/>\r
- <ComponentRef Id='keygen.bat'/>\r
-\r
- <ComponentRef Id='dist_noperm'/>\r
- <ComponentRef Id='sslError.html'/>\r
- <ComponentRef Id='bindingTemplate.html'/>\r
- <ComponentRef Id='globalLogout.html'/>\r
- <ComponentRef Id='localLogout.html'/>\r
- <ComponentRef Id='attributemap'/>\r
- <ComponentRef Id='attributepolicy'/>\r
- <ComponentRef Id='shibboleth2.xml'/>\r
- <ComponentRef Id='console.logger'/>\r
- <ComponentRef Id='discoveryTemplate.html'/>\r
- <ComponentRef Id='postTemplate.html'/>\r
- <ComponentRef Id='partialLogout.html'/>\r
- <ComponentRef Id='protocols.xml'/>\r
- <ComponentRef Id='security-policy.xml'\r
-\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='var_run_shibboleth_folder'/> \r
- -->\r
</Fragment>\r
</Wix>\r
<Property Id='ARPCONTACT' Value='contact@shibboleth.net' />\r
<Property Id='ARPHELPLINK' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/Installation+and+Configuration' />\r
<Property Id='ARPURLUPDATEINFO' Value='https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPWindowsUpgrade' />\r
- <Property Id='ARPURLINFOABOUT' Value='http://www.shibboleth.net/' />\r
+ <Property Id='ARPURLINFOABOUT' Value='http://shibboleth.net/' />\r
\r
<!-- UPGRADINGPRODUCTCODE set in the uninstall if this is an upgrade uninstall -->\r
<!-- IISMAJORVERSION if IIS installed -->\r
<PropertyRef Id='IISMAJORVERSION' />\r
\r
-\r
- <!-- ALREADYINSTALLED if we are doig an upgrade -->\r
+ <!-- ALREADYINSTALLED if we are doing an upgrade -->\r
<Upgrade Id='$(var.ShibbolethUpgradeCode)'>\r
<UpgradeVersion ExcludeLanguages='yes' IncludeMaximum='yes' Maximum='127.255.255' Minimum='0.0.1' OnlyDetect='yes' Property='ALREADYINSTALLED'/>\r
</Upgrade>\r
</Include>\r
-\r
<?include Versions.wxi ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\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
+ <!--\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
</Component>\r
\r
<Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'>\r
- <File Id='shib64.ico' KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\shib.ico'/>\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
- <!--\r
- <ComponentRef Id='file_extension64'/>\r
- <ComponentRef Id='shib64.ico' />\r
- -->\r
-\r
</Fragment>\r
</Wix>\r
<?include Versions.wxi ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\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
+ <!--\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
</Component>\r
\r
<Component Id='shib.ico' Guid='{FA0F86A1-0731-4D66-8216-BC74D231B598}'>\r
- <File KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\shib.ico' />\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
- <!--\r
- <ComponentRef Id='file_extension'/>\r
- <ComponentRef Id='shib.ico' />\r
- -->\r
-\r
</Fragment>\r
</Wix>\r
<Control Id='ShibdLine2' Type='Text' X='25' Y='79' Width='312' Height='20' \r
Text='NOTE: This is NOT the web server port and MUST be a valid Windows port number that is NOT in use by any other process!'/>\r
<Control Id='ShibdLine3' Type='Text' X='25' Y='108' Width='312' Height='20' \r
- Text='If a copy of shibboleth.xml already exists in the installation path, it will NOT be updated with this new port number.'/>\r
+ Text='If a copy of shibboleth2.xml already exists in the installation path, it will NOT be updated with this new port number.'/>\r
<Control Id='InstallShibdCheckBox' Type='CheckBox' X='118' Y='154' Width='96' Height='14' \r
Property='INSTALL_SHIBD_SERVICE' Text='Install Shibd daemon' \r
CheckBoxValue='TRUE' TabSkip='yes' />\r
<?define SPBuildDirectory='C:\Users\scantor\Shibboleth\git\' ?>\r
\r
<!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
- <?define ShibbolethVersion='2.4.186'?>\r
+ <?define ShibbolethVersion='2.5.0'?>\r
<!-- DO NOT CHANGE UpgradeCode -->\r
<?define ShibbolethUpgradeCode='{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}' ?>\r
\r
\r
<?define LogForShibFileVersion='1_0' ?> <!-- '$(var.BuildDirectory)\log4shib-$(var.LogForShibVersion)\msvc10\x64\Release\'> -->\r
\r
- <?define OpenSAMLVersion='2.4.3' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
- <?define OpenSAMLFileVersion='2_4' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->\r
+ <?define OpenSAMLVersion='2.5.0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
+ <?define OpenSAMLFileVersion='2_5' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->\r
\r
<?define OpenSSLVersion='1.0.0.9' ?><!-- 1.0.0i -->\r
<?define OpenSSLDirVersion='1.0.0i' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->\r
<?define OpenSSLFileVersion='1_0_0' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
\r
<!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
- <?define ShibbolethDllFileVersion='1_4' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
- <?define ShibbolethDllVersion='1.4.2' ?>\r
+ <?define ShibbolethDllFileVersion='1_5' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
+ <?define ShibbolethDllVersion='1.5.0' ?>\r
\r
<?define XercesVersion='3.1.1' ?><!-- $(var.BuildDirectory)\xerces-c-$(var.XercesVersion)-x86_64-windows-vc-10.0\bin\xerces-c_$(var.XercesFileVersion).dll' -->\r
<?define XercesFileVersion='3_1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
<?define XmlSecVersion='1.6.1' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
<?define XmlSecFileVersion='1_6' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
\r
- <?define XmlToolingVersion='1.4.2' ?>\r
- <?define XmlToolingFileVersion='1_4' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r
+ <?define XmlToolingVersion='1.5.0' ?>\r
+ <?define XmlToolingFileVersion='1_5' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r
\r
<?define ZlibVersion='1.2.5' ?><!--'$(var.BuildDirectory)\zlib-$(var.ZlibVersion)\projects\visualc6\Win32_DLL_Release\zlib$(var.ZlibFileVersion).dll'-->\r
<?define ZlibFileVersion='1' ?><!-- DON'T FORGET TO CHANGE THE COMPONENT-->\r
projects / shibboleth / cpp-sp.git / commitdiff