Commit Graph

83 Commits

Author SHA1 Message Date
Leith Bade
8c5be67f14 Install jq on travis 2014-11-23 12:26:28 +11:00
Leith Bade
5b718d7fc9 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	ios/mapbox-gl-cocoa
2014-11-21 20:36:55 +11:00
John Firebaugh
545292b6f9 Fix OS X build 2014-11-20 15:55:16 -08:00
Leith Bade
bd9d7fe776 Forgot osx 2014-11-15 19:55:26 +11:00
Leith Bade
6f78ec8a70 Give Travis latest build tools 2014-11-15 19:37:41 +11:00
Leith Bade
1a7b9a1669 Make Travis load submodules in init 2014-11-15 11:38:06 +11:00
Leith Bade
25251ee634 Fix sdk path on travis 2014-11-09 09:49:04 +11:00
Leith Bade
50431652c8 More tweaks to osx android on travis 2014-11-09 09:46:29 +11:00
Leith Bade
9f74c79c7d First attempt at osx android in travis 2014-11-09 09:37:04 +11:00
Leith Bade
529af6de24 Fix travis 2014-11-08 16:53:55 +11:00
Leith Bade
7b290b09c8 Add missing platform to travis 2014-11-06 23:35:08 +11:00
Leith Bade
b1bfbbcc8f Fix aapt issue 2014-11-06 08:58:57 +11:00
Leith Bade
cbe4df9685 Find with full path 2014-11-06 08:43:17 +11:00
Leith Bade
5a97eb3888 Be more specific with find 2014-11-06 08:28:07 +11:00
Leith Bade
f353b5ba55 Add find for travis debug 2014-11-06 07:44:22 +11:00
Leith Bade
aebd3fdca5 Install android sdk 2014-11-06 01:22:40 +11:00
Leith Bade
18d5501279 Add java to build 2014-11-06 00:51:08 +11:00
Leith Bade
4dc66ad8b9 Fix typo 2014-11-05 23:18:19 +11:00
Dane Springmeyer
b5021ea5fc debug prints around failing apt-get install 2014-11-04 23:10:13 -05:00
Dane Springmeyer
278a1407a8 try without set -e and hope I'm lucky - refs #535 2014-11-04 21:42:39 -05:00
Dane Springmeyer
6eafca7874 disable more of mapbox_time 2014-11-02 21:09:44 -05:00
Dane Springmeyer
8da80c2b5e continue past failed apt-get update 2014-11-02 21:04:41 -05:00
Dane Springmeyer
7b9a096568 try unpackging to temp file 2014-11-02 20:50:59 -05:00
Dane Springmeyer
40c0959ec2 shuffle ANDROID_NDK_PATH setting (somehow it breaks apt-get update) 2014-11-02 20:06:09 -05:00
Dane Springmeyer
fa2559bb20 Add back 7z extract 2014-11-02 19:50:05 -05:00
Dane Springmeyer
bb80fe90fc travis: wtf is breaking apt-get update: try removing previous steps 2014-11-02 19:42:58 -05:00
Dane Springmeyer
80b13ff361 fix SEVEN_ZIP_PATH variable 2014-11-02 16:27:24 -05:00
Dane Springmeyer
0afa58cbde give up on mapbox-time 2014-11-02 16:11:09 -05:00
Dane Springmeyer
d5dfd6e6d5 debug failing travis script 2014-11-02 16:00:09 -05:00
Dane Springmeyer
2d809127b7 bash subshell to try to get mapbox-time working with custom commands 2014-11-02 15:43:57 -05:00
Dane Springmeyer
ec006819f9 bash variables cannot start with numeral 2014-11-02 15:25:51 -05:00
Dane Springmeyer
7a45bfa09c move NDK setup to travis_before_install.sh 2014-11-02 15:14:50 -05:00
Dane Springmeyer
c686cc4613 another try at ensuring mesa installs only for HOST arch 2014-11-02 12:00:18 -05:00
Dane Springmeyer
72f1581b77 install mesa for the HOST platform 2014-11-02 11:52:51 -05:00
Konstantin Käfer
38d17532c6 use binary mesa on travis to speed up build times 2014-10-31 12:35:36 -04:00
Dane Springmeyer
64f383e3f6 customize concurrent JOBS per compiler/platform 2014-10-30 11:37:10 -04:00
Konstantin Käfer
8f1c2b3bce remove regex/boost regex usage 2014-10-30 11:34:14 -04:00
Dane Springmeyer
acb65f8f67 travis: can travis cope with 4 mesa build jobs? 2014-10-30 00:43:08 -04:00
Dane Springmeyer
8c515b9699 travis: can travis cope with 2 mesa build jobs? 2014-10-30 00:34:13 -04:00
Dane Springmeyer
be299fba49 try mesa without concurrent jobs 2014-10-30 00:09:08 -04:00
Dane Springmeyer
543d4568d5 more build concurrency 2014-10-29 23:58:22 -04:00
Young Hahn
da47943e21 Try installing mesa from a tarball rather than git clone. 2014-10-28 14:36:32 -04:00
Mike Morris
f01d88cdba Merge branch 'headless-display' into mesa
Conflicts:
	scripts/flags.sh
2014-10-23 15:12:39 -04:00
Konstantin Käfer
3b397c56ed print core dumps on application crashes 2014-10-23 03:30:05 -07:00
Mike Morris
2c9dfa7cd5 echo CFLAGS 2014-10-22 17:37:25 -04:00
Mike Morris
0113ef8dd0 Merge branch 'headless-display' into mesa 2014-10-22 16:48:30 -04:00
Konstantin Käfer
2422e938ac fix typo 2014-10-22 15:50:54 +02:00
Konstantin Käfer
905c4294be Merge branch 'libuv-0.10-headless-display' into mason
Conflicts:
	common/http_request_baton_curl.cpp
	include/mbgl/map/map.hpp
	include/mbgl/util/uv_detail.hpp
	scripts/travis_before_install.sh
	setup-libraries.sh
	src/map/map.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/util/uv-messenger.c
2014-10-22 15:14:21 +02:00
Konstantin Käfer
326af8a332 install boost on osx 2014-10-22 11:00:34 +02:00
Konstantin Käfer
59d0be1076 use ppa for more recent boost 2014-10-21 06:57:44 -07:00