Ubuntu One Windows Installer

Merge lp:~mandel/ubuntuone-windows-installer/add_version_wix_var into lp:ubuntuone-windows-installer/beta

  1. add_version_wix_var
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Rick McBride
Approved revision: 98
Merged at revision: 98
Proposed branch: lp:~mandel/ubuntuone-windows-installer/add_version_wix_var
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/add_icon
Diff against target: 38 lines (+3/-3)
3 files modified
install/UbuntuOne7.wxs (+1/-1)
install/UbuntuOneXP.wxs (+1/-1)
main.build (+1/-1)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/add_version_wix_var
Reviewer Review Type Date Requested Status
Rick McBride (community) Approve
John Lenton (community) Approve
Review via email: mp+37716@code.launchpad.net

Description of the change

Fix lp:629047 by adding a wix variable that will be passed to the wix project to state the version of the package.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Rick McBride (rmcbride) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'install/UbuntuOne7.wxs'
2--- install/UbuntuOne7.wxs 2010-10-06 09:12:45 +0000
3+++ install/UbuntuOne7.wxs 2010-10-06 09:12:46 +0000
4@@ -10,7 +10,7 @@
5 UpgradeCode="1f5dcd90-849c-11df-8395-0800200c9a66"
6 Language="1033"
7 Codepage="1252"
8- Version="1.0.0"
9+ Version="$(var.VERSION)"
10 Manufacturer="Canonical Ltd.">
11
12 <Package Id="*"
13
14=== modified file 'install/UbuntuOneXP.wxs'
15--- install/UbuntuOneXP.wxs 2010-10-06 09:12:45 +0000
16+++ install/UbuntuOneXP.wxs 2010-10-06 09:12:46 +0000
17@@ -10,7 +10,7 @@
18 UpgradeCode="1f5dcd90-849c-11df-8395-0800200c9a66"
19 Language="1033"
20 Codepage="1252"
21- Version="1.0.0"
22+ Version="$(var.VERSION)"
23 Manufacturer="Canonical Ltd.">
24
25 <Package Id="*"
26
27=== modified file 'main.build'
28--- main.build 2010-10-06 09:12:45 +0000
29+++ main.build 2010-10-06 09:12:46 +0000
30@@ -292,7 +292,7 @@
31 managed="true"
32 workingdir="install"
33 program="candle.exe"
34- commandline="-ext WixUIExtension -ext WixUtilExtension UbuntuOne7.wxs"/>
35+ commandline='-ext WixUIExtension -ext WixUtilExtension -dVERSION="${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision}" UbuntuOne7.wxs'/>
36
37 <!-- wix linker -->
38 <exec basedir="tools/Wix/bin"

Subscribers

People subscribed via source and target branches

to all changes: