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

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

diff --git a/msi/WiX/MergeModules/Shibboleth-x86.wxs b/msi/WiX/MergeModules/Shibboleth-x86.wxs
index 0e4c661..16246a5 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -22,9 +22,9 @@
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethVersion)'>\r
-    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs'\r
+    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs (x86)'\r
              Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='200' Platform='x86'/>\r
+             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x86'/>\r
 \r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
@@ -32,23 +32,31 @@
           <Directory Id='shibboleth_sp' Name='SP'>\r
             <Directory Id='lib' Name='lib' \r
                        FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Release'>\r
-              <Component Id="shibsplite.dll" Guid="{10475E33-434D-4805-B983-195092549BED}">\r
-                <File Name="shibsp-lite$(var.ShibbolethSPFileVersion).dll" KeyPath="yes" />\r
+              <Component Id='shibsplite.dll' Guid='{10475E33-434D-4805-B983-195092549BED}'>\r
+                <File Name='shibsp-lite$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
               </Component>\r
-              <Component Id="shibsp.dll" Guid="{9DE384BF-C286-4A72-AED9-AA34384005C0}">\r
-                <File Name="shibsp$(var.ShibbolethSPFileVersion).dll" KeyPath="yes" />\r
+              <Component Id='shibsp.dll' Guid='{9DE384BF-C286-4A72-AED9-AA34384005C0}'>\r
+                <File Name='shibsp$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug' \r
                          FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\Debug' >\r
-                <Component Id="shibspliteD.dll" Guid="{8E070220-2992-4D45-BF98-459022CD268F}">\r
-                  <File Name="shibsp-lite$(var.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />\r
+                <Component Id='shibspliteD.dll' Guid='{8E070220-2992-4D45-BF98-459022CD268F}'>\r
+                  <File Name='shibsp-lite$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
                 </Component>\r
-                <Component Id="shibspD.dll" Guid="{4196D799-1162-4D62-9F7A-1F59E90F19F1}">\r
-                  <File Name="shibsp$(var.ShibbolethSPFileVersion)D.dll" KeyPath="yes" />\r
+                <Component Id='shibspD.dll' Guid='{4196D799-1162-4D62-9F7A-1F59E90F19F1}'>\r
+                  <File Name='shibsp$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />\r
                 </Component>\r
               </Directory><!-- lib_debug -->\r
             </Directory><!-- lib -->\r
-          </Directory><!-- shibboleth_sp -->\r
+            <Directory Id='doc' Name='doc' FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc'>\r
+              <Component Id='doc_shibboleth' Guid='{EEA99655-7A42-4D5D-AB64-AA7DD5A99409}'>\r
+                <File Name='CREDITS.txt' KeyPath='yes'/>\r
+                <File Name='LICENSE.txt' />\r
+                <File Name='NOTICE.txt' />\r
+                <File Name='README.txt'/>\r
+                <File Name='RELEASE.txt' />\r
+              </Component>\r
+            </Directory><!-- doc -->          </Directory><!-- shibboleth_sp -->\r
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFilesFolder -->\r
     </Directory><!-- TARGETDIR -->\r