Commit Graph

10 Commits

Author SHA1 Message Date
Filip Szczepański
b6e5766f0d servo: Merge #6489 - Update Cargo nightly version (from FreeFull:patch-1); r=metajack
Cargo nightly 2015-06-15 has an issue where downloading from crates.io fails due to an SSL certificate error. This issue doesn't occur with 2015-06-24.

Source-Repo: https://github.com/servo/servo
Source-Revision: 27b2ab45fa6659823d5f3fa9d6e1e6129f3b5c5b
2015-06-26 19:38:29 -06:00
Jack Moffitt
a44285c32d servo: Merge #6306 - Use Cargo's target directory sharing (from metajack:shared-target-dir); r=mbrubeck
This speeds up `./mach build --dev` followed by `./mach build-cef` by
25%. When rust-lang/cargo#497 is fixed, this speedup will increase
dramatically.

Source-Repo: https://github.com/servo/servo
Source-Revision: d6263c9b6e969fde4c644034e684a39d68667ad9
2015-06-15 13:08:14 -06:00
Simon Sapin
95c8716656 servo: Merge #5935 - Upgrade Rust (from servo:rustup_2015-04-25); r=Ms2ger
r? everybody

Source-Repo: https://github.com/servo/servo
Source-Revision: 49aed6555dbc008c1a378c5cbb303f5467232b6b
2015-05-05 09:11:30 -05:00
Ms2ger
66cb126a50 servo: Merge #5256 - Upgrade rustc to d3c49d2140fc65e8bb7d7cf25bfe74dda6ce5ecf/rustc-1.0.0-de (from servo:rustup_20150311); r=jdm
...v.

Relies on:
* https://github.com/servo/rust-geom/pull/72
* https://github.com/servo/rust-glx/pull/10
* https://github.com/servo/gleam/pull/15
* https://github.com/servo/rust-mozjs/pull/137
* https://github.com/servo/rust-core-text/pull/35
* https://github.com/servo/rust-io-surface/pull/28

Source-Repo: https://github.com/servo/servo
Source-Revision: 99cf9dbfc107bacb84dfe5afa9539a0ede3beac2
2015-03-18 11:25:00 -06:00
Simon Sapin
da87abc762 servo: Merge #4893 - Upgrade to rustc ba2f13ef0 2015-02-04 (from servo:rustup_2015-01-31); r=Ms2ger,glennw
Ready for review.

Final link step on android fails, but we know how to fix it and will add it to this branch soon.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2cc08f289ab909de44fa09a07b2c43b70ce379b9

--HG--
rename : servo/ports/gonk/build.rs => servo/support/rust-task_info/build.rs
2015-02-11 17:24:45 -07:00
Josh Matthews
78741af324 servo: Merge #4719 - Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev (from servo:rustup_20150109); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3f9012864a2cd927cf17a8e11dfa6922add1b7df
2015-01-27 18:15:50 -07:00
Glenn Watson
61026a418e servo: Merge #4438 - Update cargo nightly to get android cross compile fix. Also add stub tra (from glennw:android-fix-1); r=metajack
...it method to glutin port.

Source-Repo: https://github.com/servo/servo
Source-Revision: 465b38c03f8565f3cf3d22e3b7f98f51b116e2e4
2014-12-18 17:01:10 -07:00
Manish Goregaokar
3984c9b43a servo: Merge #4198 - Hyper+OpenSSL on Android (from Manishearth:hyper-droid); r=Manishearth
This is the Hyper pull request, plus the set up for OpenSSL on Android to make it merge.

Sean's commits have been reviewed in #4065 (My Android changes were reviewed by Glenn)

Source-Repo: https://github.com/servo/servo
Source-Revision: 6bd9bf979bcfa96ea14e666b59eab01a6d6c373e
2014-12-05 04:16:11 -07:00
Glenn Watson
baab1dcc7f servo: Merge #3922 - Update cargo to get fix for pinned dependencies of features (from glennw:update-cargo); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: fa7596015addedc4db50ce735100d7560482011d
2014-11-06 15:36:29 -07:00
Matt Brubeck
d507294551 servo: Merge #3902 - Download Rust and Cargo to shared directory (from mbrubeck:share_directory); r=jdm
This is @acmiyaguchi's already-reviewed patch from #3388, rebased and squashed onto servo master. Fixes #3353.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5dae1de2f5226527862a39608f0d7ad217c33b31
2014-11-05 18:51:36 -07:00