Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into libuv-0.10-headless-display | Mike Morris | 2014-10-10 | 1 | -4/+4 |
|\ | | | | | | | | | Conflicts: setup-libraries.sh | ||||
| * | Merge pull request #486 from mapbox/mphash-libuv-pkgconfig | Mike Morris | 2014-10-10 | 1 | -1/+1 |
| |\ | | | | | | | bump mapnik-packaging | ||||
| * | | Protect all possibly-unset env vars | John Firebaugh | 2014-10-10 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'mphash-libuv-pkgconfig' into libuv-0.10-headless-display | Mike Morris | 2014-10-10 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: setup-libraries.sh | ||||
| * | | bump mapnik-packaging | Mike Morris | 2014-10-10 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'master' into libuv-0.10-headless-display | Mike Morris | 2014-10-10 | 1 | -4/+4 |
|\ \ | |/ | | | | | | | Conflicts: setup-libraries.sh | ||||
| * | fix TRAVIS unbound var error | Mike Morris | 2014-10-10 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into libuv-0.10-headless-display | Mike Morris | 2014-10-10 | 1 | -4/+19 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Upload library tarball only on travis (fixes #485) | John Firebaugh | 2014-10-09 | 1 | -4/+4 |
| | | |||||
| * | fix build issues | Konstantin Käfer | 2014-09-24 | 1 | -2/+5 |
| | | |||||
| * | add libcurl build | Konstantin Käfer | 2014-09-24 | 1 | -0/+5 |
| | | |||||
| * | add basic request caching with sqlite | Konstantin Käfer | 2014-09-24 | 1 | -0/+7 |
| | | |||||
* | | only upload binaries on travis | Mike Morris | 2014-10-10 | 1 | -2/+2 |
| | | |||||
* | | remove travis conditional in darwin_configure.sh | Mike Morris | 2014-09-24 | 1 | -1/+1 |
| | | |||||
* | | build iPhoneSimulator64 against libuv 0.10.28 | Mike Morris | 2014-09-24 | 1 | -0/+1 |
| | | |||||
* | | fix ios builds? | Mike Morris | 2014-09-24 | 1 | -1/+1 |
| | | |||||
* | | update MP_HASH | Mike Morris | 2014-09-24 | 1 | -1/+1 |
| | | |||||
* | | bump mapnik-packaging | Mike Morris | 2014-09-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into libuv010 | Mike Morris | 2014-09-22 | 1 | -16/+19 |
|\ \ | |/ | | | | | | | Conflicts: setup-libraries.sh | ||||
| * | fix 64-bit iOS builds | Justin R. Miller | 2014-09-17 | 1 | -17/+20 |
| | | |||||
* | | bump MP_HASH | Mike Morris | 2014-09-09 | 1 | -1/+1 |
| | | |||||
* | | fix ios builds? | Mike Morris | 2014-09-03 | 1 | -1/+1 |
| | | |||||
* | | cache linux deps builds on MP_HASH, DIR_HASH | Mike Morris | 2014-09-03 | 1 | -4/+4 |
| | | |||||
* | | pull in cleaned up mapnik-packaging with libuv v0.10 fixes | Mike Morris | 2014-08-28 | 1 | -1/+1 |
| | | |||||
* | | copy libuv.a to build directory | Mike Morris | 2014-08-27 | 1 | -1/+1 |
| | | |||||
* | | roll back to boost 1.55 | Mike Morris | 2014-08-27 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into libuv010 | Mike Morris | 2014-08-27 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | deploy dependency builds only with aws keys | Konstantin Käfer | 2014-08-27 | 1 | -2/+2 |
| | | |||||
* | | switch mapnik-packaging back to libuv-pkgconfig branch | Mike Morris | 2014-08-27 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into libuv010 | Mike Morris | 2014-08-26 | 1 | -12/+13 |
|\ \ | |/ | | | | | | | Conflicts: setup-libraries.sh | ||||
| * | mapnik-packaging's output directories changed | Konstantin Käfer | 2014-08-26 | 1 | -4/+4 |
| | | |||||
| * | add hash of current directory since dependency builds are working dir-specific | Konstantin Käfer | 2014-08-26 | 1 | -5/+6 |
| | | |||||
| * | Set public-read ACL | John Firebaugh | 2014-08-25 | 1 | -2/+2 |
| | | |||||
| * | Don't try to upload build artifacts for PRs | John Firebaugh | 2014-08-25 | 1 | -2/+2 |
| | | |||||
* | | bump mapnik-packaging, conform to libuv 0.10 api | Mike Morris | 2014-08-20 | 1 | -1/+1 |
| | | |||||
* | | update mapnik-packaging | Mike Morris | 2014-08-20 | 1 | -1/+1 |
| | | |||||
* | | pin mapnik-packaging to new hash to generate pkg-config .pc file for libuv | Mike Morris | 2014-08-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'aws-s3-bucket' into libuv010 | Mike Morris | 2014-08-20 | 1 | -4/+4 |
|\ \ | |||||
| * | | add AWS_S3_BUCKET env var to .travis.yml | Mike Morris | 2014-08-20 | 1 | -4/+4 |
| |/ | |||||
* | | Merge branch 'master' into libuv010 | Mike Morris | 2014-08-19 | 1 | -9/+37 |
|\ \ | |/ | |||||
| * | add missing git fetch for mapnik-packaging | Leo Lou | 2014-08-19 | 1 | -0/+1 |
| | | | | | | | | | | When there is a local mapnik-packaging repo, git checkout a future commit requires a git fetch | ||||
| * | fix downloading | Konstantin Käfer | 2014-08-18 | 1 | -1/+1 |
| | | |||||
| * | use cached dependencies for os x build | Konstantin Käfer | 2014-08-18 | 1 | -0/+17 |
| | | |||||
| * | update mapnik-packaging to work around openssl problem | Dane Springmeyer | 2014-08-15 | 1 | -1/+1 |
| | | | | | | | | - refs https://github.com/mapnik/mapnik-packaging/commit/6d7e83e8042a306d847a1e0b82b9bbe8eb76ccdd | ||||
| * | install node in cross-platform way + fix mapnik-packaging checkout | Dane Springmeyer | 2014-08-15 | 1 | -8/+18 |
| | | |||||
| * | pin to mapnik-packaging@848c6e8d6692a9 for now to protect against upstream ↵ | Dane Springmeyer | 2014-08-15 | 1 | -2/+2 |
| | | | | | | | | refactoring | ||||
* | | override LIBUV_VERSION | Mike Morris | 2014-08-14 | 1 | -1/+7 |
| | | |||||
* | | clone libuv010 branch of mapnik-packaging | Mike Morris | 2014-08-12 | 1 | -1/+1 |
|/ | |||||
* | pass absolute path to npm executable | Konstantin Käfer | 2014-08-12 | 1 | -2/+7 |
| | |||||
* | fix automated headless testing on travis | Konstantin Käfer | 2014-07-09 | 1 | -0/+14 |
| |