Commit Graph

5798 Commits

Author SHA1 Message Date
Dane Springmeyer
f0b8fa2839 fix 'run-linux' target - refs #534/#511 2014-11-03 09:20:13 -05:00
Dane Springmeyer
4084e41e7f cleanup after 195560090/#309/#530 2014-11-03 09:12:23 -05:00
Artem Pavlenko
403cc26801 Merge pull request #530 from mapbox/nunicode
use nunicode for language aware to_upper/to_lower string conversions
2014-11-03 12:38:06 +00:00
artemp
01f70f5db0 increase buf to hold trailing '\0' + better names 2014-11-03 12:29:18 +00:00
artemp
4a5d4ea0aa Merge branch 'master' into nunicode
Conflicts:
	configure
	styles
2014-11-03 10:43:55 +00:00
Dane Springmeyer
490a4bb17f centralize android ifdefs 2014-11-02 22:55:23 -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
86944f3b46 quote android env variables 2014-11-02 20:34:35 -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
7ea305d021 reinterpret_cast for parseCacheControl to avoid -Wformat warning on all platforms 2014-11-02 19:37:48 -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
3e38fcb7b9 test without setting up NDK 2014-11-02 14:58:11 -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
68556362b3 avoid -Wformat warning 2014-11-02 11:52:29 -05:00
Dane Springmeyer
cdcc30fa4a fix another path to mason 2014-11-01 22:57:14 -04:00
Dane Springmeyer
fbd71f6929 fix path to mason 2014-11-01 22:55:18 -04:00
Dane Springmeyer
969ef9a663 test android target on travis/linux 2014-11-01 22:52:33 -04:00
Dane Springmeyer
766343e304 update mason 2014-11-01 22:49:57 -04:00
Dane Springmeyer
d7b0a34bdd mason-based android port 2014-11-01 22:41:40 -04:00
John Firebaugh
551ff954a5 Remove unused 2014-11-01 11:53:04 -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
Dane Springmeyer
b2032103f2 linux app: fix path to styles 2014-10-31 17:14:30 -04:00
Dane Springmeyer
28bfdbb9e4 no need for touch workaround since linux app is built with make not xcode 2014-10-31 17:14:30 -04:00
Dane Springmeyer
80040304b4 only the linux app needs 'copy-styles'
- works around make xproj error (gyp generator bug?) with nested paths that leads to 'assert group_ref.__class__ == PBXGroup'
2014-10-31 17:14:30 -04:00
John Firebaugh
d675828fe1 Get mapbox-gl-styles via submodule (fixes #511) 2014-10-31 17:14:30 -04:00
Konstantin Käfer
16bd75c6cc Merge pull request #527 from mapbox/platform-image
Use platform-specific routines for decoding/encoding images
2014-10-31 17:06:32 -04:00
Konstantin Käfer
d0f71242da bump cocoa bindings 2014-10-31 16:51:36 -04:00
Dane Springmeyer
bc7effdd86 declare explicit MACOSX_DEPLOYMENT_TARGET - refs #529 2014-10-31 16:37:53 -04:00
Konstantin Käfer
a50042349c Merge branch 'master' into platform-image 2014-10-31 16:33:45 -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
artemp
318d08706f add <cstring> for std::memset 2014-10-31 15:01:50 -04:00
artemp
ea2416c7cf use nunicode for proper to_upper/to_lower string conversions 2014-10-31 14:43:46 -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
Konstantin Käfer
15cf30652c rename to .hpp to avoid compiling twice 2014-10-30 18:00:52 -04:00