diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-12-08 16:59:02 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-12-08 16:59:02 +0100 |
| commit | 5a3d0b0d3aa7b9e5e67457b39a765d87c53439cc (patch) | |
| tree | c354c5128495fa3ddfedeb0566132f8948517934 | |
| parent | 0a84deef91c88e382091f0d428bc1192afbe0adc (diff) | |
| download | qtlocation-mapboxgl-5a3d0b0d3aa7b9e5e67457b39a765d87c53439cc.tar.gz | |
don't print more information when a tag actually is available
| -rw-r--r-- | gyp/version.gypi | 2 | ||||
| -rw-r--r-- | scripts/build-version.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gyp/version.gypi b/gyp/version.gypi index 73b2f668db..ca68f0eb57 100644 --- a/gyp/version.gypi +++ b/gyp/version.gypi @@ -14,7 +14,7 @@ '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp', '<(SHARED_INTERMEDIATE_DIR)/src/mbgl/util/mbgl_version.cpp', ], - 'action': ['<@(python)', 'scripts/build-version.py', '<(SHARED_INTERMEDIATE_DIR)', '<!@(git describe --tags --always --abbrev=8)', '<!@(git rev-parse --short=8 HEAD)'], + 'action': ['<@(python)', 'scripts/build-version.py', '<(SHARED_INTERMEDIATE_DIR)', '<!@(git describe --tags --always --abbrev=0)', '<!@(git rev-parse HEAD)'], } ], 'direct_dependent_settings': { diff --git a/scripts/build-version.py b/scripts/build-version.py index 864b5758a2..8db647c888 100644 --- a/scripts/build-version.py +++ b/scripts/build-version.py @@ -11,7 +11,7 @@ if sys.argv[2] == sys.argv[3]: else: tag = map(int, sys.argv[2].split('.')) -rev = sys.argv[3] +rev = sys.argv[3][0:8] def mkdir_p(path): |