More work on x64 bit merge modules. More work needed around the commo schemas

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

diff --git a/msi/WiX/MergeModules/XmlTooling-schemas.wxs b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
index 5cb1e28..780073b 100644 (file)
--- a/msi/WiX/MergeModules/XmlTooling-schemas.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
@@ -19,18 +19,25 @@
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Fragment>\r
-    <DirectoryRef Id='share_xml_xmltooling'\r
-                  FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\' >\r
-\r
-      <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>\r
-        <File Name='xenc-schema.xsd'/>\r
-        <File Name='xmldsig-core-schema.xsd'  />\r
-        <File Name='soap-envelope.xsd'  />\r
-        <File Name='xml.xsd'  />\r
-        <File Name='xmltooling.xsd'  />\r
-        <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in'  />\r
-        <File Name='xmldsig11-schema.xsd' />\r
-      </Component>\r
-    </DirectoryRef>\r
+    <DirectoryRef Id='TARGETDIR'>\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-xmltooling\schemas\' >\r
+              <Component Id='xmltoolingschema' Guid='{2197D645-3AA3-46F1-B250-0F964B901A94}'>\r
+                <File Name='xenc-schema.xsd'/>\r
+                <File Name='xmldsig-core-schema.xsd'  />\r
+                <File Name='soap-envelope.xsd'  />\r
+                <File Name='xml.xsd'  />\r
+                <File Name='xmltooling.xsd'  />\r
+                <File Name='catalog.xml' Source='$(var.BuildDirectory)\cvs\2.0\cpp-xmltooling\schemas\catalog.xml.in'  />\r
+                <File Name='xmldsig11-schema.xsd' />\r
+              </Component>\r
+            </Directory><!--common_doc-->\r
+          </Directory><!--common_sp-->\r
+        </Directory><!--common_shibboleth-->\r
+      </Directory><!--CommonAppDataFolder-->\r
+    </DirectoryRef><!--TargetDir-->\r
   </Fragment>\r
 </Wix>\r