Commit Graph

76 Commits

Author SHA1 Message Date
Mike Morris
e76d3e4a81 Merge branch 'master' into libuv-0.10-headless-display
Conflicts:
	setup-libraries.sh
2014-10-10 18:36:28 -04:00
Mike Morris
6bd63c565e Merge pull request #486 from mapbox/mphash-libuv-pkgconfig
bump mapnik-packaging
2014-10-10 18:25:39 -04:00
Mike Morris
f3356982b0 Merge branch 'mphash-libuv-pkgconfig' into libuv-0.10-headless-display
Conflicts:
	setup-libraries.sh
2014-10-10 18:09:20 -04:00
Mike Morris
8a97cf42a9 bump mapnik-packaging 2014-10-10 17:07:57 -04:00
John Firebaugh
62927bd762 Protect all possibly-unset env vars 2014-10-10 10:16:23 -07:00
Mike Morris
1501886524 Merge branch 'master' into libuv-0.10-headless-display
Conflicts:
	setup-libraries.sh
2014-10-10 12:50:34 -04:00
Mike Morris
8db6325b8a fix TRAVIS unbound var error 2014-10-10 12:49:27 -04:00
Mike Morris
2d1219fa51 Merge branch 'master' into libuv-0.10-headless-display
Conflicts:
	common/curl_request.cpp
	common/glfw_view.cpp
	common/glfw_view.hpp
	include/mbgl/platform/request.hpp
	ios/mapbox-gl-cocoa
	setup-libraries.sh
	src/map/map.cpp
	src/platform/request.cpp
	test/fixtures/fixture_request.cpp
2014-10-10 12:24:45 -04:00
Mike Morris
8f6e8eead1 only upload binaries on travis 2014-10-10 11:40:03 -04:00
John Firebaugh
f390dab0ea Upload library tarball only on travis (fixes #485) 2014-10-09 10:58:55 -07:00
Mike Morris
92d00347a8 remove travis conditional in darwin_configure.sh 2014-09-24 18:51:52 -04:00
Mike Morris
768e23069c build iPhoneSimulator64 against libuv 0.10.28 2014-09-24 17:11:18 -04:00
Mike Morris
735d245697 fix ios builds? 2014-09-24 16:40:10 -04:00
Mike Morris
47c6bb5bd4 update MP_HASH 2014-09-24 16:10:36 -04:00
Konstantin Käfer
91f8318981 fix build issues 2014-09-24 16:14:09 +02:00
Konstantin Käfer
2f088b5938 add libcurl build 2014-09-24 16:12:54 +02:00
Konstantin Käfer
34fe7dc627 add basic request caching with sqlite 2014-09-24 16:12:02 +02:00
Mike Morris
8e1bbae81f bump mapnik-packaging 2014-09-22 18:06:24 -04:00
Mike Morris
96736d83df Merge branch 'master' into libuv010
Conflicts:
	setup-libraries.sh
2014-09-22 17:26:14 -04:00
Justin R. Miller
5788714e3b fix 64-bit iOS builds 2014-09-17 18:26:33 -07:00
Mike Morris
2e2c7befac bump MP_HASH 2014-09-09 17:09:03 -04:00
Mike Morris
74c4f976d1 fix ios builds? 2014-09-03 19:05:07 -04:00
Mike Morris
88ef2f23e5 cache linux deps builds on MP_HASH, DIR_HASH 2014-09-03 17:20:48 -04:00
Mike Morris
cffd68f9ca pull in cleaned up mapnik-packaging with libuv v0.10 fixes 2014-08-28 12:32:57 -04:00
Mike Morris
0c803a78fa copy libuv.a to build directory 2014-08-27 19:34:37 -04:00
Mike Morris
0c5ba67ac6 roll back to boost 1.55 2014-08-27 15:57:28 -04:00
Mike Morris
f05610b9ab Merge branch 'master' into libuv010 2014-08-27 14:41:30 -04:00
Mike Morris
d85f03e110 switch mapnik-packaging back to libuv-pkgconfig branch 2014-08-27 11:57:52 -04:00
Konstantin Käfer
2d61722178 deploy dependency builds only with aws keys 2014-08-27 14:37:30 +02:00
Mike Morris
050b00cb58 Merge branch 'master' into libuv010
Conflicts:
	setup-libraries.sh
2014-08-26 16:55:08 -04:00
Konstantin Käfer
60f7813544 mapnik-packaging's output directories changed 2014-08-26 18:31:40 +02:00
Konstantin Käfer
d531e3546b add hash of current directory since dependency builds are working dir-specific 2014-08-26 18:31:17 +02:00
John Firebaugh
fe5f121bc4 Set public-read ACL 2014-08-25 15:46:54 -07:00
John Firebaugh
8f6a480344 Don't try to upload build artifacts for PRs 2014-08-25 15:43:54 -07:00
Mike Morris
3466f36412 bump mapnik-packaging, conform to libuv 0.10 api 2014-08-20 19:43:29 -04:00
Mike Morris
1ff71a78e0 update mapnik-packaging 2014-08-20 19:10:36 -04:00
Mike Morris
33562623c8 pin mapnik-packaging to new hash to generate pkg-config .pc file for libuv 2014-08-20 18:53:56 -04:00
Mike Morris
fcf355f42d Merge branch 'aws-s3-bucket' into libuv010 2014-08-20 17:06:16 -04:00
Mike Morris
40ee0dfb5f add AWS_S3_BUCKET env var to .travis.yml 2014-08-20 16:54:43 -04:00
Mike Morris
af35a6cdfa Merge branch 'master' into libuv010 2014-08-19 14:16:01 -04:00
Leo Lou
ada88f59e9 add missing git fetch for mapnik-packaging
When there is a local mapnik-packaging repo, 
git checkout a future commit requires a git fetch
2014-08-19 12:26:46 +02:00
Konstantin Käfer
46fc26837d fix downloading 2014-08-18 11:46:51 +02:00
Konstantin Käfer
599ed18d58 use cached dependencies for os x build 2014-08-18 11:40:17 +02:00
Dane Springmeyer
714545f3c3 update mapnik-packaging to work around openssl problem
- refs 6d7e83e804
2014-08-15 15:00:16 -07:00
Dane Springmeyer
1dbe8ae708 install node in cross-platform way + fix mapnik-packaging checkout 2014-08-15 13:51:53 -07:00
Dane Springmeyer
e5399eb8ed pin to mapnik-packaging@848c6e8d6692a9 for now to protect against upstream refactoring 2014-08-15 13:23:59 -07:00
Mike Morris
a57aefbd5d override LIBUV_VERSION 2014-08-14 17:19:40 -04:00
Mike Morris
a902391491 clone libuv010 branch of mapnik-packaging 2014-08-12 18:53:32 -04:00
Konstantin Käfer
52939ce2fa pass absolute path to npm executable 2014-08-12 13:29:26 +02:00
Konstantin Käfer
d0d68d08f4 fix automated headless testing on travis 2014-07-09 12:37:59 -07:00