Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-04-24 20:48:57 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-04-24 20:48:57 (GMT) |
| commit | 7ca00008a6903abd01928231f5227dee44257bf4 (patch) | |
| tree | 2e8c1bcdf2374e8b8008327919528ef4fd8d278c /Swift/QtUI | |
| parent | 54ebf839511d49007d7fa7fc18be753a8883e057 (diff) | |
| download | swift-7ca00008a6903abd01928231f5227dee44257bf4.zip swift-7ca00008a6903abd01928231f5227dee44257bf4.tar.bz2 | |
Embed version in WiX file.
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/SConscript | 4 |
1 files changed, 3 insertions, 1 deletions
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: |