diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-03 15:16:49 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-07 18:01:02 -0700 |
| commit | f964e40e7e9220d08751d8607af61ac5a7c0794c (patch) | |
| tree | d34ca5407188fe3d71396faa8a8acceb52d9bd4b /docker | |
| parent | f5d66f362272db034a311d2077dbdb2937c9bbdf (diff) | |
| download | qtlocation-mapboxgl-f964e40e7e9220d08751d8607af61ac5a7c0794c.tar.gz | |
[build] Refactor and simplify build system
* Main gyp files are now standardized as platform/<platform>/platform.gyp.
* Each platform gyp file defines appropriate loop_lib and headless_lib variables.
* Each platform gyp file includes mbgl.gypi, which defines base targets which may be useful to all platforms.
* CI targets are consistent across platforms: `make $(PLATFORM) && make test-$(PLATFORM)`.
* Renamed the "linux" test app to "glfw". It's now built in OS X CI.
* Android build flakiness is fixed.
* iOS CI builds the bench and iosapp targets.
* Mesa version is now in one place.
* CI scripts use bash "strict mode" and correct error handling.
* All build output goes to the build directory.
* Removed vestigial iOS/OS X/Android Travis scripts.
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/clang-tidy/tidy.sh | 3 | ||||
| -rwxr-xr-x | docker/linux/test.sh | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/docker/clang-tidy/tidy.sh b/docker/clang-tidy/tidy.sh index 222bd263f8..4c1b74595a 100755 --- a/docker/clang-tidy/tidy.sh +++ b/docker/clang-tidy/tidy.sh @@ -3,7 +3,6 @@ # set -e # set -o pipefail -export FLAVOR=linux export CXX=clang++-3.8 export BUILDTYPE=Release @@ -13,7 +12,7 @@ cd build source ./scripts/travis_helper.sh # install -./platform/${FLAVOR}/scripts/install.sh +./platform/linux/scripts/install.sh export CLANG_TIDY=clang-tidy-3.8 make tidy diff --git a/docker/linux/test.sh b/docker/linux/test.sh index f9d0b5daec..3afb73366c 100755 --- a/docker/linux/test.sh +++ b/docker/linux/test.sh @@ -3,7 +3,6 @@ # set -e # set -o pipefail -export FLAVOR=linux export CXX=g++-4.9 export BUILDTYPE=Release @@ -20,7 +19,7 @@ cd build source ./scripts/travis_helper.sh # install -./platform/${FLAVOR}/scripts/install.sh +./platform/linux/scripts/install.sh # script -./platform/${FLAVOR}/scripts/run.sh +./platform/linux/scripts/run.sh |