From 7ca00008a6903abd01928231f5227dee44257bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Tue, 24 Apr 2012 22:48:57 +0200
Subject: Embed version in WiX file.


diff --git a/Swift/Packaging/WiX/Swift.wxs b/Swift/Packaging/WiX/Swift.wxs
index e811746..ec825b6 100644
--- a/Swift/Packaging/WiX/Swift.wxs
+++ b/Swift/Packaging/WiX/Swift.wxs
@@ -6,7 +6,7 @@
 
 	<?include variables.wxs ?>
 
-	<Product Name='Swift' Id='*' UpgradeCode='D7F276D5-BA67-421E-817B-9E7AB4B7D2BF' Language='1033' Codepage='1252' Version='0.0.1' Manufacturer='Swift.im'>
+	<Product Name='Swift' Id='*' UpgradeCode='D7F276D5-BA67-421E-817B-9E7AB4B7D2BF' Language='1033' Codepage='1252' Version='$(var.Version)' Manufacturer='Swift.im'>
 		<Package Id='*' Keywords='Installer' Description="Swift Installer" Comments="Swift is available under the GPL version 3" Manufacturer="Swift.im" InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252'/>
 		<Media Id='1' Cabinet='Swift.cab' EmbedCab='yes'/>
 
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 97b1810..ab832d6 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -306,7 +306,9 @@ if env["PLATFORM"] == "win32" :
 
       wixvariables = {
         'VCCRTFile': env.get("vcredist", "c:\\Program Files\\Common Files\\Merge Modules") + "\\Microsoft_VC90_CRT_x86.msm",
-        'Version': str(myenv["SWIFT_VERSION_MAJOR"]) + "." + str(myenv["SWIFT_VERSION_MINOR"]) 	
+        # FIXME: Not including patch version, but that shouldn't be 
+        # a problem. It just allows downgrading between development versions
+        'Version': str(myenv["SWIFT_VERSION_MAJOR"]) + "." + str(myenv["SWIFT_VERSION_MINOR"]) + ".0"	
       }
       wixincludecontent = "<Include>"
       for key in wixvariables:
-- 
cgit v0.10.2-6-g49f6