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 /.gitignore | |
| 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 '.gitignore')
| -rw-r--r-- | .gitignore | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore index 68e242a31b..218297e317 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,14 @@ .DS_Store -*.xcodeproj -*.o -*.actual.png -*.diff.png *.pyc *.gcno *.gcda +*~ offline.db -/platform/android/debug -/platform/android/sdk -/platform/android/**/.classpath -/platform/android/**/.project -/platform/android/**/.settings/ +/platform/node/test/actual +/platform/node/test/diff /mason_packages -/config/*.gypi /build /lib -/ios/build -/ios/app/build -/test/build -/gyp/build -/gyp/java /test/node_modules /test/fixtures/*/*_actual.* /test/fixtures/api/1.png @@ -30,15 +18,4 @@ offline.db /test/fixtures/**/actual.png /test/fixtures/**/diff.png /test/output -/include/mbgl/shader/shaders.hpp -/src/shader/shaders_gl.cpp -/src/shader/shaders_gles2.cpp -/bin/style.bin.js /node_modules -*~ - -/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6/ -/ios/benchmark/assets/glyphs/DIN Offc Pro*/ - -/platform/node/test/actual -/platform/node/test/diff |