Merge XMLTooling* into OpenSAML. Shibboleth Merge modules now contains OpenSAML...

[shibboleth/cpp-sp.git] / msi / WiX / MergeModules / Shibboleth-schemas.wxs

diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index 16fd092..18d2833 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -34,7 +34,7 @@
                   <File Name='shibboleth-metadata-1.0.xsd' KeyPath='yes' />\r
                 </Component>\r
                 <Component Id='catalog.xml' Guid='{C6EA59A2-0A86-4F5F-B5F8-E37A2310A793}'>\r
-                  <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />\r
+                  <File Id='ShibbolethCatalog' Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\schemas\catalog.xml.in' />\r
                 </Component>\r
                 <Component Id='attributemap.xsd' Guid='{58A966DC-94E0-45FF-9A31-C67BAE0AB1C1}'>\r
                   <File Name='shibboleth-2.0-attribute-map.xsd' />\r
@@ -70,15 +70,27 @@
       </Directory><!--CommonAppDataFolder-->\r
     </Directory><!--TargetDir-->\r
 \r
-    <Binary Id='EditCatalogFileSrc' SourceFile='$(var.BuildDirectory)\cvs\2.0\cpp-sp\msi\scripts\shib_edit_catalog.vbs' />\r
-    <CustomAction Id='EditCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
+    <?include OpenSAML-schemas.wxi ?>\r
+\r
+    <CustomAction Id='EditShibbolethCatalog' BinaryKey='EditCatalogFileSrc' VBScriptCall='' \r
                   Execute='deferred' Impersonate='no' />\r
-    <CustomAction Id='SetEditCatalog' Property='EditCatalog' \r
+    <CustomAction Id='SetEditShibbolethCatalog' Property='EditShibbolethCatalog' \r
                   Value='[CommonAppDataFolder]Shibboleth\SP\xml\shibboleth\;@;catalog.xml' />\r
 \r
+\r
     <InstallExecuteSequence>\r
-      <Custom Action='SetEditCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
-      <Custom Action='EditCatalog' After='InstallFiles'>NOT Installed</Custom>\r
+      <Custom Action='SetEditCatalogSAML10' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditCatalogSAML10' After='InstallFiles'>NOT Installed</Custom>\r
+      <Custom Action='SetEditCatalogSAML11' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditCatalogSAML11' After='InstallFiles'>NOT Installed</Custom>\r
+      <Custom Action='SetEditCatalogSAML20' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditCatalogSAML20' After='InstallFiles'>NOT Installed</Custom>\r
+\r
+      <Custom Action='SetEditXMLToolingCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditXMLToolingCatalog' After='InstallFiles'>NOT Installed</Custom>\r
+\r
+      <Custom Action='SetEditShibbolethCatalog' Before='CostInitialize'>NOT Installed</Custom>\r
+      <Custom Action='EditShibbolethCatalog' After='InstallFiles'>NOT Installed</Custom>\r
     </InstallExecuteSequence>\r
 \r
 \r