diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-04-22 21:24:57 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-04-22 21:29:00 (GMT) |
commit | a3c9486f2f593220f5a9d4c4e57ac2bc7aa5bbf9 (patch) | |
tree | 505a2018aa28ef83828903ddae07a3ddbb07bd8e /BuildTools/SCons/Version.py | |
parent | 1fe811468562aaf9cf1583997fb0894c0f56da15 (diff) | |
download | swift-contrib-a3c9486f2f593220f5a9d4c4e57ac2bc7aa5bbf9.zip swift-contrib-a3c9486f2f593220f5a9d4c4e57ac2bc7aa5bbf9.tar.bz2 |
Fixed SCons not picking up the build version correctly in tarball build.
Diffstat (limited to 'BuildTools/SCons/Version.py')
-rw-r--r-- | BuildTools/SCons/Version.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BuildTools/SCons/Version.py b/BuildTools/SCons/Version.py index 4a2bf77..993536a 100644 --- a/BuildTools/SCons/Version.py +++ b/BuildTools/SCons/Version.py @@ -17,12 +17,12 @@ def git(cmd) : p.stdin.close() return gitVersion if p.wait() == 0 else None -def getBuildVersion(project) : +def getBuildVersion(root, project) : gitVersion = getGitBuildVersion(project) if gitVersion : return gitVersion else : - versionFilename = "VERSION." + project + versionFilename = os.path.join(root, "VERSION." + project) if os.path.isfile(versionFilename) : f = open(versionFilename) version = f.read().strip() |