Adjust state of some files and path to keygen script.

[shibboleth/cpp-sp.git] / msi / WiX / ShibbolethSP-defs-x86.wxi

diff --git a/msi/WiX/ShibbolethSP-defs-x86.wxi b/msi/WiX/ShibbolethSP-defs-x86.wxi
index 07c14dd..573ef35 100644 (file)
--- a/msi/WiX/ShibbolethSP-defs-x86.wxi
+++ b/msi/WiX/ShibbolethSP-defs-x86.wxi
@@ -2,22 +2,47 @@
 <Include xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <!-- ShibbolethSP-noarch -->\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='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='upgrade.xsl'/>\r
+  <ComponentRef Id='example_metadata.xml'/>\r
+  <ComponentRef Id='example_shibboleth2.xml'/> \r
+  <ComponentRef Id='xsltproc.js'/>\r
+  <ComponentRef Id='keygen.bat'/>\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='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='security_policy.xml'/>\r
   <ComponentRef Id='accessError.html'/>\r
-  <ComponentRef Id='apache.config'/>\r
-  <ComponentRef Id='apache2.config'/>\r
+  <ComponentRef Id='apache.config.in'/>\r
+  <ComponentRef Id='apache2.config.in'/>\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='share_xml_shibboleth'/>\r
-  <ComponentRef Id='share_xml_shibboleth_xsd'/>\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
@@ -25,29 +50,33 @@
   <ComponentRef Id='mdquery.exe_debug'/>\r
 \r
   <ComponentRef Id='adfs.so'/>\r
-  <ComponentRef Id='adfslite.so'/>\r
+  <ComponentRef Id='adfs_lite.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='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