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

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

diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index d3411b4..3315e45 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -26,85 +26,87 @@
 \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-opensaml\schemas\' >\r
-              <Component Id='schema_assertion_01' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>\r
-                <File Name='cs-sstc-schema-assertion-01.xsd' KeyPath='yes' />\r
-              </Component>\r
-              <Component Id='schema_assertion_1_1' Guid='{71ED2BC0-50EE-48D5-9649-5F7C5A8388F3}'>\r
-                <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />\r
-              </Component>\r
-              <Component Id='schema_protocol_1_1' Guid='{DD3829CB-F91A-4291-85F8-771E0930E9F1}'>\r
-                <File Name="cs-sstc-schema-protocol-01.xsd" KeyPath="yes" />\r
-              </Component>\r
-              <Component Id='schema_protocol_01' Guid='{E0CD8123-B42F-4F15-B4B4-A4F99DE68F8E}'>\r
-                <File Name='cs-sstc-schema-protocol-1.1.xsd'/>\r
-              </Component>\r
-              <Component Id='samlschema' Guid='{355CA6A9-57F9-491D-8D1A-33161CDE6DF1}' >\r
-                <File Name='saml10-catalog.xml' \r
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />\r
-                <File Name='saml11-catalog.xml' \r
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />\r
-                <File Name='saml20-catalog.xml' \r
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />\r
-                <File Name='saml-schema-assertion-2.0.xsd'/>\r
-                <File Name='saml-schema-authn-context-2.0.xsd'/>\r
-                <File Id='a_c_auth_telephony2.0.xsd' \r
-                      Name='saml-schema-authn-context-auth-telephony-2.0.xsd'/>\r
-                <File Id='a_c_ip2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd'/>\r
-                <File Id='a_c_ippword2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd'/>\r
-                <File Id='a_c_kerberos2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd'/>\r
-                <File Id='a_c_mobileonefactorreg2.0.xsd' \r
-                      Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd'/>\r
-                <File Id='a_c_mobileonefactorunreg2.0.xsd' \r
-                      Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd'/>\r
-                <File Id='a_c_mobiletwofactorreg2.0.xsd' \r
-                      Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd'/>\r
-                <File Id='a_c_mobiletwofactorunreg2.0.xsd' \r
-                      Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd'/>\r
-                <File Id='a_c_nomadtelephony2.0.xsd' \r
-                      Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' KeyPath='yes' />\r
-                <File Id='a_c_personaltelephony2.0.xsd' \r
-                      Name='saml-schema-authn-context-personal-telephony-2.0.xsd'/>\r
-                <File Id='a_c_pgp2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd'/>\r
-                <File Id='a_c_ppt2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd'/>\r
-                <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd'/>\r
-                <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd'/>\r
-                <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd'/>\r
-                <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd'/>\r
-                <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd'/>\r
-                <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd'/>\r
-                <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd'/>\r
-                <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd'/>\r
-                <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd'/>\r
-                <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd'/>\r
-                <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd'/>\r
-                <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd'/>\r
-                <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd'/>\r
+        <Directory Id='Shibboleth' Name='Shibboleth' >\r
+          <Directory Id='SP' Name='SP' >\r
+            <Directory Id='xml' Name='xml' >\r
+              <Directory Id='opensaml' Name='opensaml'\r
+                         FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\' >\r
+                <Component Id='schema_assertion_01' Guid='{3BB83A55-9212-40F4-86E1-D95CEDAE5501}'>\r
+                  <File Name='cs-sstc-schema-assertion-01.xsd' KeyPath='yes' />\r
+                </Component>\r
+                <Component Id='schema_assertion_1_1' Guid='{71ED2BC0-50EE-48D5-9649-5F7C5A8388F3}'>\r
+                  <File Name='cs-sstc-schema-assertion-1.1.xsd' KeyPath='yes' />\r
+                </Component>\r
+                <Component Id='schema_protocol_1_1' Guid='{DD3829CB-F91A-4291-85F8-771E0930E9F1}'>\r
+                  <File Name="cs-sstc-schema-protocol-01.xsd" KeyPath="yes" />\r
+                </Component>\r
+                <Component Id='schema_protocol_01' Guid='{E0CD8123-B42F-4F15-B4B4-A4F99DE68F8E}'>\r
+                  <File Name='cs-sstc-schema-protocol-1.1.xsd'/>\r
+                </Component>\r
+                <Component Id='samlschema' Guid='{355CA6A9-57F9-491D-8D1A-33161CDE6DF1}' >\r
+                  <File Name='saml10-catalog.xml' \r
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml10-catalog.xml.in' />\r
+                  <File Name='saml11-catalog.xml' \r
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml11-catalog.xml.in' />\r
+                  <File Name='saml20-catalog.xml' \r
+                        Source='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\schemas\saml20-catalog.xml.in' />\r
+                  <File Name='saml-schema-assertion-2.0.xsd'/>\r
+                  <File Name='saml-schema-authn-context-2.0.xsd'/>\r
+                  <File Id='a_c_auth_telephony2.0.xsd' \r
+                        Name='saml-schema-authn-context-auth-telephony-2.0.xsd'/>\r
+                  <File Id='a_c_ip2.0.xsd' Name='saml-schema-authn-context-ip-2.0.xsd'/>\r
+                  <File Id='a_c_ippword2.0.xsd' Name='saml-schema-authn-context-ippword-2.0.xsd'/>\r
+                  <File Id='a_c_kerberos2.0.xsd' Name='saml-schema-authn-context-kerberos-2.0.xsd'/>\r
+                  <File Id='a_c_mobileonefactorreg2.0.xsd' \r
+                        Name='saml-schema-authn-context-mobileonefactor-reg-2.0.xsd'/>\r
+                  <File Id='a_c_mobileonefactorunreg2.0.xsd' \r
+                        Name='saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd'/>\r
+                  <File Id='a_c_mobiletwofactorreg2.0.xsd' \r
+                        Name='saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd'/>\r
+                  <File Id='a_c_mobiletwofactorunreg2.0.xsd' \r
+                        Name='saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd'/>\r
+                  <File Id='a_c_nomadtelephony2.0.xsd' \r
+                        Name='saml-schema-authn-context-nomad-telephony-2.0.xsd' KeyPath='yes' />\r
+                  <File Id='a_c_personaltelephony2.0.xsd' \r
+                        Name='saml-schema-authn-context-personal-telephony-2.0.xsd'/>\r
+                  <File Id='a_c_pgp2.0.xsd' Name='saml-schema-authn-context-pgp-2.0.xsd'/>\r
+                  <File Id='a_c_ppt2.0.xsd' Name='saml-schema-authn-context-ppt-2.0.xsd'/>\r
+                  <File Id='a_c_pword2.0.xsd' Name='saml-schema-authn-context-pword-2.0.xsd'/>\r
+                  <File Id='a_c_session2.0.xsd' Name='saml-schema-authn-context-session-2.0.xsd'/>\r
+                  <File Id='a_c_smartcard2.0.xsd' Name='saml-schema-authn-context-smartcard-2.0.xsd'/>\r
+                  <File Id='a_c_smartcardpki2.0.xsd' Name='saml-schema-authn-context-smartcardpki-2.0.xsd'/>\r
+                  <File Id='a_c_softwarepki2.0.xsd' Name='saml-schema-authn-context-softwarepki-2.0.xsd'/>\r
+                  <File Id='a_c_spki2.0.xsd' Name='saml-schema-authn-context-spki-2.0.xsd'/>\r
+                  <File Id='a_c_srp2.0.xsd' Name='saml-schema-authn-context-srp-2.0.xsd'/>\r
+                  <File Id='a_c_sslcert2.0.xsd' Name='saml-schema-authn-context-sslcert-2.0.xsd'/>\r
+                  <File Id='a_c_telephony2.0.xsd' Name='saml-schema-authn-context-telephony-2.0.xsd'/>\r
+                  <File Id='a_c_timesync2.0.xsd' Name='saml-schema-authn-context-timesync-2.0.xsd'/>\r
+                  <File Id='a_c_types2.0.xsd' Name='saml-schema-authn-context-types-2.0.xsd'/>\r
+                  <File Id='a_c_x5092.0.xsd' Name='saml-schema-authn-context-x509-2.0.xsd'/>\r
+                  <File Id='a_c_xmldsig2.0.xsd' Name='saml-schema-authn-context-xmldsig-2.0.xsd'/>\r
 \r
