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
|
25483001e5
|
android: for now just build mbgl-core
|
2014-11-04 23:37:30 -05: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
|
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 |
|