From 141bad5fe7d51edc2eaffd5d15342075d550fc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 29 May 2010 20:18:33 +0200
Subject: Fix Swift version in .dmg generation.


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")
-- 
cgit v0.10.2-6-g49f6