[cpp-sp COMMIT] in /branches/REL_2/msi/WiX: ShibbolethSP-gui.wxs ShibbolethSP-main-x64.wxs ShibbolethSP-main-x86.wxs

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct  2 09:11:10 2012
New Revision: 3775

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3775&view=rev
Log:
Anchor various GUI entities and the merge modules so the build stops being tied to a specific directory.


Modified:
    branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
    branches/REL_2/msi/WiX/ShibbolethSP-main-x86.wxs

Modified: branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs?rev=3775&r1=3774&r2=3775&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-gui.wxs Tue Oct  2 09:11:10 2012
@@ -16,13 +16,15 @@
      implied.  See the License for the specific language governing
      permissions and limitations under the License.  -->
 
+<?include Versions.wxi ?>
+
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
   <!-- This file controls the dispaying of the GUI dialogs (both WiX and custom) -->
   <Fragment>
 
-    <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
-    <WixVariable Id="WixUIBannerBmp" Value="TopBanner.bmp" />
-    <WixVariable Id="WixUIDialogBmp" Value="Dialog.bmp" />
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\license.rtf" />
+    <WixVariable Id="WixUIBannerBmp" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\TopBanner.bmp" />
+    <WixVariable Id="WixUIDialogBmp" Value="$(var.SPBuildDirectory)\cpp-sp\msi\wix\Dialog.bmp" />
     <WixVariable Id="WixUICostingPopupOptOut" Value="1" />    
 
     <!-- GUI For Shibboleth installer.  Uses the Wix packages, but linked in

Modified: branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs?rev=3775&r1=3774&r2=3775&view=diff
==============================================================================
--- branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs (original)
+++ branches/REL_2/msi/WiX/ShibbolethSP-main-x64.wxs Tue Oct  2 09:11:10 2012
@@ -54,17 +54,17 @@
 
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <!-- 32 bit merge modules -notionally go to "Program Files (x86)" -->
-        <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='MergeModules\Curl-x86.msm' DiskId='1' />
-        <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='MergeModules\FastCGI-x86.msm' DiskId='1' />
-        <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='MergeModules\Log4Shib-x86.msm' DiskId='1' />
-        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSAML-x86.msm' DiskId='1' />
-        <Merge Id='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='MergeModules\OpenSAML-schemas.msm' DiskId='1' />
-        <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='MergeModules\OpenSSL-x86.msm' DiskId='1' />
-        <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='MergeModules\Shibboleth-x86.msm' DiskId='1' />
-        <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='MergeModules\Shibboleth-schemas.msm' DiskId='1' />
-        <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='MergeModules\Xerces-x86.msm' DiskId='1' />
-        <Merge Id='XmlSecMergeModule_x86' Language='1033' SourceFile='MergeModules\XmlSec-x86.msm' DiskId='1' />
-        <Merge Id='ZlibMergeModule_x86' Language='1033' SourceFile='MergeModules\Zlib-x86.msm' DiskId='1' />
+        <Merge Id='CurlMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Curl-x86.msm' DiskId='1' />
+        <Merge Id='FastCGIMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\FastCGI-x86.msm' DiskId='1' />
+        <Merge Id='Log4ShibMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Log4Shib-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-x86.msm' DiskId='1' />
+        <Merge Id='OpenSAMLMergeModule_schemas' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSAML-schemas.msm' DiskId='1' />
+        <Merge Id='OpenSSLMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\OpenSSL-x86.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-x86.msm' DiskId='1' />
+        <Merge Id='ShibbolethMergeModule_schemas' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Shibboleth-schemas.msm' DiskId='1' />
+        <Merge Id='XercesMergeModule_x86' Language='1033' SourceFile='$(var.SPBuildDirectory)\cpp-sp\msi\wix\MergeModules\Xerces-x86.msm' DiskId='1' />

[... 41 lines stripped ...]