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

[Manuel de la Peña]

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

[John Lenton (chipaca)]

review: Approve

[Rick McBride (rmcbride)]

review: Approve

=== modified file 'install/UbuntuOne7.wxs'
--- install/UbuntuOne7.wxs	2010-10-06 09:12:45 +0000
+++ install/UbuntuOne7.wxs	2010-10-06 09:12:46 +0000
@@ -10,7 +10,7 @@
 			 UpgradeCode="1f5dcd90-849c-11df-8395-0800200c9a66"
              Language="1033" 
 			 Codepage="1252"
-			 Version="1.0.0" 
+			 Version="$(var.VERSION)" 
 			 Manufacturer="Canonical Ltd.">
         
 		<Package Id="*"
 
=== modified file 'install/UbuntuOneXP.wxs'
--- install/UbuntuOneXP.wxs	2010-10-06 09:12:45 +0000
+++ install/UbuntuOneXP.wxs	2010-10-06 09:12:46 +0000
@@ -10,7 +10,7 @@
 			 UpgradeCode="1f5dcd90-849c-11df-8395-0800200c9a66"
              Language="1033" 
 			 Codepage="1252"
-			 Version="1.0.0" 
+			 Version="$(var.VERSION)" 
 			 Manufacturer="Canonical Ltd.">
         
 		<Package Id="*"
 
=== modified file 'main.build'
--- main.build	2010-10-06 09:12:45 +0000
+++ main.build	2010-10-06 09:12:46 +0000
@@ -292,7 +292,7 @@
                   managed="true"
                   workingdir="install"
                   program="candle.exe"
-                  commandline="-ext WixUIExtension -ext WixUtilExtension UbuntuOne7.wxs"/>
+                  commandline='-ext WixUIExtension -ext WixUtilExtension -dVERSION="${buildnumber.major}.${buildnumber.minor}.${buildnumber.build}.${buildnumber.revision}" UbuntuOne7.wxs'/>
                   
             <!-- wix linker -->
             <exec basedir="tools/Wix/bin"