https://issues.shibboleth.net/jira/browse/SSPCPP-506

[shibboleth/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 4113a21..1f08fd2 100644 (file)
--- a/msi/WiX/MergeModules/Shibboleth-x86.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-x86.wxs
@@ -16,10 +16,14 @@
    permissions and limitations under the License.  -->\r
 \r
 <?include ..\Versions.wxi ?>\r
+<?define ShibDll32Component='{9DE384BF-C286-4A72-AED9-AA34384005C0}' ?>\r
+<?define ShibDllLite32Component='{10475E33-434D-4805-B983-195092549BED}' ?>\r
+<?define ShibDll32Componentd='{4196D799-1162-4D62-9F7A-1F59E90F19F1}' ?>\r
+<?define ShibDllLite32Componentd='{8E070220-2992-4D45-BF98-459022CD268F}' ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='ShibbolethSPMergeModule_x86' Language='1033' Version='$(var.ShibbolethDllVersion)'>\r
-    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth DLLs (x86)'\r
+    <Package Id='{AD8C7CB1-94D5-4C8E-88D0-040F817E1802}' Description='Merge Module for Shibboleth SP DLLs (x86)'\r
              Comments='This module is built by the Shibboleth Consortium.'\r
              Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x86'/>\r
 \r
@@ -27,30 +31,31 @@
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>\r
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <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.ShibbolethDllFileVersion).dll' KeyPath='yes' />\r
+            <Directory Id='lib' Name='lib' FileSource='$(var.SPBuildDirectory)\cpp-sp\Release'>\r
+              <Component Id='shibsp.dll' Guid='$(var.ShibDll32Component)'>\r
+                <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion).dll' />\r
               </Component>\r
-              <Component Id='shibsp.dll' Guid='{9DE384BF-C286-4A72-AED9-AA34384005C0}'>\r
-                <File Name='shibsp$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />\r
+              <Component Id='shibsp_lite.dll' Guid='$(var.ShibDllLite32Component)'>\r
+                <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' />\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.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\r
+              <Directory Id='lib_debug' Name='debug' FileSource='$(var.SPBuildDirectory)\cpp-sp\Debug' >\r
+                <Component Id='shibspD.dll' Guid='$(var.ShibDll32Componentd)'>\r
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' />\r
                 </Component>\r
-                <Component Id='shibspD.dll' Guid='{4196D799-1162-4D62-9F7A-1F59E90F19F1}'>\r
-                  <File Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />\r
+                <Component Id='shibsp_liteD.dll' Guid='$(var.ShibDllLite32Componentd)'>\r
+                  <File KeyPath='yes' Checksum='yes' Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' />\r
                 </Component>\r
               </Directory><!-- lib_debug -->\r
             </Directory><!-- lib -->\r
-            <Directory Id='doc' Name='doc'/>\r
+            <Directory Id='doc' Name='doc'>\r
+              <Component Id='doc' Guid='{6FB48AD9-2D14-46F5-A826-2DB2E604B5BB}'>\r
+                <File KeyPath='yes' Name='SHIBBOLETH.LICENSE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\LICENSE.txt' />\r
+                <File Name='SHIBBOLETH.NOTICE' Source='$(var.SPBuildDirectory)\cpp-sp\doc\NOTICE.txt' />\r
+              </Component>\r
+            </Directory><!-- doc -->\r
           </Directory><!-- shibboleth_sp -->\r
         </Directory><!-- shibboleth -->\r
       </Directory><!-- ProgramFilesFolder -->\r
     </Directory><!-- TARGETDIR -->\r
   </Module>\r
 </Wix>\r
-\r
-    \r