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

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

diff --git a/msi/WiX/MergeModules/OpenSAML-x86.wxs b/msi/WiX/MergeModules/OpenSAML-x86.wxs
index f44c829..8d07820 100644 (file)
--- a/msi/WiX/MergeModules/OpenSAML-x86.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-x86.wxs
@@ -1,5 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>\r
-<!-- TODO roll in xmltooling make subsidiary to Shib -->\r
 \r
 <!-- Licensed to the University Corporation for Advanced Internet\r
    Development, Inc. (UCAID) under one or more contributor license\r
@@ -29,26 +28,15 @@
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_SP' Name='SP'>\r
-            <Directory Id='lib' Name='lib' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Release\'>\r
-              <Component Id='saml2_0.dll' Guid='{B52F8C71-2042-4CDF-A250-BD773985A2AB}'>\r
-                <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion).dll' />\r
-              </Component>\r
-              <Component Id='samlsign.exe' Guid='{3DC7A431-9623-4283-BA07-444DB1C1F864}'>\r
-                <File KeyPath='yes' Name='samlsign.exe' />\r
-              </Component>\r
-              <Directory Id='lib_debug' Name='debug' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-opensaml\Debug'>\r
-                <Component Id='saml2_0D.dll' Guid='{7B934257-5F7F-428E-930E-A793A11573D7}'>\r
-                  <File KeyPath='yes' Name='saml$(var.OpenSAMLFileVersion)D.dll' />\r
-                </Component>\r
-                <Component Id='samlsign.exe_Debug' Guid='{EFCAEBC5-242F-416C-8F87-B7DD49C1AE29}'>\r
-                  <File Id='samlsign.exe_Debug' KeyPath='yes' Name='samlsign.exe' />\r
-                </Component>\r
-              </Directory><!-- lib_debug-->\r
+            <Directory Id='lib' Name='lib'>\r
+              <Directory Id='lib_debug' Name='debug'/>\r
             </Directory><!-- lib -->\r
+            <Directory Id='doc' Name='doc' />\r
           </Directory><!-- shibboleth_SP -->\r
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFilesFolder -->\r
     </Directory><!-- TARGETDIR -->\r
+    <?include OpenSAML-x86.wxi ?>\r
   </Module>\r
 </Wix>\r
 \r