<?include Versions.wxi ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
- <Product Id='{EA2259A7-D844-475A-B473-CCE3EEA209D9}' Language='1033' \r
+ <Product Id='{973D4080-26FC-430B-9BEA-60ADB78C3CD3}' 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
- Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
\r
<PropertyRef Id='SHIB_OLDVERSION_64'/>\r
<PropertyRef Id='SHIB_OLDVERSION'/>\r
<!-- Files -->\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<!-- The test bit -->\r
- <Directory Id='OPT' Name='opt'>\r
+ <Directory Id='opt' Name='opt'>\r
<Directory Id='INSTALLDIR' Name='shibboleth-sp'/>\r
</Directory>\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='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='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />\r
<Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />\r
- <Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />\r
<Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='MergeModules\Zlib-x86.msm' DiskId='1' />\r
\r
<Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033' \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
<Merge Id='XmlSecMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlSec-x64.msm' DiskId='1' />\r
- <Merge Id='XmlToolingMergeModule_x64' Language='1033' SourceFile='MergeModules\XmlTooling-x64.msm' DiskId='1' />\r
<Merge Id='ZlibMergeModule_x64' Language='1033' SourceFile='MergeModules\Zlib-x64.msm' DiskId='1' />\r
\r
<Merge Id='Microsoft_VC100_DebugCRT_x64' Language='1033' \r
<Merge Id='Microsoft_VC100_CRT_x64' Language='1033' \r
SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x64.msm' DiskId='1' />\r
</Directory><!--ProgramFiles64Folder-->\r
+\r
+ <!-- PATH -->\r
+ <Component Id='SetPath64' Guid='{D3BF9EF4-843A-4D48-BC6C-DC24B063FC35}' Win64='yes'>\r
+ <Environment Id='SetPath64' Name='PATH' Action='set' Part='last' System='yes'\r
+ Value='[ProgramFiles64Folder]Shibboleth\SP\lib' />\r
+ </Component>\r
+ <Component Id='SetPath' Guid='{0E8BD571-3A26-4F61-979E-B5807A28634A}'>\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
- <Feature Id='Shibboleth' Title='Shibboleth' Level='1'>\r
+ <!-- TODO use QtExecCmdLine to execute SetX64Shibd -->\r
+\r
+ <Feature Id='Shibboleth' Title='Shibboleth' Level='1' Display='hidden' \r
+ 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='OpenSSLMergeModule_x86'/>\r
<MergeRef Id='ShibbolethMergeModule_x86'/>\r
+ <MergeRef Id='ShibbolethMergeModule_schemas'/>\r
<MergeRef Id='XercesMergeModule_x86'/>\r
<MergeRef Id='XmlSecMergeModule_x86'/>\r
- <MergeRef Id='XmlToolingMergeModule_x86'/>\r
<MergeRef Id='ZlibMergeModule_x86'/>\r
\r
<MergeRef Id='Microsoft_VC100_DebugCRT_x86'/>\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
<MergeRef Id='XmlSecMergeModule_x64'/>\r
- <MergeRef Id='XmlToolingMergeModule_x64'/>\r
<MergeRef Id='ZlibMergeModule_x64'/>\r
\r
<MergeRef Id='Microsoft_VC100_DebugCRT_x64'/>\r
<ComponentRef Id='file_extension64'/>\r
<ComponentRef Id='shib64.ico' />\r
\r
- <!-- ShibbolethSP-noarch-x64 -->\r
-\r
- <ComponentRef Id='doc_shibboleth'/>\r
- <ComponentRef Id='etc_shibboleth_perm'/>\r
- <ComponentRef Id='etc_shibboleth_nonperm'/>\r
- <ComponentRef Id='dist_noperm'/>\r
- <ComponentRef Id='accessError.html'/>\r
- <ComponentRef Id='apache.config'/>\r
- <ComponentRef Id='apache2.config'/>\r
- <ComponentRef Id='metadataError.html'/>\r
- <ComponentRef Id='native.logger'/>\r
- <ComponentRef Id='sessionError.html'/>\r
- <ComponentRef Id='shibd.logger'/>\r
- <ComponentRef Id='var_log_shibboleth_folder'/>\r
- <ComponentRef Id='share_xml_shibboleth'/>\r
- <ComponentRef Id='share_xml_shibboleth_xsd'/>\r
+ <!-- ShibbolethSP-main-x64 -->\r
+ <ComponentRef Id='SetPath'/>\r
+ <ComponentRef Id='SetPath64'/>\r
\r
- <!-- ShibbolethSP-exe-x64-->\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
- <!-- ShibbolethSP-registry-x64 -->\r
- <ComponentRef Id='file_extension'/>\r
- <ComponentRef Id='shib.ico' />\r
+ <?include ShibbolethSP-defs-x86.wxi ?>\r
\r
</Feature>\r
</Product>\r