diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-12-08 23:18:09 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-12-08 23:18:09 +0100 |
commit | 318ef5d44314814f4dd7da2ba8c532b0119bdb35 (patch) | |
tree | 8ab9251ce6d5c851ea5000ae604a180c2b7044f5 /gyp | |
parent | c61537af8fb0e6beaecebd4ce0989b838e0ce92a (diff) | |
parent | 8fd04ebc44d14440b96f0bcf391f9bee730efbac (diff) | |
download | qtlocation-mapboxgl-318ef5d44314814f4dd7da2ba8c532b0119bdb35.tar.gz |
Merge pull request #705 from mapbox/user-agent-os
Include operating system and actual version number in User Agent string
Diffstat (limited to 'gyp')
-rw-r--r-- | gyp/mbgl-core.gypi | 1 | ||||
-rw-r--r-- | gyp/mbgl-ios.gypi | 3 | ||||
-rw-r--r-- | gyp/mbgl-linux.gypi | 3 | ||||
-rw-r--r-- | gyp/mbgl-osx.gypi | 3 | ||||
-rw-r--r-- | gyp/version.gypi | 31 |
5 files changed, 41 insertions, 0 deletions
diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi index 279051968c..ea279f2dad 100644 --- a/gyp/mbgl-core.gypi +++ b/gyp/mbgl-core.gypi @@ -7,6 +7,7 @@ 'hard_dependency': 1, 'dependencies': [ 'shaders', + 'version', ], 'variables': { 'cflags_cc': [ diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi index ec31869ad9..df6896e1e7 100644 --- a/gyp/mbgl-ios.gypi +++ b/gyp/mbgl-ios.gypi @@ -30,6 +30,9 @@ 'type': 'static_library', 'standalone_static_library': 1, 'hard_dependency': 1, + 'dependencies': [ + 'version', + ], 'sources': [ '../platform/ios/cache_database_library.mm', '../platform/ios/shader_cache_library.mm', diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 7af08242ee..fdea368ae2 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -5,6 +5,9 @@ 'type': 'static_library', 'standalone_static_library': 1, 'hard_dependency': 1, + 'dependencies': [ + 'version', + ], 'variables': { 'cflags_cc': [ '<@(png_cflags)', diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi index 09c96807aa..4e8a131da5 100644 --- a/gyp/mbgl-osx.gypi +++ b/gyp/mbgl-osx.gypi @@ -5,6 +5,9 @@ 'type': 'static_library', 'standalone_static_library': 1, 'hard_dependency': 1, + 'dependencies': [ + 'version', + ], 'sources': [ '../platform/osx/cache_database_application_support.mm', '../platform/osx/shader_cache_application_support.mm', diff --git a/gyp/version.gypi b/gyp/version.gypi new file mode 100644 index 0000000000..ca68f0eb57 --- /dev/null +++ b/gyp/version.gypi @@ -0,0 +1,31 @@ +{ + 'targets': [ + { + 'target_name': 'version', + 'type': 'none', + 'hard_dependency': 1, + 'actions': [ + { + 'action_name': 'Build Version File', + 'inputs': [ + '../scripts/build-version.py', + ], + 'outputs': [ + '<(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=0)', '<!@(git rev-parse HEAD)'], + } + ], + 'direct_dependent_settings': { + 'sources': [ + '<(SHARED_INTERMEDIATE_DIR)/include/mbgl/util/version.hpp', + '<(SHARED_INTERMEDIATE_DIR)/src/mbgl/util/mbgl_version.cpp', + ], + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/include', + ] + } + }, + ] +} |