diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-03 15:59:42 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-02-08 10:59:59 -0600 |
commit | 150b938b4922ec162bcb593c365e3d3616e0dbd7 (patch) | |
tree | edc3cf391f8971e98752fe1c52f8513afeb71cef /platform | |
parent | d3ca6c67f1b8fbf5d71c307e71ba89a483ec75bc (diff) | |
download | qtlocation-mapboxgl-150b938b4922ec162bcb593c365e3d3616e0dbd7.tar.gz |
[build, ios, macos] Simplify version portion of user agent string
The X.Y.Z version portion was unreliable, as it pulled from the latest tag regardless of platform. Set version to 0.0.0 and retrieve only the hash, which allows us to drop the node/npm dependency.
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/config.cmake | 1 | ||||
-rw-r--r-- | platform/darwin/src/http_file_source.mm | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/platform/android/config.cmake b/platform/android/config.cmake index 7d554dc786..9d8858ac0d 100644 --- a/platform/android/config.cmake +++ b/platform/android/config.cmake @@ -237,7 +237,6 @@ target_include_directories(mbgl-test PRIVATE test/include PRIVATE test/src PRIVATE platform/default - PRIVATE ${MBGL_GENERATED}/include ) target_link_libraries(mbgl-test diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm index f4b2f8af01..649cebb47f 100644 --- a/platform/darwin/src/http_file_source.mm +++ b/platform/darwin/src/http_file_source.mm @@ -4,7 +4,6 @@ #include <mbgl/util/http_header.hpp> #include <mbgl/util/async_task.hpp> - #include <mbgl/util/version.hpp> #import <Foundation/Foundation.h> @@ -133,8 +132,8 @@ NSString *HTTPFileSource::Impl::getUserAgent() const { // Avoid %s here because it inserts hidden bidirectional markers on macOS when the system // language is set to a right-to-left language. - [userAgentComponents addObject:[NSString stringWithFormat:@"MapboxGL/%@ (%@)", - CFSTR(MBGL_VERSION_STRING), CFSTR(MBGL_VERSION_REV)]]; + [userAgentComponents addObject:[NSString stringWithFormat:@"MapboxGL/0.0.0 (%@)", + @(mbgl::version::revision)]]; NSString *systemName = @"Darwin"; #if TARGET_OS_IPHONE |