Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-05-29 18:18:33 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-05-29 18:18:33 (GMT) |
| commit | 141bad5fe7d51edc2eaffd5d15342075d550fc8c (patch) | |
| tree | 4aea3d5c382a8f4a381630afe9d76165599a05d2 /Swift/QtUI | |
| parent | 8850545f853d0b30212b37be6be0f1e47704122d (diff) | |
| download | swift-141bad5fe7d51edc2eaffd5d15342075d550fc8c.zip swift-141bad5fe7d51edc2eaffd5d15342075d550fc8c.tar.bz2 | |
Fix Swift version in .dmg generation.
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index 59f0729..e3c4a3c 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -109,7 +109,7 @@ sources = [ ] -env["SWIFT_VERSION"] = Version.getBuildVersion("swift") +myenv["SWIFT_VERSION"] = Version.getBuildVersion("swift") myenv.BuildVersion("BuildVersion.h", project = "swift") if env["PLATFORM"] == "win32" : @@ -131,7 +131,7 @@ if env["PLATFORM"] == "darwin" : frameworks = [] if env["HAVE_SPARKLE"] : frameworks.append(env["SPARKLE_FRAMEWORK"]) - app = myenv.AppBundle("Swift", version = env["SWIFT_VERSION"], resources = ["../resources/MacOSX/Swift.icns"], frameworks = frameworks) + app = myenv.AppBundle("Swift", version = myenv["SWIFT_VERSION"], resources = ["../resources/MacOSX/Swift.icns"], frameworks = frameworks) if env["DIST"] : myenv.Command(["Swift-${SWIFT_VERSION}.dmg"], [app], [ "$QTDIR/bin/macdeployqt $SOURCE -dmg", @@ -152,6 +152,6 @@ if env["PLATFORM"] == "win32" : myenv.Append(NSIS_OPTIONS = [ "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", - "/DbuildVersion=" + env["SWIFT_VERSION"] + "/DbuildVersion=" + myenv["SWIFT_VERSION"] ]) myenv.Nsis("../Packaging/nsis/swift.nsi") |