Updated for 2.5 fileset plus various cleanups

[shibboleth/sp.git] / msi / WiX / MergeModules / FastCGI-x64.wxs

diff --git a/msi/WiX/MergeModules/FastCGI-x64.wxs b/msi/WiX/MergeModules/FastCGI-x64.wxs
index 0baf43a..c086b8d 100644 (file)
--- a/msi/WiX/MergeModules/FastCGI-x64.wxs
+++ b/msi/WiX/MergeModules/FastCGI-x64.wxs
@@ -16,35 +16,34 @@
    implied.  See the License for the specific language governing\r
    permissions and limitations under the License.  -->\r
 \r
-<?define BuildDirectory='G:\Downloads\shib\' ?>\r
-<?define FastCGIVersion='2.4.0' ?>\r
+<?include ..\Versions.wxi ?>\r
 \r
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>\r
   <Module Id='FastCGIMergeModule_x64' Language='1033' Version='$(var.FastCGIVersion)'>\r
     <Package Id='{4820855A-68B9-4EBB-94CD-4C1F9DA6EB02}' Description='Merge Module for FastCGI (x64)'\r
              Comments='This module is built by the Shibboleth Consortium.'\r
-             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>\r
+             Manufacturer='Shibboleth Consortium' InstallerVersion='300' Platform='x64'/>\r
 \r
     <Directory Id='TARGETDIR' Name='SourceDir'>\r
       <Directory Id='ProgramFiles64Folder' Name='ProgramFiles'>\r
         <Directory Id='shibboleth' Name='Shibboleth'>\r
           <Directory Id='shibboleth_SP' Name='SP'>\r
             <Directory Id='lib' Name='lib'>\r
-              <Component Id='libfcgi.dll21' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>\r
-                <File KeyPath='yes' \r
-                      Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />\r
+              <Component Id='libfcgi.dll' Guid='{B3854D00-6E8A-4107-B1E3-26DD71F1C43D}' Win64='yes'>\r
+                <File KeyPath='yes' Checksum='yes'\r
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Release\libfcgi.dll' />\r
               </Component>\r
               <Directory Id='lib_debug' Name='debug'>\r
-                <Component Id='libfcgi.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>\r
-                  <File KeyPath='yes' \r
-                        Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />\r
+                <Component Id='libfcgid.dll' Guid='{A7EF753D-0729-47A2-BFBB-56C7152CF4A7}' Win64='yes'>\r
+                  <File KeyPath='yes' Checksum='yes'\r
+                    Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\Win32\x64\Debug\libfcgid.dll' />\r
                 </Component>\r
               </Directory><!-- lib_debug-->\r
             </Directory><!-- lib -->\r
             <Directory Id='doc' Name='doc'>\r
               <Component Id='FASTCGI.LICENSE' Guid='{FC00E9B5-72B1-4E87-A5C4-26EE6A7BA509}' Win64='yes'>\r
-                <File KeyPath='yes' \r
-                      Source='$(var.BuildDirectory)\cvs\2.0\cpp-sp\doc\FASTCGI.LICENSE' />\r
+                <File KeyPath='yes' Name='FASTCGI.LICENSE'\r
+                  Source='$(var.BuildDirectory)\fcgi-$(var.FastCGIVersion)-VC10\LICENSE.TERMS' />\r
               </Component>\r
             </Directory><!-- doc -->\r
           </Directory><!-- shibboleth -->\r
@@ -53,5 +52,3 @@
     </Directory><!-- TARGETDIR -->\r
   </Module>\r
 </Wix>\r
-\r
-\r