summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-04-24 20:48:57 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-04-24 20:48:57 (GMT)
commit7ca00008a6903abd01928231f5227dee44257bf4 (patch)
tree2e8c1bcdf2374e8b8008327919528ef4fd8d278c
parent54ebf839511d49007d7fa7fc18be753a8883e057 (diff)
downloadswift-contrib-7ca00008a6903abd01928231f5227dee44257bf4.zip
swift-contrib-7ca00008a6903abd01928231f5227dee44257bf4.tar.bz2
Embed version in WiX file.
-rw-r--r--Swift/Packaging/WiX/Swift.wxs2
-rw-r--r--Swift/QtUI/SConscript4
2 files changed, 4 insertions, 2 deletions
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: