--- /dev/null
+wixcop -indent:2 ShibbolethSP-exe-x64.wxs
+candle ShibbolethSP-exe-x64.wxs
+
+wixcop -indent:2 ShibbolethSP-registry-x64.wxs
+candle ShibbolethSP-registry-x64.wxs
+
+wixcop -indent:2 ShibbolethSP-noarch.wxs
+candle ShibbolethSP-noarch.wxs
+
+wixcop -indent:2 ShibbolethSP-exe-x86.wxs
+candle ShibbolethSP-exe-x86.wxs
+
+wixcop -indent:2 ShibbolethSP-registry-x86.wxs
+candle ShibbolethSP-registry-x86.wxs
+
+wixcop -indent:2 ShibbolethSP-main-x64.wxs
+candle ShibbolethSP-main-x64.wxs
+light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj
+
+
<Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>\r
<Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'\r
Comments='This module is built by the Shibboleth Consortium.'\r
- Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x64'/>\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
\r
<Directory Id='TARGETDIR' Name='SourceDir'>\r
<Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
<?include ..\Versions.wxi ?>\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
- <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethVersion)'>\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
Comments='This module is built by the Shibboleth Consortium.'\r
Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\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.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
+ <File Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />\r
</Component>\r
<Component Id='shibsp.dll' Guid='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' Win64='yes'>\r
- <File Name='shibsp$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
+ <File Name='shibsp$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />\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.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
+ <File Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\r
</Component>\r
<Component Id='shibspD.dll' Guid='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' Win64='yes'>\r
- <File Name='shibsp$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
+ <File Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\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='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethVersion)'>\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
Comments='This module is built by the Shibboleth Consortium.'\r
Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\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.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
+ <File Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />\r
</Component>\r
<Component Id='shibsp.dll' Guid='{9DE384BF-C286-4A72-AED9-AA34384005C0}'>\r
- <File Name='shibsp$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
+ <File Name='shibsp$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />\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.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
+ <File Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\r
</Component>\r
<Component Id='shibspD.dll' Guid='{4196D799-1162-4D62-9F7A-1F59E90F19F1}'>\r
- <File Name='shibsp$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
+ <File Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\r
</Component>\r
</Directory><!-- lib_debug -->\r
</Directory><!-- lib -->\r
--- /dev/null
+<?xml version='1.0' encoding='utf-8'?>\r
+\r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+ Development, Inc. (UCAID) under one or more contributor license\r
+ agreements. See the NOTICE file distributed with this work for\r
+ additional information regarding copyright ownership. The UCAID\r
+ licenses this file to You under the Apache License, Version 2.0\r
+ (the 'License'); you may not use this file except in compliance\r
+ with the License. You may obtain a copy of the License at\r
+ \r
+ http://www.apache.org/licenses/LICENSE-2.0\r
+ \r
+ Unless required by applicable law or agreed to in writing, software\r
+ distributed under the License is distributed on an 'AS IS' BASIS,\r
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+ implied. See the License for the specific language governing\r
+ permissions and limitations under the License. -->\r
+\r
+<?include Versions.wxi ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <!-- This is where we put all executables & so & dlls which make up the SP X86 installer\r
+ -->\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
+ <Component Id='resolvertest64.exe' Guid='{C29672B6-971D-4828-BB51-1190C0877381}' Win64='yes'>\r
+ <File Id='resolvertest64.exe' Name='resolvertest.exe' KeyPath='yes' />\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
+ </Component>\r
+ <Directory Id='bin64_debug' Name='debug' \r
+ FileSource='$(var.BuildDirectory)\cvs\2.0\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
+ </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
+ </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
+ <Component Id='adfs64.so' Guid='{2891ECDC-F507-4CEC-8A65-8B20FB93F4B7}' Win64='yes'>\r
+ <File Id='adfs64.so' Name='adfs.so' KeyPath='yes' />\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
+ </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
+ </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
+ </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>\r
+ <Component Id='shibauthorizer64.exe' Guid='{5A323F4F-AE87-451A-9253-1965E46C9C5F}' Win64='yes'>\r
+ <File Id='shibauthorizer64.exe' Name='shibauthorizer.exe' KeyPath='yes' />\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
+ </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
+ </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>\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>\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>\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>\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>\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>\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
+ <Component Id='shibd64.exe' Guid='{707B57A2-CCA0-48A6-9F66-275EB04474AA}' Win64='yes'>\r
+ <File Id='shibd64.exe' Name='shibd.exe' KeyPath='yes' />\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
+ </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
implied. See the License for the specific language governing\r
permissions and limitations under the License. -->\r
\r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define ShibbolethSPFileVersion='1_4' ?>\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
<DirectoryRef Id='INSTALLDIR'>\r
<Directory Id='bin' Name='bin' \r
FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >\r
- <Component Id="resolvertest.exe" Guid="{D381B6FA-2971-457B-804E-F08DD517866F}">\r
- <File Name="resolvertest.exe" KeyPath="yes" />\r
+ <Component Id='resolvertest.exe' Guid='{D381B6FA-2971-457B-804E-F08DD517866F}'>\r
+ <File Name='resolvertest.exe' KeyPath='yes' />\r
</Component>\r
- <Component Id="mdquery.exe" Guid="{AA3655D7-D498-4FEE-A1C4-437C82AA1C2A}">\r
- <File Name="mdquery.exe" KeyPath="yes" />\r
+ <Component Id='mdquery.exe' Guid='{5F322597-3B26-48E5-95BA-CF991CF6D6DB}'>\r
+ <File Name='mdquery.exe' KeyPath='yes' />\r
</Component>\r
<Directory Id='bin_debug' Name='debug' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >\r
- <Component Id="resolvertest.exe_debug" Guid="{4FA03A33-961A-42E5-8D7A-5F2E207757DD}">\r
- <File Name="resolvertest.exe" Id="resolvertest.exe_debug" KeyPath="yes"/>\r
+ FileSource='$(var.BuildDirectory)\cvs\2.0\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
</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
+ <Component Id='mdquery.exe_debug' Guid='{C7A4A6A5-3DAF-4254-9C29-1511AB3ABC62}'>\r
+ <File Name='mdquery.exe' Id='mdquery.exe_debug' KeyPath='yes' />\r
</Component>\r
</Directory><!-- bin_debug -->\r
</Directory><!-- bin -->\r
\r
- <Directory Id='lib' Name='lib' \r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >\r
+ <Directory Id='lib' Name='lib' >\r
<Directory Id='lib_shibboleth' Name='shibboleth' \r
FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >\r
- <Component Id="adfs.so" Guid="{9C92C803-E905-4B43-8723-05678DC73B88}">\r
- <File Name="adfs.so" KeyPath="yes" />\r
+ <Component Id='adfs.so' Guid='{9C92C803-E905-4B43-8723-05678DC73B88}'>\r
+ <File Name='adfs.so' KeyPath='yes' />\r
</Component>\r
- <Component Id="adfslite.so" Guid="{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}">\r
- <File Name="adfs-lite.so" KeyPath="yes" />\r
+ <Component Id='adfslite.so' Guid='{EDFA1AD0-1D4A-4D51-B2F0-6C779059FA78}'>\r
+ <File Name='adfs-lite.so' KeyPath='yes' />\r
</Component>\r
- <Component Id="isapi_shib.dll" Guid="{716D6F4F-4185-4219-B1BA-1D15F867926E}">\r
- <File Name="isapi_shib.dll" KeyPath="yes" />\r
+ <Component Id='isapi_shib.dll' Guid='{716D6F4F-4185-4219-B1BA-1D15F867926E}'>\r
+ <File Name='isapi_shib.dll' KeyPath='yes' />\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
+ <Component Id='mod_shib_13.so' Guid='{5C85940B-7644-4AA4-9948-9EFFC1729EFB}'>\r
+ <File Name='mod_shib_13.so' KeyPath='yes' />\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
+ <Component Id='mod_shib_20.so' Guid='{FFC2D560-FD06-42BB-9EA7-B0CC988AC4A6}'>\r
+ <File Name='mod_shib_20.so' KeyPath='yes' />\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
+ <Component Id='mod_shib_22.so' Guid='{BB889066-3EF2-43C5-BC4D-CD6B1DC4AE7B}'>\r
+ <File Name='mod_shib_22.so' KeyPath='yes' />\r
</Component>\r
- <Component Id="nsapi_shib.dll" Guid="{F199DD8A-292F-4C7D-AACB-7283852D6335}">\r
- <File Name="nsapi_shib.dll" KeyPath="yes" />\r
+ <Component Id='nsapi_shib.dll' Guid='{F199DD8A-292F-4C7D-AACB-7283852D6335}'>\r
+ <File Name='nsapi_shib.dll' KeyPath='yes' />\r
</Component>\r
- <Component Id="odbcstore.so" Guid="{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}">\r
- <File Name="odbc-store.so" KeyPath="yes" />\r
+ <Component Id='odbcstore.so' Guid='{807FBD34-6E59-4BFD-975D-AD7B381F2A7E}'>\r
+ <File Name='odbc-store.so' KeyPath='yes' />\r
</Component>\r
- <Component Id="shibauthorizer.exe" Guid="{7C7C1C24-902A-4003-AE59-599E79161782}">\r
- <File Name="shibauthorizer.exe" KeyPath="yes" />\r
+ <Component Id='shibauthorizer.exe' Guid='{7C7C1C24-902A-4003-AE59-599E79161782}'>\r
+ <File Name='shibauthorizer.exe' KeyPath='yes' />\r
</Component>\r
- <Component Id="shibresponder.exe" Guid="{510267D9-61F2-47EF-99D2-CB3D21CB14EB}">\r
- <File Name="shibresponder.exe" KeyPath="yes" />\r
+ <Component Id='shibresponder.exe' Guid='{510267D9-61F2-47EF-99D2-CB3D21CB14EB}'>\r
+ <File Name='shibresponder.exe' KeyPath='yes' />\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
+ <Component Id='adfsD.so' Guid='{9B8E071F-B251-4373-A786-8966FD0D22EF}'>\r
+ <File Id='adfsD.so' Name='adfs.so' KeyPath='yes' />\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='adfsliteD.so' Guid='{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}'>\r
+ <File Id='adfs_liteD.so' Name='adfs-lite.so' KeyPath='yes' />\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_shibD.dll' Guid='{F8212D30-0BA8-4F02-B595-E8E5D312342B}'>\r
+ <File Id='isapi_shibD.dll' Name='isapi_shib.dll' KeyPath='yes' />\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_13D.so' Guid='{E8B798AB-D772-428D-8033-2A77CB437CF0}'>\r
+ <File Id='mod_shib_13D.so' Name='mod_shib_13.so' KeyPath='yes' />\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_20D.so' Guid='{468806BF-6924-47D5-B319-608C2D63FDDC}'>\r
+ <File Id='mod_shib_20D.so' Name='mod_shib_20.so' KeyPath='yes' />\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_22D.so' Guid='{3DA4492F-C0EA-4286-9C37-13F82342FA67}'>\r
+ <File Id='mod_shib_22D.so' Name='mod_shib_22.so' KeyPath='yes' />\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='nsapi_shibD.dll' Guid='{492A5D72-4FE0-417E-9023-311E1BF34816}'>\r
+ <File Id='nsapi_shibD.dll' Name='nsapi_shib.dll' KeyPath='yes' />\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='odbcstoreD.so' Guid='{F217D7CF-91C1-4318-901D-709C710803C6}'>\r
+ <File Id='odbc_storeD.so' Name='odbc-store.so' KeyPath='yes' />\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='shibauthorizerD.exe' Guid='{83360639-DDC0-4B76-8168-21FB77EE6CD6}'>\r
+ <File Id='shibauthorizer.exe_Debug' Name='shibauthorizer.exe' KeyPath='yes' />\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='shibresponderD.exe' Guid='{760124EA-67E5-4393-B3DF-657DCC92F04C}'>\r
+ <File Id='shibresponder.exe_Debug' Name='shibresponder.exe' KeyPath='yes' />\r
</Component>\r
</Directory><!-- lib_shibboleth_debug -->\r
</Directory><!-- lib_shibboleth -->\r
<!-- the service bin -->\r
<Directory Id='sbin' Name='sbin'\r
FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release' >\r
- <Component Id="shibd.exe" Guid="{2476BB80-9384-4026-86F5-E1569A685187}">\r
- <File Name="shibd.exe" KeyPath="yes" />\r
+ <Component Id='shibd.exe' Guid='{2476BB80-9384-4026-86F5-E1569A685187}'>\r
+ <File Name='shibd.exe' KeyPath='yes' />\r
+ <ServiceInstall Id='shibd' Name='shibd_Default' \r
+ DisplayName='Shibboleth 2 Daemon (Default)' Type='ownProcess' \r
+ Start='auto' ErrorControl='ignore' />\r
+ <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='uninstall' \r
+ Remove='uninstall' Wait='yes' />\r
</Component>\r
- <Directory Id="sbin_debug" Name="debug"\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
+ <Component Id='shibdD.exe' Guid='{91E9DF13-0940-43E7-9A2F-9571F6FC3DF2}'>\r
+ <File Id='shibd.exe_debug' Name='shibd.exe' KeyPath='yes' />\r
</Component>\r
</Directory><!-- sbin_debug -->\r
</Directory><!-- sbin -->\r
<ComponentRef Id='resolvertest.exe_debug'/>\r
<ComponentRef Id='mdquery.exe_debug'/>\r
\r
- <ComponentRef Id='shibsplite.dll'/>\r
- <ComponentRef Id='shibsp.dll'/>\r
- <ComponentRef Id='shibspliteD.dll'/>\r
- <ComponentRef Id='shibspD.dll'/>\r
-\r
<ComponentRef Id='adfs.so'/>\r
<ComponentRef Id='adfslite.so'/>\r
<ComponentRef Id='isapi_shib.dll'/>\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+ Development, Inc. (UCAID) under one or more contributor license\r
+ agreements. See the NOTICE file distributed with this work for\r
+ additional information regarding copyright ownership. The UCAID\r
+ licenses this file to You under the Apache License, Version 2.0\r
+ (the 'License'); you may not use this file except in compliance\r
+ with the License. You may obtain a copy of the License at\r
+ \r
+ http://www.apache.org/licenses/LICENSE-2.0\r
+ \r
+ Unless required by applicable law or agreed to in writing, software\r
+ distributed under the License is distributed on an 'AS IS' BASIS,\r
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+ implied. See the License for the specific language governing\r
+ permissions and limitations under the License. -->\r
+\r
+<?include Versions.wxi ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <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
+ Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+\r
+ <PropertyRef Id='SHIB_OLDVERSION_64'/>\r
+ <PropertyRef Id='SHIB_OLDVERSION'/>\r
+\r
+ <Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT >= 501)</Condition>\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") AND (SHIB_OLDVERSION_64 = "none")</Condition>\r
+\r
+ <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
+\r
+ <?include ShibbolethSP-properties.wxi?>\r
+\r
+ <!-- Files -->\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <!-- The test bit -->\r
+ <Directory Id='OPT' Name='opt'>\r
+ <Directory Id='INSTALLDIR' Name='shibboleth-sp'/>\r
+ </Directory>\r
+\r
+ <Directory Id='ProgramFilesFolder' Name='PFiles'>\r
+ <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->\r
+ <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='MergeModules\Curl-x86.msm' DiskId='1' />\r
+ <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='MergeModules\FastCGI-x86.msm' DiskId='1' />\r
+ <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='MergeModules\Log4Shib-x86.msm' DiskId='1' />\r
+ <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSAML-x86.msm' DiskId='1' />\r
+ <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />\r
+ <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />\r
+ <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />\r
+ <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />\r
+ <Merge Id='XmlToolingMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlTooling-x86.msm' DiskId='1' />\r
+ <Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='MergeModules\Zlib-x86.msm' DiskId='1' />\r
+\r
+ <Merge Id='Microsoft_VC100_DebugCRT_x86' Language='1033' \r
+ SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x86.msm' DiskId='1' />\r
+ <Merge Id='Microsoft_VC100_CRT_x86' Language='1033' \r
+ SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />\r
+ </Directory><!--ProgramFilesFolder-->\r
+\r
+ <Directory Id='ProgramFiles64Folder' Name='PFiles'>\r
+ <!-- 64 bit merge modules notionally go to "Program Files" -->\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
+ SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_DebugCRT_x64.msm' DiskId='1' />\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
+ </Directory><!--TARGETDIR-->\r
+\r
+ <Feature Id='Shibboleth' Title='Shibboleth' Level='1'>\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='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='Microsoft_VC100_CRT_x86' />\r
+\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
+ <MergeRef Id='Microsoft_VC100_CRT_x64' />\r
+\r
+ <!-- ShibbolethSP-exe-x64-->\r
+\r
+ <ComponentRef Id='resolvertest64.exe'/>\r
+ <ComponentRef Id='mdquery64.exe'/>\r
+ <ComponentRef 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
+ <!-- ShibbolethSP-registry-x64 -->\r
+\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
+\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
+\r
+ </Feature>\r
+ </Product>\r
+</Wix>\r
implied. See the License for the specific language governing\r
permissions and limitations under the License. -->\r
\r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define OpenSSLDirVersion='1.0.0a' ?>\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
<Directory Id='var_run_shibboleth' Name='shibboleth' />\r
</Directory><!-- var_run -->\r
</Directory><!-- var -->\r
+ <!-- Schemas -->\r
+ <Directory Id='CommonAppDataFolder' Name='CommonFiles' >\r
+ <Directory Id='common_shibboleth' Name='Shibboleth' >\r
+ <Directory Id='common_sp' Name='SP' >\r
+ <Directory Id='common_doc' Name='doc' \r
+ FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas' >\r
+ <Component Id='share_xml_shibboleth' Guid='{69FCD385-B31D-43FB-B8A7-6F8D30391661}'>\r
+ <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />\r
+ <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />\r
+ <File Name='shibboleth-2.0-attribute-map.xsd' />\r
+ <File Name='shibboleth-2.0-afp.xsd' />\r
+ <File Name='shibboleth-2.0-afp-mf-saml.xsd' />\r
+ <File Name='WS-Trust.xsd' />\r
+ <File Name='shibboleth-2.0-sp-notify.xsd' />\r
+ <File Name='shibboleth-2.0-native-sp-config.xsd' />\r
+ <File Name='shibboleth-2.0-afp-mf-basic.xsd' />\r
+ <File Name='shibboleth-2.0-native-sp-protocols.xsd' />\r
+ </Component>\r
+ <Component Id='share_xml_shibboleth_xsd' Guid='{8C5B6416-5BE3-4D4D-BF8B-B677365DA58C}'>\r
+ <File Name='shibboleth.xsd' KeyPath='yes' />\r
+ </Component>\r
+ </Directory><!--common_doc-->\r
+ </Directory><!--common_sp-->\r
+ </Directory><!--common_shibboleth-->\r
+ </Directory><!--CommonAppDataFolder-->\r
</DirectoryRef>\r
- <!-- Schemas -->\r
- <DirectoryRef Id='SHARE_DIR'><!-- \opt\shibboleth-sp\share -->\r
- <Directory Id='share_xml' Name='xml'>\r
- <Directory Id='share_xml_shibboleth' Name='shibboleth'\r
- FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas' >\r
- <Component Id='share_xml_shibboleth' Guid='{69FCD385-B31D-43FB-B8A7-6F8D30391661}'>\r
- <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />\r
- <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />\r
- <File Name='shibboleth-2.0-attribute-map.xsd' />\r
- <File Name='shibboleth-2.0-afp.xsd' />\r
- <File Name='shibboleth-2.0-afp-mf-saml.xsd' />\r
- <File Name='WS-Trust.xsd' />\r
- <File Name='shibboleth-2.0-sp-notify.xsd' />\r
- <File Name='shibboleth-2.0-native-sp-config.xsd' />\r
- <File Name='shibboleth-2.0-afp-mf-basic.xsd' />\r
- <File Name='shibboleth-2.0-native-sp-protocols.xsd' />\r
- </Component>\r
- <Component Id='share_xml_shibboleth_xsd' Guid='{8C5B6416-5BE3-4D4D-BF8B-B677365DA58C}'>\r
- <File Name='shibboleth.xsd' KeyPath='yes' />\r
- </Component>\r
- </Directory><!-- share_xml_shibboleth -->\r
- </Directory><!-- share_xml -->\r
- </DirectoryRef><!-- share -->\r
- <!-- Previous version search -->\r
- <Property Id='SHIB_OLDVERSION' Value='none' Secure='yes'>\r
- <!-- 32 bit -->\r
- <RegistrySearch Id='SP2_2_1' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2A19CDBC-E0DA-452C-8B38-1AA9DB4D579F}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_4_1_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A5D2DE8D-2A4A-4D74-98B5-BA448DD4DC39}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_4_2_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8280E58C-D290-42CD-9425-BCC0BA439649}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_4_3_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B9F4513-3141-4270-B1F5-43A467235B6B}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_2_0_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EAAAD296-3942-4535-B39B-81A57E94FCF7}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_3_0_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{790EE9BA-BB63-43D3-9080-F9AF7AC43114}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_1_0_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E80BF81-72BC-4E9C-8A79-D7D7EA20AAE4}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='AppReg2' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A9A0D770-C658-4659-BC75-6F8289DDEAA3}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_4_0_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{56028A6A-D5A3-47C5-9494-092E1C840A8F}' \r
- Name='DisplayName' Type='raw' />\r
- <RegistrySearch Id='AppReg1' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{6E62498D-162E-45AA-87C7-157308552043}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_0_0_32' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D62F990B-2A8A-442B-BF85-7FE075B2CE0C}' \r
- Name='DisplayVersion' Type='raw' />\r
- <RegistrySearch Id='SP2_3_1' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}' \r
- Name='DisplayVersion' Type='raw' />\r
-\r
- <!-- 64 bit \r
- <RegistrySearch Id='SP_2_2_1_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_4_1_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_4_2_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP_2_4_3_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_3_0_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_4_0_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}' \r
- Name='DisplayName' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_1_0_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_2_0_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' />\r
- <RegistrySearch Id='SP2_3_1_64' Root='HKLM' \r
- Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}' \r
- Name='DisplayVersion' Type='raw' Win64='yes' /> -->\r
- </Property>\r
-\r
- <Property Id="SHIBD_PORT" Value="1600" Secure="yes" />\r
-\r
- <Condition Message='Shibboleth requires Windows XP SP2 or later.'>NOT VersionNT OR (VersionNT >= 501)</Condition>\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
<!-- The actions to perform after the files have been copied -->\r
<Binary Id='EditConfigFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+ Development, Inc. (UCAID) under one or more contributor license\r
+ agreements. See the NOTICE file distributed with this work for\r
+ additional information regarding copyright ownership. The UCAID\r
+ licenses this file to You under the Apache License, Version 2.0\r
+ (the 'License'); you may not use this file except in compliance\r
+ with the License. You may obtain a copy of the License at\r
+ \r
+ http://www.apache.org/licenses/LICENSE-2.0\r
+ \r
+ Unless required by applicable law or agreed to in writing, software\r
+ distributed under the License is distributed on an 'AS IS' BASIS,\r
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+ implied. See the License for the specific language governing\r
+ permissions and limitations under the License. -->\r
+\r
+<!-- <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ This is where we put all the configuration properties we will\r
+ used to drive the install. The GUI will change them as required,\r
+ but the GUI is not required. -->\r
+<Include>\r
+\r
+ <Property Id="OPT" Secure="yes" Value="opt" />\r
+ <Property Id="INSTALLDIR" Secure="yes" Value="Shibboleth-SP" />\r
+\r
+ <!-- Are we installing IIS, if so what extension to used -->\r
+ <Property Id="SHIB_FILE_EXTENSION" Value=".sso" Secure="yes">\r
+ <RegistrySearch Id="AppReg" Root="HKLM" Key="SOFTWARE\Shibboleth" Name="FileExtension" Type="raw" />\r
+ </Property>\r
+ \r
+ <!-- IIS install -->\r
+ <Property Id="INSTALL_ISAPI_FILTER" Value="TRUE" Secure="yes" />\r
+ <!-- Install shibd_service -->\r
+ <Property Id="INSTALL_SHIBD_SERVICE" Value="TRUE" Secure="yes" />\r
+ <!-- 64 bit or 32bit service and DLLS, also used to swap in the 64 bit service -->\r
+ <Property Id="OUR_DLL_PATH" Secure="yes" />\r
+ <Property Id="SHIBD_PORT" Value="1600" Secure="yes" />\r
+\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
+\r
+ <!-- UPGRADINGPRODUCTCODE set in the uninstall if this is an upgrade uninstall -->\r
+\r
+ <Upgrade Id='$(var.ShibbolethUpgradeCode)'>\r
+ <UpgradeVersion ExcludeLanguages="yes" IncludeMaximum="yes" Maximum="2.5.0" Minimum="0.0.1" OnlyDetect="yes" Property="ALREADYINSTALLED"/>\r
+ </Upgrade>\r
+</Include>\r
+\r
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+ Development, Inc. (UCAID) under one or more contributor license\r
+ agreements. See the NOTICE file distributed with this work for\r
+ additional information regarding copyright ownership. The UCAID\r
+ licenses this file to You under the Apache License, Version 2.0\r
+ (the 'License'); you may not use this file except in compliance\r
+ with the License. You may obtain a copy of the License at\r
+ \r
+ http://www.apache.org/licenses/LICENSE-2.0\r
+ \r
+ Unless required by applicable law or agreed to in writing, software\r
+ distributed under the License is distributed on an 'AS IS' BASIS,\r
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+ implied. See the License for the specific language governing\r
+ permissions and limitations under the License. -->\r
+\r
+<?include Versions.wxi ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <!-- This is where we put all the architecture neutral bits of the\r
+ Shibboleth install. It turns out that it may not be all the\r
+ architecture insenstive stuff since some GUIDS may have moved\r
+ -->\r
+ <Fragment>\r
+\r
+ <!-- Previous version search -->\r
+ <Property Id='SHIB_OLDVERSION_64' Value='none' Secure='yes'>\r
+ <RegistrySearch Id='SP_2_2_1_64' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{5492935D-7D97-42FE-A916-5190C3F8C403}' \r
+ Name='DisplayVersion' Type='raw' Win64='yes' />\r
+ <RegistrySearch Id='SP2_4_1_64' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{3936DF1B-DFF2-4A02-8A2C-8AB893718397}' \r
+ Name='DisplayVersion' Type='raw' Win64='yes' />\r
+ <RegistrySearch Id='SP2_4_2_64' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1081BC03-B61E-4F3C-ACD9-4C8C7D3E9928}' \r
+ Name='DisplayVersion' Type='raw' Win64='yes' />\r
+ <RegistrySearch Id='SP_2_4_3_64' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9367CC0C-D76D-4DA8-AF51-0DD144430DD8}' \r
+ Name='DisplayVersion' Type='raw' Win64='yes' />\r
+ <RegistrySearch Id='SP2_3_0_64' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{C7F88000-9E35-4B23-86AD-997F90B04DEE}' \r
+ Name='DisplayVersion' Type='raw' Win64='yes' />\r
+ <RegistrySearch Id='SP2_4_0_64' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8F0834E5-A3C8-4B7F-B8DF-30BC90331C03}' \r
+ Name='DisplayName' Type='raw' Win64='yes' />\r
+ <RegistrySearch Id='SP2_1_0_64' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A8C641B8-0924-4264-BEBD-8D20F8B3EB79}' \r
+ Name='DisplayVersion' Type='raw' Win64='yes' />\r
+ <RegistrySearch Id='SP2_2_0_64' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{DDEEB7B2-A639-4513-8437-83564FECAFD3}' \r
+ Name='DisplayVersion' Type='raw' Win64='yes' />\r
+ <RegistrySearch Id='SP2_3_1_64' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{CFF81891-E7C4-47C3-B173-87CF1B947D05}' \r
+ Name='DisplayVersion' Type='raw' Win64='yes' />\r
+ </Property>\r
+\r
+ <DirectoryRef Id='bin64'>\r
+ <Component Id='file_extension64' Guid='{F17BED16-5988-4F9E-82E0-1D4DCB69EC26}' Win64='yes'>\r
+ <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>\r
+ <RegistryValue Id='FileExtension64' Root='HKLM' Key='SOFTWARE\Shibboleth' \r
+ Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />\r
+ </Component>\r
+\r
+ <Component Id='shib64.ico' Guid='{AB12F477-E49D-4E52-B130-AF0913AF9EC9}' Win64='yes'>\r
+ <File Id='shib64.ico' KeyPath='yes' Source='$(var.BuildDirectory)\cvs\2.0\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
--- /dev/null
+<?xml version='1.0' encoding='UTF-8'?>\r
+\r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+ Development, Inc. (UCAID) under one or more contributor license\r
+ agreements. See the NOTICE file distributed with this work for\r
+ additional information regarding copyright ownership. The UCAID\r
+ licenses this file to You under the Apache License, Version 2.0\r
+ (the 'License'); you may not use this file except in compliance\r
+ with the License. You may obtain a copy of the License at\r
+ \r
+ http://www.apache.org/licenses/LICENSE-2.0\r
+ \r
+ Unless required by applicable law or agreed to in writing, software\r
+ distributed under the License is distributed on an 'AS IS' BASIS,\r
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+ implied. See the License for the specific language governing\r
+ permissions and limitations under the License. -->\r
+\r
+<?include Versions.wxi ?>\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <!-- This is where we put all the architecture neutral bits of the\r
+ Shibboleth install. It turns out that it may not be all the\r
+ architecture insenstive stuff since some GUIDS may have moved\r
+ -->\r
+ <Fragment>\r
+ <!-- Previous version search -->\r
+ <Property Id='SHIB_OLDVERSION' Value='none' Secure='yes'>\r
+ <RegistrySearch Id='SP2_2_1' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2A19CDBC-E0DA-452C-8B38-1AA9DB4D579F}' \r
+ Name='DisplayVersion' Type='raw' />\r
+ <RegistrySearch Id='SP2_4_1_32' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A5D2DE8D-2A4A-4D74-98B5-BA448DD4DC39}' \r
+ Name='DisplayVersion' Type='raw' />\r
+ <RegistrySearch Id='SP2_4_2_32' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{8280E58C-D290-42CD-9425-BCC0BA439649}' \r
+ Name='DisplayVersion' Type='raw' />\r
+ <RegistrySearch Id='SP2_4_3_32' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{7B9F4513-3141-4270-B1F5-43A467235B6B}' \r
+ Name='DisplayVersion' Type='raw' />\r
+ <RegistrySearch Id='SP2_2_0_32' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EAAAD296-3942-4535-B39B-81A57E94FCF7}' \r
+ Name='DisplayVersion' Type='raw' />\r
+ <RegistrySearch Id='SP2_3_0_32' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{790EE9BA-BB63-43D3-9080-F9AF7AC43114}' \r
+ Name='DisplayVersion' Type='raw' />\r
+ <RegistrySearch Id='SP2_1_0_32' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E80BF81-72BC-4E9C-8A79-D7D7EA20AAE4}' \r
+ Name='DisplayVersion' Type='raw' />\r
+ <RegistrySearch Id='AppReg2' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{A9A0D770-C658-4659-BC75-6F8289DDEAA3}' \r
+ Name='DisplayVersion' Type='raw' />\r
+ <RegistrySearch Id='SP2_4_0_32' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{56028A6A-D5A3-47C5-9494-092E1C840A8F}' \r
+ Name='DisplayName' Type='raw' />\r
+ <RegistrySearch Id='AppReg1' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{6E62498D-162E-45AA-87C7-157308552043}' \r
+ Name='DisplayVersion' Type='raw' />\r
+ <RegistrySearch Id='SP2_0_0_32' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{D62F990B-2A8A-442B-BF85-7FE075B2CE0C}' \r
+ Name='DisplayVersion' Type='raw' />\r
+ <RegistrySearch Id='SP2_3_1' Root='HKLM' \r
+ Key='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{E4FA3B6C-6347-4B58-A07D-F9E388B3944B}' \r
+ Name='DisplayVersion' Type='raw' />\r
+\r
+ </Property>\r
+ <DirectoryRef Id='bin'>\r
+ <Component Id='file_extension' Guid='{88D0BEF3-6E15-4688-8492-9FF23B6221DF}'>\r
+ <Condition>INSTALL_ISAPI_FILTER = "TRUE"</Condition>\r
+ <RegistryValue Root='HKLM' Key='SOFTWARE\Shibboleth' \r
+ Name='FileExtension' Value='[SHIB_FILE_EXTENSION]' Type='string' KeyPath='yes' />\r
+ </Component>\r
+\r
+ <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
+ <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
<Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
<?define BuildDirectory='G:\Downloads\shib\' ?>\r
\r
+ <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
+ <?define ShibbolethVersion='2.4.186'?>\r
+ <!-- DO NOT CHANGE UpgradeCode -->\r
+ <?define ShibbolethUpgradeCode='{28A4EB62-E860-49CA-BE43-44ADEB91DBF6}' ?>\r
+\r
<?define CurlVersion='7.21.2' ?>\r
\r
<?define FastCGIVersion='2.4.0' ?>\r
<?define OpenSAMLVersion='2.4.3' ?> \r
<?define OpenSAMLFileVersion='2_4' ?><!-- 'saml$(var.OpenSAMLFileVersion).dll' -->\r
\r
-\r
<?define OpenSSLVersion='1.0.0.10' ?><!-- 1.0.0a -->\r
<?define OpenSSLDirVersion='1.0.0a' ?><!-- '$(var.BuildDirectory)\openssl-$(var.OpenSSLDirVersion)\out64dll.dbg\'> -->\r
<?define OpenSSLFileVersion='1_0_0' ?><!-- 'libeay32_$(var.OpenSSLFileVersion)D.dll' -->\r
\r
-\r
- <?define ShibbolethSPFileVersion='1_4' ?><!-- 'shibsp-lite$(var.ShibbolethSPFileVersion).dll' -->\r
- <?define ShibbolethVersion='1.4.2' ?>\r
-\r
+ <!-- Do not confuse ShibbolethDllVersion with ShibbolethVersion -->\r
+ <?define ShibbolethDllFileVersion='1_4' ?><!-- 'shibsp-lite$(var.ShibbolethSPFileVersion).dll' -->\r
+ <?define ShibbolethDllVersion='1.4.2' ?>\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' ?>\r
<?define XmlSecVersion='1.6.0' ?><!-- '$(var.BuildDirectory)\xml-security-c-$(var.XmlSecVersion)\Build\x64\VC10\Release No Xalan' -->\r
<?define XmlSecFileVersion='1_6' ?><!--'xsec_$(var.XmlSecFileVersion).dll'-->\r
\r
-\r
<?define XmlToolingVersion='1.4.2' ?>\r
-\r
<?define XmlToolingFileVersion='1_4' ?><!--'xmltooling$(var.XmlToolingFileVersion)D.dll'-->\r
\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' ?>\r
-\r
-\r
</Include>\r
--- /dev/null
+<?xml version='1.0' encoding='utf-8'?>\r
+\r
+<!-- Licensed to the University Corporation for Advanced Internet\r
+ Development, Inc. (UCAID) under one or more contributor license\r
+ agreements. See the NOTICE file distributed with this work for\r
+ additional information regarding copyright ownership. The UCAID\r
+ licenses this file to You under the Apache License, Version 2.0\r
+ (the "License"); you may not use this file except in compliance\r
+ with the License. You may obtain a copy of the License at\r
+ \r
+ http://www.apache.org/licenses/LICENSE-2.0\r
+ \r
+ Unless required by applicable law or agreed to in writing, software\r
+ distributed under the License is distributed on an "AS IS" BASIS,\r
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+ implied. See the License for the specific language governing\r
+ permissions and limitations under the License. -->\r
+\r
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
+ <Product Id='C59417F2-CCCA-4668-A39E-E7227D295D59' Name='Test Package1' Language='1033'\r
+ Version='1.0.0.0' Manufacturer='Shibboleth Consortium'>\r
+ <Package Description='TEST Windows Installer package'\r
+ Comments='Ignore Ignore Ignore Ignore'\r
+ Manufacturer='Shibboleth Consortium' InstallerVersion='300' Compressed='yes' />\r
+\r
+ <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />\r
+ <!-- Files -->\r
+ <Directory Id='TARGETDIR' Name='SourceDir'>\r
+ <Directory Id='SystemFolder' >\r
+ <Merge Id='Microsoft_VC100_CRT_x86' Language='1033' SourceFile='C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm' DiskId='1' />\r
+ </Directory>\r
+ </Directory>\r
+\r
+ <!-- Feature -->\r
+ <Feature Id='MyFeature' Title='My 1st Feature' Level='1'>\r
+ <MergeRef Id='Microsoft_VC100_CRT_x86' />\r
+<!-- <MergeRef Id='Microsoft_VC100_DebugCRT_x86' /> -->\r
+ </Feature>\r
+ </Product>\r
+</Wix>\r
<!-- 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
<Component Id='MyComponent' Guid='74DBAA41-4C46-4944-80F6-27F925991CB2'>\r
<File Source='FileCounts.txt' />\r
projects / shibboleth / cpp-sp.git / commitdiff