<?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='plugins.so' Guid='{F738E29B-903B-4C86-BE27-4C72EC69915E}'>\r
+ <File KeyPath='yes' Checksum='yes' Name='plugins.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_lite.so' Guid='{FF18A6B4-EDC7-4A9A-8BFE-C166DCE5243E}'>\r
+ <File KeyPath='yes' Checksum='yes' Name='plugins-lite.so' />\r
</Component>\r
<Component Id='shibauthorizer.exe' Guid='{7C7C1C24-902A-4003-AE59-599E79161782}'>\r
- <File 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='adfs_lite.so_debug' Guid='{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}'>\r
+ <File KeyPath='yes' Checksum='yes' Id='adfs_lite.so_debug' Name='adfs-lite.so' />\r
+ </Component>\r
+ <Component Id='isapi_shib.dll_debug' Guid='{F8212D30-0BA8-4F02-B595-E8E5D312342B}'>\r
+ <File KeyPath='yes' Checksum='yes' Id='isapi_shib.dll_debug' Name='isapi_shib.dll' />\r
+ </Component>\r
+ <Component Id='mod_shib_13.so_debug' Guid='{E8B798AB-D772-428D-8033-2A77CB437CF0}'>\r
+ <File KeyPath='yes' Checksum='yes' Id='mod_shib_13.so_debug' Name='mod_shib_13.so' />\r
</Component>\r
- <Component Id='adfsliteD.so' Guid='{680F510A-FFDA-4AE2-8C5D-DD9D62C90DDC}'>\r
- <File Id='adfs_liteD.so' Name='adfs-lite.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='isapi_shibD.dll' Guid='{F8212D30-0BA8-4F02-B595-E8E5D312342B}'>\r
- <File Id='isapi_shibD.dll' Name='isapi_shib.dll' 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='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_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='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='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='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='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='nsapi_shibD.dll' Guid='{492A5D72-4FE0-417E-9023-311E1BF34816}'>\r
- <File Id='nsapi_shibD.dll' Name='nsapi_shib.dll' 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='odbcstoreD.so' Guid='{F217D7CF-91C1-4318-901D-709C710803C6}'>\r
- <File Id='odbc_storeD.so' Name='odbc-store.so' KeyPath='yes' />\r
+ <Component Id='plugins_lite.so_debug' Guid='{83A9DA0D-774C-4F96-9446-D5A1B61BB4A2}'>\r
+ <File KeyPath='yes' Checksum='yes' Id='plugins_lite.so_debug' Name='plugins-lite.so' />\r
</Component>\r
- <Component Id='shibauthorizerD.exe' Guid='{83360639-DDC0-4B76-8168-21FB77EE6CD6}'>\r
- <File Id='shibauthorizer.exe_Debug' Name='shibauthorizer.exe' KeyPath='yes' />\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='shibresponderD.exe' Guid='{760124EA-67E5-4393-B3DF-657DCC92F04C}'>\r
- <File Id='shibresponder.exe_Debug' Name='shibresponder.exe' KeyPath='yes' />\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
Start='auto' ErrorControl='ignore' />\r
- <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='uninstall' \r
- Remove='uninstall' Start='install' Wait='yes' />\r
+ <ServiceControl Id='shibd_Default' Name='shibd_Default' Stop='both' \r
+ Remove='uninstall' Start='install' Wait='no' />\r
</Component>\r
- <Directory Id='sbin_debug' Name='debug'\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
projects / shibboleth / cpp-sp.git / blobdiff