summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-11-07 18:31:40 +0200
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-11-08 11:27:30 +0200
commit55e18a6f81f3b8ee61c3eb70b0d1cbe9a861e44f (patch)
treeb3dc2862462189e266ddedbb01c2ad8101b07fa9 /scripts
parent2e8a350d68be75d9505fab9dc897c4abbcae05aa (diff)
downloadqtlocation-mapboxgl-55e18a6f81f3b8ee61c3eb70b0d1cbe9a861e44f.tar.gz
[core] Use expected.hpp from mapbox-base
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/generate-file-lists.js2
-rwxr-xr-xscripts/standalone.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js
index 546ce38235..e525513653 100755
--- a/scripts/generate-file-lists.js
+++ b/scripts/generate-file-lists.js
@@ -130,12 +130,12 @@ generateFileList('vendor/boost-files.json', [ 'vendor/boost' ], vendorRegex, [ "
generateFileList('vendor/cheap-ruler-cpp-files.json', [ 'vendor/cheap-ruler-cpp' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/earcut.hpp-files.json', [ 'vendor/earcut.hpp' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/eternal-files.json', [ 'vendor/eternal' ], vendorRegex, [ "include/**/*.hpp" ]);
-generateFileList('vendor/expected-files.json', [ 'vendor/expected' ], vendorRegex, [ "include/expected.hpp" ]);
generateFileList('vendor/geojson-vt-cpp-files.json', [ 'vendor/geojson-vt-cpp' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/icu-files.json', [ 'vendor/icu' ], vendorRegex, [ "include/**/*.h", "src/*.h", "src/*.cpp" ]);
generateFileList('vendor/mapbox-base-files.json',
[ 'vendor/mapbox-base/extras/kdbush.hpp',
'vendor/mapbox-base/extras/filesystem',
+ 'vendor/mapbox-base/extras/expected-lite',
'vendor/mapbox-base/extras/rapidjson',
'vendor/mapbox-base/mapbox/pixelmatch-cpp',
'vendor/mapbox-base/mapbox/geometry.hpp',
diff --git a/scripts/standalone.sh b/scripts/standalone.sh
index 80b9ac6931..aa609197c7 100755
--- a/scripts/standalone.sh
+++ b/scripts/standalone.sh
@@ -53,7 +53,6 @@ rsync -rR $(git ls-files \
echo ">> Copying vendored files..."
rsync -rR $(git ls-files \
- "vendor/expected" \
"vendor/icu" \
"vendor/nunicode" \
"vendor/sqlite" \