diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-06-19 08:48:19 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-08-07 12:10:28 +0200 |
commit | 0cf8e604de137d698e266d73dba6a2570d2bd460 (patch) | |
tree | 7ef55bb1fd117cdacb8c1d384e61ef82254d3f70 | |
parent | 85768e302bd97ff98531768632b1672090fac836 (diff) | |
download | qtlocation-mapboxgl-upstream/modules.tar.gz |
[build] add submoduleupstream/modules
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | appveyor.yml | 3 | ||||
-rw-r--r-- | circle.yml | 7 | ||||
m--------- | modules/metal | 0 | ||||
-rwxr-xr-x | scripts/nitpick/generated-code.js | 4 |
5 files changed, 13 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index fd2e80d4bb..f76f251c28 100644 --- a/.gitmodules +++ b/.gitmodules @@ -100,3 +100,6 @@ [submodule "vendor/googletest"] path = vendor/googletest url = https://github.com/google/googletest.git +[submodule "modules/metal"] + path = modules/metal + url = git@github.com:mapbox/mapbox-maps-metal.git diff --git a/appveyor.yml b/appveyor.yml index 0e1bd01124..e89003a02c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -61,8 +61,7 @@ cache: install: - git config --system core.longpaths true - git submodule sync - - git submodule update --init - - git submodule foreach git submodule update --init + - git submodule update --init -- vendor - ps: | if (!(Test-Path cmake-3.10.1-win64-x64.zip)) { appveyor DownloadFile https://cmake.org/files/v3.10/cmake-3.10.1-win64-x64.zip diff --git a/circle.yml b/circle.yml index 4378548615..0a64206265 100644 --- a/circle.yml +++ b/circle.yml @@ -973,6 +973,7 @@ jobs: steps: - install-macos-dependencies - install-dependencies + - install-module: { module: metal } - build-ios-test - check-public-symbols - run: @@ -1015,6 +1016,7 @@ jobs: steps: - install-macos-dependencies - install-dependencies + - install-module: { module: metal } - run: name: Build and run SDK unit tests with thread and undefined behavior sanitizers command: make ios-sanitize @@ -1039,6 +1041,7 @@ jobs: steps: - install-macos-dependencies - install-dependencies + - install-module: { module: metal } - run: name: Build and run SDK unit tests with address sanitizer command: make ios-sanitize-address @@ -1059,6 +1062,7 @@ jobs: steps: - install-macos-dependencies - install-dependencies + - install-module: { module: metal } - run: name: Build and run SDK unit tests with the static analyzer command: make ios-static-analyzer @@ -1079,6 +1083,7 @@ jobs: steps: - install-macos-dependencies - install-dependencies + - install-module: { module: metal } - install-ios-packaging-dependencies - run: name: Build dynamic framework for device and simulator @@ -1174,9 +1179,11 @@ jobs: BUILDTYPE: Debug HOMEBREW_NO_AUTO_UPDATE: 1 HOMEBREW_NO_INSTALL_CLEANUP: 1 + MAPBOX_RENDER_BACKEND: opengl steps: - install-macos-dependencies - install-dependencies + - install-module: { module: metal } - build-macos-test - check-public-symbols - run: diff --git a/modules/metal b/modules/metal new file mode 160000 +Subproject ee8b8638e220a2ed1e12323958f52732f483a41 diff --git a/scripts/nitpick/generated-code.js b/scripts/nitpick/generated-code.js index 1638b6a186..0270c5ba54 100755 --- a/scripts/nitpick/generated-code.js +++ b/scripts/nitpick/generated-code.js @@ -8,7 +8,7 @@ const os = require('os'); function checkGeneratedFiles(name, scripts) { var files = []; - scripts.forEach(function(script) { + scripts.filter(fs.existsSync).forEach(function(script) { child_process.execSync(script); const list = path.join(path.dirname(script), path.basename(script, path.extname(script)) + '.list'); files.push(list); @@ -46,5 +46,5 @@ if (!mode || mode == 'android') { checkGeneratedFiles('Android', ['platform/android/scripts/generate-style-code.js']); } if ((!mode || mode == 'darwin') && os.platform() == 'darwin') { - checkGeneratedFiles('Darwin', ['platform/darwin/scripts/generate-style-code.js', 'platform/darwin/scripts/update-examples.js']); + checkGeneratedFiles('Darwin', ['platform/darwin/scripts/generate-style-code.js', 'platform/darwin/scripts/update-examples.js', 'modules/metal/scripts/generate-metal-shaders.js']); } |