-                <File Name='saml-schema-dce-2.0.xsd'/>\r
-                <File Name='saml-schema-ecp-2.0.xsd'/>\r
-                <File Name='saml-schema-metadata-2.0.xsd'/>\r
-                <File Name='saml-schema-protocol-2.0.xsd'/>\r
-                <File Name='saml-schema-x500-2.0.xsd'/>\r
-                <File Name='saml-schema-xacml-2.0.xsd'/>\r
+                  <File Name='saml-schema-dce-2.0.xsd'/>\r
+                  <File Name='saml-schema-ecp-2.0.xsd'/>\r
+                  <File Name='saml-schema-metadata-2.0.xsd'/>\r
+                  <File Name='saml-schema-protocol-2.0.xsd'/>\r
+                  <File Name='saml-schema-x500-2.0.xsd'/>\r
+                  <File Name='saml-schema-xacml-2.0.xsd'/>\r
 \r
-                <File Name='sstc-metadata-attr.xsd'/>\r
-                <File Name='sstc-request-initiation.xsd'/>\r
-                <File Name='sstc-saml1x-metadata.xsd'/>\r
-                <File Name='sstc-saml-attribute-ext.xsd'/>\r
-                <File Name='sstc-saml-delegation.xsd'/>\r
-                <File Name='sstc-saml-idp-discovery.xsd' />\r
-                <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>\r
-                <File Name='sstc-saml-metadata-ext-query.xsd'/>\r
-                <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>\r
-                <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>\r
-              </Component>\r
-            </Directory><!--common_doc-->\r
-          </Directory><!--common_sp-->\r
-        </Directory><!--common_shibboleth-->\r
+                  <File Name='sstc-metadata-attr.xsd'/>\r
+                  <File Name='sstc-request-initiation.xsd'/>\r
+                  <File Name='sstc-saml1x-metadata.xsd'/>\r
+                  <File Name='sstc-saml-attribute-ext.xsd'/>\r
+                  <File Name='sstc-saml-delegation.xsd'/>\r
+                  <File Name='sstc-saml-idp-discovery.xsd' />\r
+                  <File Id='metadata_algsupportv1.0' Name='sstc-saml-metadata-algsupport-v1.0.xsd'/>\r
+                  <File Name='sstc-saml-metadata-ext-query.xsd'/>\r
+                  <File Name='sstc-saml-metadata-ui-v1.0.xsd'/>\r
+                  <File Id='protoco_ext_thirdpaty.xsd' Name='sstc-saml-protocol-ext-thirdparty.xsd'/>\r
+                </Component>\r
+              </Directory><!--opensaml-->\r
+            </Directory><!--xml-->\r
+          </Directory><!--SP-->\r
+        </Directory><!--Shibboleth-->\r
       </Directory><!--CommonAppDataFolder-->\r
     </Directory><!--TargetDir-->\r
   </Module>\r