More work on making the x64 installer work. TODOs added. X86 install clean compiles

[shibboleth/cpp-sp.git] / msi / WiX / ShibbolethSP-noarch.wxs

diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index 3ff4d54..835173e 100644 (file)
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -113,45 +113,55 @@
         </Directory><!-- var_run -->\r
       </Directory><!-- var -->\r
       <!-- Schemas -->\r
+      <!-- TODO Move to a merge module -->\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 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='{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><!--xml_shibboleth-->\r
+            </Directory><!--xml-->\r
+          </Directory><!--SP-->\r
+        </Directory><!--Shibboleth-->\r
       </Directory><!--CommonAppDataFolder-->\r
     </DirectoryRef>\r
 \r
-    <!-- The actions to perform after the files have been copied -->\r
+    <!-- The actions to perform after the files have been copied\r
+      TODO optionally add in the set64shibd set32shibd -->\r
     <Binary Id='EditConfigFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_config_files.vbs-wix' />\r
     <Binary Id='KeyGenSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_keygen.vbs' />\r
     <CustomAction Id='EditConfigFiles' \r
                   BinaryKey='EditConfigFileSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR];@;[SHIBD_PORT];@;[ProgramFilesFolder]' />\r
+    <CustomAction Id='SetEditConfigFiles' Property='EditConfigFiles' Value='[INSTALLDIR];@;[SHIBD_PORT];@;[CommonAppDataFolder]' />\r
+    <!-- TODO use QtExecCmdLine -->\r
     <CustomAction Id='KeyGen' BinaryKey='KeyGenSrc' VBScriptCall='' Execute='deferred' Impersonate='no' />\r
     <CustomAction Id='SetKeyGen' Property='KeyGen' Value='[INSTALLDIR]' />\r
+\r
+    <!-- TODO IIS Install (if not ALREADYINSTALLED)\r
+         IIS Uninstalll (if UGRADINGPRODUCTCODE) -->\r
     <InstallExecuteSequence>\r
       <Custom Action='SetEditConfigFiles' Before='CostInitialize'>NOT Installed</Custom>\r
+      <!--TODO move editing of the catalog files to the merge module-->\r
       <Custom Action='EditConfigFiles' After='InstallFiles'>NOT Installed</Custom>\r
       <Custom Action='SetKeyGen' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='KeyGen' After='EditConfigFiles'>NOT Installed</Custom>\r
+      <Custom Action='KeyGen' After='WriteEnvironmentStrings'>NOT Installed</Custom><!--After WriteEnvironmentStrings so the path is set -->\r
+\r
     </InstallExecuteSequence>\r
 \r
     <!-- Components\r