aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-02-27 20:24:06 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-02-27 20:24:06 +0200
commite40eec4b85404238c8e46b1998903179d000a355 (patch)
treece5df9c11d08d7b4c44f112562d5b5124520d79f
parent75818950f84e6eb29790d7bdc47445b529143008 (diff)
downloadmeson-e40eec4b85404238c8e46b1998903179d000a355.zip
meson-e40eec4b85404238c8e46b1998903179d000a355.tar.gz
meson-e40eec4b85404238c8e46b1998903179d000a355.tar.bz2
Use fallback if git is not installed. Closes #44.
-rwxr-xr-xtest cases/common/72 build always/version_gen.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/test cases/common/72 build always/version_gen.py b/test cases/common/72 build always/version_gen.py
index 4962455..c82678d 100755
--- a/test cases/common/72 build always/version_gen.py
+++ b/test cases/common/72 build always/version_gen.py
@@ -6,19 +6,20 @@ def generate(infile, outfile, fallback):
workdir = os.path.split(infile)[0]
if workdir == '':
workdir = '.'
- p = subprocess.Popen(['git', 'describe'], cwd=workdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- (stdo, _) = p.communicate()
- # If we are working off an extracted tarball, git version number is not available.
- if p.returncode == 0:
- version = stdo.decode().strip()
- else:
- version = fallback
+ version = fallback
+ try:
+ p = subprocess.Popen(['git', 'describe'], cwd=workdir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ (stdo, _) = p.communicate()
+ if p.returncode == 0:
+ version = stdo.decode().strip()
+ except:
+ pass
newdata = open(infile).read().replace('@VERSION@', version)
try:
olddata = open(outfile).read()
if olddata == newdata:
return
- except Exception:
+ except:
pass
open(outfile, 'w').write(newdata)