[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: Compile.bat MergeModules/Curl-x86.wxs MergeModules/Shibboleth-x64.wxs Mer...

[noreply at shibboleth.net]

Author: rdw
Date: Sat May  5 17:39:45 2012
New Revision: 3645

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3645&view=rev
Log:
More WiX. Fragments and include files to allow us to build an x64 installer (not yet tested)

Added:
    branches/REL_2/msi/WiX/Compile.bat   (with props)
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-properties.wxi
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-registry-x86.wxs
    branches/REL_2/msi/WiX/tes.wxs
Modified:
    branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-x64.wxs
    branches/REL_2/msi/WiX/MergeModules/Shibboleth-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-exe-x86.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-noarch.wxs
    branches/REL_2/msi/WiX/Versions.wxi
    branches/REL_2/msi/WiX/testInstall.wxs

Modified: branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs?rev=3645&r1=3644&r2=3645&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Curl-x86.wxs Sat May  5 17:39:45 2012
@@ -22,7 +22,7 @@
   <Module Id='CurlMergeModule_x86' Language='1033' Version='$(var.CurlVersion)'>
     <Package Id='10467105-6375-49E1-AC35-045084BD8FA4' Description='Merge Module for CURL (x86)'
              Comments='This module is built by the Shibboleth Consortium.'
-             Manufacturer='Shibboleth Consortium' InstallerVersion='400' Platform='x64'/>
+             Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='ProgramFiles'>

Modified: branches/REL_2/msi/WiX/MergeModules/Shibboleth-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Shibboleth-x64.wxs?rev=3645&r1=3644&r2=3645&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Shibboleth-x64.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Shibboleth-x64.wxs Sat May  5 17:39:45 2012
@@ -18,7 +18,7 @@
 <?include ..\Versions.wxi ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethVersion)'>
+  <Module Id='ShibbolethSPMergeModule_x64' Language='1033' Version='$(var.ShibbolethDllVersion)'>
     <Package Id='{DF6FAD40-5EF8-43F2-BBE1-BD42B9E9ACAB}' Description='Merge Module for Shibboleth DLLs (x64)'
              Comments='This module is built by the Shibboleth Consortium.'
              Manufacturer='Shibboleth Consortium' InstallerVersion='405' Platform='x64'/>
@@ -30,18 +30,18 @@
             <Directory Id='lib' Name='lib' 
                        FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Release'>
               <Component Id='shibsplite.dll' Guid='{2D6A6399-62A6-4BF6-8D58-82E1EFE8C65E}' Win64='yes'>
-                <File Name='shibsp-lite$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />
+                <File Name='shibsp-lite$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />
               </Component>
               <Component Id='shibsp.dll' Guid='{B7DE652A-6853-4389-AD47-5DBB5AC89BDB}' Win64='yes'>
-                <File Name='shibsp$(var.ShibbolethSPFileVersion).dll' KeyPath='yes' />
+                <File Name='shibsp$(var.ShibbolethDllFileVersion).dll' KeyPath='yes' />
               </Component>
               <Directory Id='lib_debug' Name='debug' 
                          FileSource='$(var.BuildDirectory)\cvs\2.0\cpp-sp\x64\Debug' >
                 <Component Id='shibspliteD.dll' Guid='{5EF6FF17-0510-484B-9F24-523B29EB416C}' Win64='yes'>
-                  <File Name='shibsp-lite$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />
+                  <File Name='shibsp-lite$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />
                 </Component>
                 <Component Id='shibspD.dll' Guid='{222ED92E-DD0B-410E-9A90-D1DD1AA878CF}' Win64='yes'>
-                  <File Name='shibsp$(var.ShibbolethSPFileVersion)D.dll' KeyPath='yes' />
+                  <File Name='shibsp$(var.ShibbolethDllFileVersion)D.dll' KeyPath='yes' />
                 </Component>
               </Directory><!-- lib_debug -->
             </Directory><!-- lib -->

Modified: branches/REL_2/msi/WiX/MergeModules/Shibboleth-x86.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/MergeModules/Shibboleth-x86.wxs?rev=3645&r1=3644&r2=3645&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/MergeModules/Shibboleth-x86.wxs (original)
+++ branches/REL_2/msi/WiX/MergeModules/Shibboleth-x86.wxs Sat May  5 17:39:45 2012
@@ -18,7 +18,7 @@

[... 437 lines stripped ...]