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

[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 e10870b..f1f595b 100644 (file)
--- a/msi/WiX/MergeModules/XmlTooling-schemas.wxs
+++ b/msi/WiX/MergeModules/XmlTooling-schemas.wxs
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>\r
 <!-- Licensed to the University Corporation for Advanced Internet\r
-   Development, Inc. (UCAID) under one or more contributor license\r
-   agreements.  See the NOTICE file distributed with this work for\r
-   additional information regarding copyright ownership. The UCAID\r
-   licenses this file to You under the Apache License, Version 2.0\r
-   (the "License"); you may not use this file except in compliance\r
-   with the License.  You may obtain a copy of the License at\r
- \r
+     Development, Inc. (UCAID) under one or more contributor license\r
+     agreements.  See the NOTICE file distributed with this work for\r
+     additional information regarding copyright ownership. The UCAID\r
+     licenses this file to You under the Apache License, Version 2.0\r
+     (the "License"); you may not use this file except in compliance\r
+     with the License.  You may obtain a copy of the License at\r
+     \r
      http://www.apache.org/licenses/LICENSE-2.0\r
- \r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-   implied.  See the License for the specific language governing\r
-   permissions and limitations under the License.  -->\r
+     \r
+     Unless required by applicable law or agreed to in writing, software\r
+     distributed under the License is distributed on an "AS IS" BASIS,\r
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
+     implied.  See the License for the specific language governing\r
+     permissions and limitations under the License.  -->\r
 \r
 <?include ..\Versions.wxi ?>\r
 \r
@@ -25,22 +25,24 @@
 \r
     <Directory Id='TARGETDIR' Name='SourceDir'>\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 Id='Shibboleth' Name='Shibboleth' >\r
+          <Directory Id='SP' Name='SP' >\r
+            <Directory Id='xml' Name='xml' >\r
+              <Directory Id='xmltooling' Name='xmltooling'\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><!--xmltooling-->\r
+            </Directory><!--xml-->\r
+          </Directory><!--SP-->\r
+        </Directory><!--Shibboleth-->\r
       </Directory><!--CommonAppDataFolder-->\r
     </Directory><!--TargetDir-->\r
   </Module>\r