summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-05-25 20:46:13 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-05-25 20:54:53 (GMT)
commit95a8998917591fdd77009f606bd55ece22f84950 (patch)
treecf6d1025c17599ecc2ec4bdabddf24b9719ce941 /Swift
parentee9eff16cd7024bdbd889bab7612c63bcfe3cbe9 (diff)
downloadswift-95a8998917591fdd77009f606bd55ece22f84950.zip
swift-95a8998917591fdd77009f606bd55ece22f84950.tar.bz2
Pick up build version from git tag (if present).
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/SConscript4
-rw-r--r--Swift/SConscript3
2 files changed, 3 insertions, 4 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index d4acc50..b35668b 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -109,7 +109,9 @@ sources = [
]
-myenv.BuildVersion("BuildVersion.h", version = env["SWIFT_VERSION"])
+env["SWIFT_VERSION"] = Version.getBuildVersion("swift")
+print env["SWIFT_VERSION"]
+myenv.BuildVersion("BuildVersion.h", project = "swift")
if env["PLATFORM"] == "win32" :
myenv.RES("../resources/Windows/Swift.rc")
diff --git a/Swift/SConscript b/Swift/SConscript
index 8f1fa26..0064eee 100644
--- a/Swift/SConscript
+++ b/Swift/SConscript
@@ -9,8 +9,5 @@ if env["SCONS_STAGE"] == "build" :
print "Error: Swift requires OpenSSL support, and OpenSSL was not found."
Exit(1)
-
- env["SWIFT_VERSION"] = "0.9.9." + datetime.date.today().strftime("%Y%m%d")
-
if env["target"] == "native":
SConscript("QtUI/SConscript")