Commit Graph

123 Commits

Author SHA1 Message Date
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
203a42d83a patch travis_fold and travis_nanoseconds to make it possible to test travis_helper.sh off travis 2014-11-02 15:44:33 -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
Dane Springmeyer
cdcc30fa4a fix another path to mason 2014-11-01 22:57:14 -04:00
Dane Springmeyer
969ef9a663 test android target on travis/linux 2014-11-01 22:52:33 -04:00
Konstantin Käfer
ce1e151831 Merge branch 'local-mason'
Conflicts:
	.gitmodules
	styles
2014-10-31 18:03:23 -04:00
Konstantin Käfer
ec42892f5c add to $PATH instead of using aliases 2014-10-31 17:38:34 -04:00
Konstantin Käfer
03ae142d72 use a local version of mason instead of writing into ~/.mason
fixes #526
2014-10-31 17:33:10 -04:00
John Firebaugh
d675828fe1 Get mapbox-gl-styles via submodule (fixes #511) 2014-10-31 17:14:30 -04:00
Konstantin Käfer
ffc42cac02 Merge pull request #531 from mapbox/remove-node
Remove dependency on node.js
2014-10-31 16:23:43 -04:00
Konstantin Käfer
08515b41c0 call correct image compare script 2014-10-31 16:11:36 -04:00
Konstantin Käfer
080c185ea1 remove dependency on node 2014-10-31 16:02:41 -04:00
Konstantin Käfer
38d17532c6 use binary mesa on travis to speed up build times 2014-10-31 12:35:36 -04:00
Konstantin Käfer
86230821e4 use test suite as submodule instead of using npm 2014-10-31 12:02:39 -04:00
Dane Springmeyer
71a6f570a2 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into jobs 2014-10-30 12:19:30 -04:00
Konstantin Käfer
995bbda1f7 use the correct makefile names for building the project 2014-10-30 11:47: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
d89c5f0e19 Merge branch 'master' into mesa
Conflicts:
	.travis.yml
2014-10-27 12:15:45 -04:00
Konstantin Käfer
0e928b5204 make tests work 2014-10-24 17:44:51 +02: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
cd44abcc58 disable the thread sanitizer on clang/Debug for now since this prevents core dumps from being generated on segfaults 2014-10-23 07:34:01 -07:00
Konstantin Käfer
ec73c36958 fix typo 2014-10-23 06:22:08 -07:00
Konstantin Käfer
959d879f05 show more debug information 2014-10-23 06:16:13 -07:00
Konstantin Käfer
26e6ec20da show that the program crashed 2014-10-23 05:34:16 -07: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
a0d0b39960 set fPIE instead of fPIC in CXXFLAGS, add to CFLAGS as well 2014-10-22 17:14:00 -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
Dane Springmeyer
b6a42afe7e correctly set CC 2014-10-21 11:44:23 -07:00
Konstantin Käfer
59d0be1076 use ppa for more recent boost 2014-10-21 06:57:44 -07:00
Konstantin Käfer
dddd1c275c add libraries and make configure script more robust
[skip ci]
2014-10-21 15:45:41 +02:00
Konstantin Käfer
ab42c0cf93 cleanup makefile
[skip ci]
2014-10-21 12:49:19 +02:00