X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=msi%2FWiX%2FMergeModules%2FShibboleth-x86.wxs;h=16246a593059055f33fcc7ba824bdfd6c413aa3d;hb=a0ecb351fef7987d5dafd700099afae83bce6678;hp=0e4c661bd44c6edb47950428ea17f3e3f50baa13;hpb=2b7f2fa612124ec54c4c2277ac600a58602939e0;p=shibboleth%2Fcpp-sp.git

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