summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-22 21:30:21 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-22 21:30:21 (GMT)
commitb381d4fac4c4362ab534ab73875126cb5c6cd101 (patch)
tree984af532325b88d27342d2e77b9a470de4d7402c /Sluift/SConscript
parent280a613aef9b549cca41497c50e70052cebb4860 (diff)
parenta3c9486f2f593220f5a9d4c4e57ac2bc7aa5bbf9 (diff)
downloadswift-b381d4fac4c4362ab534ab73875126cb5c6cd101.zip
swift-b381d4fac4c4362ab534ab73875126cb5c6cd101.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Fixed SCons not picking up the build version correctly in tarball build.
Diffstat (limited to 'Sluift/SConscript')
-rw-r--r--Sluift/SConscript2
1 files changed, 1 insertions, 1 deletions
diff --git a/Sluift/SConscript b/Sluift/SConscript
index 6897f6d..7c434de 100644
--- a/Sluift/SConscript
+++ b/Sluift/SConscript
@@ -27,7 +27,7 @@ if env["SCONS_STAGE"] == "build" :
else :
myenv.Append(CFLAGS = ["-x", "c++"])
- myenv["SLUIFT_VERSION"] = Version.getBuildVersion("sluift")
+ myenv["SLUIFT_VERSION"] = Version.getBuildVersion(env.Dir("#").abspath, "sluift")
def patchLua(env, target, source) :
f = open(source[0].abspath, "r")
contents = f.read()