Skip to content

Commit

Permalink
Update paths in installer wix scripts for moved files
Browse files Browse the repository at this point in the history
  • Loading branch information
@baldurk
baldurk committed Nov 30, 2016
1 parent c49d79b commit 6a5ba7e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions scripts/installer/Installer32.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
</Component>

<Component Id='LICENSE' Guid='107AD4E6-D64F-4284-A1F6-D8AAAA6CFC42'>
<File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='installer/LICENSE.rtf' KeyPath='yes' />
<File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='scripts/installer/LICENSE.rtf' KeyPath='yes' />
</Component>

<Component Id='RenderDocCMD' Guid='97338A5D-8FDB-4DF5-AEC7-14B36F234F29'>
Expand Down Expand Up @@ -290,12 +290,12 @@
<UIRef Id="WixUI_Mondo" />
<UIRef Id="WixUI_ErrorProgressText" />

<WixVariable Id="WixUILicenseRtf" Value="installer/LICENSE.rtf" />
<WixVariable Id="WixUILicenseRtf" Value="scripts/installer/LICENSE.rtf" />

<WixVariable Id="WixUIBannerBmp" Value="installer/bannrbmp.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="installer/dlgbmp.bmp" />
<WixVariable Id="WixUIBannerBmp" Value="scripts/installer/bannrbmp.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="scripts/installer/dlgbmp.bmp" />

<Icon Id="chm.ico" SourceFile="installer/chm.ico" />
<Icon Id="chm.ico" SourceFile="scripts/installer/chm.ico" />
<Icon Id="icon.ico" SourceFile="renderdocui/Resources/icon.ico" />
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
<Property Id="ARPHELPLINK" Value="http://renderdoc.org/" />
Expand Down
10 changes: 5 additions & 5 deletions scripts/installer/Installer64.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
</Component>

<Component Id='LICENSE' Win64="yes" Guid='71534ACB-DF6B-4956-A14C-566925D77AB0'>
<File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='installer/LICENSE.rtf' KeyPath='yes' />
<File Id='LICENSE' Name='LICENSE.rtf' DiskId='1' Source='scripts/installer/LICENSE.rtf' KeyPath='yes' />
</Component>

<Component Id='RenderDocCMD' Win64="yes" Guid='3443061F-2B11-4661-8535-4319D97B375C'>
Expand Down Expand Up @@ -334,12 +334,12 @@
<UIRef Id="WixUI_Mondo" />
<UIRef Id="WixUI_ErrorProgressText" />

<WixVariable Id="WixUILicenseRtf" Value="installer/LICENSE.rtf" />
<WixVariable Id="WixUILicenseRtf" Value="scripts/installer/LICENSE.rtf" />

<WixVariable Id="WixUIBannerBmp" Value="installer/bannrbmp.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="installer/dlgbmp.bmp" />
<WixVariable Id="WixUIBannerBmp" Value="scripts/installer/bannrbmp.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="scripts/installer/dlgbmp.bmp" />

<Icon Id="chm.ico" SourceFile="installer/chm.ico" />
<Icon Id="chm.ico" SourceFile="scripts/installer/chm.ico" />
<Icon Id="icon.ico" SourceFile="renderdocui/Resources/icon.ico" />
<Property Id="ARPPRODUCTICON" Value="icon.ico" />
<Property Id="ARPHELPLINK" Value="http://renderdoc.org/" />
Expand Down

0 comments on commit 6a5ba7e

Please sign in to comment.