Commit Graph

53 Commits

Author SHA1 Message Date
Glenn Watson
75fc135fe4 servo: Merge #4322 - Update ./mach update-cargo to include gonk Cargo.lock (from glennw:gonk-update-cargo); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: 80756a11d2fc9dbc67eda580e7ed9c22b354647e
2014-12-10 18:21:54 -07:00
Patrick Walton
755e7a69c3 servo: Merge #4193 - ports/cef: Implement accelerated compositing for the CEF port (from pcwalton:cef-redux); r=pcwalton,metajack
@glennw, is it possible to rebase your stuff on top of this? Sorry for the mess.

r? @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: ba06d50e3a611d1c27c6c9aa0b21441282911c3f
2014-12-10 09:40:03 -07:00
Simon Sapin
7b2a0d58bd servo: Merge #4302 - Add a ./mach clean-snapshots command to remove old Cargo and Rust (from SimonSapin:clean-snapshots); r=Manishearth
Bootstrapping automatically downloads new Rust and Cargo snapshots as needed into versioned directories, but do not remove now-unused versions. This is the desired behavior for `git bisect` to be usable.

However, this means that old version keep accumulating, taking up disk space. This adds a mach command to remove snapshots other than the ones currently being used. It is never run automatically.

To be safe, the command defaults to only printing what would be removed, and only removes stuff when run with a `-f` argument.

r? @mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: 00298221a6238c4fe4909f68a6616a718908ccf5
2014-12-09 04:01:19 -07:00
Glenn Watson
4e87a2eaa4 servo: Merge #4292 - Use mach to build openssl on android instead of glut makefile (from glennw:android-ssl); r=mbrubeck
The glut makefile will be removed shortly after glutin lands
for android, so we need to build openssl for android elsewhere
in the build process.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2741fd2e139b9cb8e9f14857877f567ecae3bced
2014-12-08 17:54:57 -07:00
Matthew Rasmus
14c74f408d servo: Merge #4288 - Updates ./mach update-cargo for new path changes (from mttr:mach_update_cargo_fix); r=jdm
Also fixed a bug if run with no arguments.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1458bb439701274527308a29f2e5e65c3306f78a
2014-12-08 17:03:59 -07:00
Andreas Tolfsen
a00405b7d1 servo: Merge #4286 - Fix concatentation error on no args to ./mach rustc (from andreastt:ato/concat_error_on_system_rust); r=metajack
Since default argument to params is None, concatenating it with a
list will raise an error.  This behaviour prevents `./mach rustc`
to be called when system-rust is defined in .servobuild.

Currently it will only work when followed by an argument, i.e.
`./mach rustc -arg`.

Testing this patch: `./mach rustc` should not raise an error.

Source-Repo: https://github.com/servo/servo
Source-Revision: 35c13f07bfd6a8973399e75404fa61a6d9aeda00
2014-12-08 15:28:03 -07:00
Glenn Watson
1771b43728 servo: Merge #4207 - Fix path for CEF build (from glennw:fix-cef); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: ccef72385131f923edd63ffc586165aae786adf2
2014-12-07 15:25:07 -07:00
Matthew Rasmus
238e2c56d0 servo: Merge #4269 - Fix breakage of ./mach test (from mttr:mach_test_fix); r=mbrubeck
When running commands through Registrar.dispatch, mach does not behave
in the same way it would as if it were running through the command line.
Defaults normally provided through a combination of @CommandArgument and
argparse magic are ignored.

I have some ideas as to how to fix this, but until then, this will allow
`./mach test` to run through test-unit properly.

Source-Repo: https://github.com/servo/servo
Source-Revision: a6768b62446d599b23906eae08845dcb8bbe8853
2014-12-06 13:49:03 -07:00
Matthew Rasmus
8c45e48f2c servo: Merge #4229 - Adds a --component argument to test-unit (from mttr:mach_unit_test_select_component); r=Manishearth
Example usage:

`./mach test-unit -c style`

Source-Repo: https://github.com/servo/servo
Source-Revision: 2d0e96e1331668fea7313efd688fe7dba6d7ebed
2014-12-06 04:49:00 -07:00
Matthew Rasmus
37074dccaf servo: Merge #4231 - Mach test inference fix (from mttr:mach_test_fix); r=jdm
Somehow didn't catch this when renaming a variable.

Source-Repo: https://github.com/servo/servo
Source-Revision: 1046839e8cbf049f13d465cf7137e501a83119b9
2014-12-05 03:13:09 -07:00
Manish Goregaokar
b0d21c9484 servo: Merge #4240 - Make tidy ingore new target dir (from Manishearth:tidy); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: a451a3bdb5bd37dc671dcb24b80f869ad6a82010
2014-12-05 00:49:10 -07:00
Simon Sapin
d6c18025eb servo: Merge #4203 - Make 'mach doc' not fail when components/servo/target doesn’t exist (from SimonSapin:refactor-doc); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: ad9aedac77d094b8524b6170b857499bdc9cd762
2014-12-03 19:09:58 -07:00
Simon Sapin
e8882a75b7 servo: Merge #4142 - Have mach doc copy Rust docs, add mach browse-doc (from SimonSapin:refactor-doc); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 6d1193547b3d6cb1f36edcd61ff0a2572a817bf8
2014-12-03 16:27:56 -07:00
Simon Sapin
d266298e25 servo: Merge #4140 - Move the root Cargo.toml to components/servo, and warn when Cargo is run directly (from SimonSapin:no-root-cargo-toml); r=SimonSapin
This fixes #3957, and allow #4115 not to regress #4099.

Source-Repo: https://github.com/servo/servo
Source-Revision: 873ca6cadddc1a40bead1f5dd0128bb16cfaa11b
2014-12-02 19:27:51 -07:00
Nathan Climer
3779001fc0 servo: Merge #4169 - Fixed test filter (from IdeaHat:fix-mach-unit-test-filter); r=jdm
Minor change, added unit test filter to components so that ./mach test-unit [test-filter] works in line with documentation.

I'd personally like to also make filters on the components as well as the tests. This would change the interface (probably to ./mach test-unit [component-filter] [test-filter]), but change is NOT in this pull request.

Source-Repo: https://github.com/servo/servo
Source-Revision: c91e949ed02dc299900ed2c50812d733e6740afb
2014-12-02 18:15:51 -07:00
Matthew Rasmus
b3a0be8a7b servo: Merge #4168 - infer_test_by_dir cleanup (from mttr:mach_inferred_test_cleanup); r=Manishearth
No actual change in functionality here. I was just unhappy with the way test-ref was singled out before, and realized an obvious fix.

Source-Repo: https://github.com/servo/servo
Source-Revision: 600da2af7e6c886f46d013008d2f933b99a2b92f
2014-12-02 15:42:53 -07:00
Matthew Rasmus
b8bfbb73bc servo: Merge #4093 - Adds explicit --name argument to test-ref (from mttr:mach_reftest_by_file); r=jdm
`./mach test-ref` no longer eats the first "-" prefixed argument for test name filtering, instead using an explicit "--name" argument. This should avoid any potential confusion when passing down arguments to servo.

Also allows for ./tests/ref to be included (and trimmed away) for tab completion convenience (`./mach test` has also been updated to take advantage of this when inferring tests from file paths).

(fixes #4091)

Source-Repo: https://github.com/servo/servo
Source-Revision: b87d98e468d6c405dd02625e3e223e2412db8610
2014-11-29 01:12:42 -07:00
Matt Murphy
e59d362cc8 servo: Merge #4135 - Fix error when executing "mach doc" (from murphm8:mach_doc); r=SimonSapin
This should fix  #4134

Source-Repo: https://github.com/servo/servo
Source-Revision: fafd3fd8ba6d2e43ad8cc34ac0f4cc9e835e6867
2014-11-28 08:54:45 -07:00
Matthew Rasmus
bcd520c3cb servo: Merge #4090 - Lets ./mach test infer testsuite from file/directory path (from mttr:mach_infer_test); r=jdm
Fixes #4086

Lets `./mach test` take a file or directory as an argument, and infers `test-content`, `test-wpt`, or `test-ref` from the file's path.

Usage Example:
```
$ ./mach test tests/wpt/web-platform-tests/dom/interfaces.html
 0:00.27 LOG: MainThread INFO Using 1 client processes
 ...
```
Note that while there is no functionality for `test-ref` to accept individual files, `./mach test tests/ref` will still trigger `test-ref`.

Passing arguments properly through python would have been ugly (though maybe there are some mach internals I could have taken advantage of), so this instead runs a new mach process and lets the individual test suites manage their arguments like normal.

Source-Repo: https://github.com/servo/servo
Source-Revision: 10f8fe00677c756bd69adcf90b96a7e36bae8f56
2014-11-24 13:42:39 -07:00
Matthew Rasmus
9308fac0de servo: Merge #4083 - Mach debugger flag (from mttr:mach_debugger_flag); r=mbrubeck
Borrows two python modules from mozilla-central to give mach the ability to detect and pass arguments to a system's preferred debugger, and adds `--debug` and `--debugger` flags to `./mach run`. This works almost like the functionality described [here](https://developer.mozilla.org/en-US/docs/Debugging_Mozilla_with_gdb), but at the moment it lacks a `--debugparams`  argument.

Links to borrowed files:
http://hg.mozilla.org/mozilla-central/file/c9cfa9b91dea/testing/mozbase/mozinfo/mozinfo/mozinfo.py
http://hg.mozilla.org/mozilla-central/file/c9cfa9b91dea/testing/mozbase/mozdebug/mozdebug/mozdebug.py

Source-Repo: https://github.com/servo/servo
Source-Revision: 989efd5a2820a152c5d5a2d42c9be3c30d79f469
2014-11-24 10:15:46 -07:00
Matthew Rasmus
d023dbc6df servo: Merge #4080 - Update mach to latest changes from mozilla-central (from mttr:mach_update); r=jdm
Updates the way mach mixes unrecognized arguments and predefined arguments (see [mozilla bug 1076649](https://bugzilla.mozilla.org/show_bug.cgi?id=1076649) for details on this change), and also adds support for argument groupings (see [1077272](https://bugzilla.mozilla.org/show_bug.cgi?id=1077272)).

I was running into some annoyances when trying to implement a change that would allow a `--debug` flag to be used in `./mach run` for running Servo through a debugger (basically, the same behavior described under "How do I run Mozilla under gdb?" [here](https://developer.mozilla.org/en-US/docs/Debugging_Mozilla_with_gdb)). This change should make those annoyances go away, and as far as I can tell, it doesn't have an impact on the way any of the existing commands are used.

Source-Repo: https://github.com/servo/servo
Source-Revision: 4a257bc27152bef98068cfdc1433549aab05c5de
2014-11-23 22:48:32 -07:00
Matthew Rasmus
f65d1a40fa servo: Merge #4077 - Adds --release flag to ./mach build-cef (from mttr:mach_build_cef_release); r=kmcallister
Requested by kmc in IRC.

```
11:36 < kmc> while you're mach-ing about, can you modify build-cef to
accept --release like build does?
```

Source-Repo: https://github.com/servo/servo
Source-Revision: a1a268ce1d00c865f14ae76c1d767f905cfc3a92
2014-11-23 12:57:36 -07:00
Corey Farwell
07cf9fed05 servo: Merge #4072 - Make sure directories aren't getting tested (from frewsxcv:test-files); r=jdm
Fixes #3910

Source-Repo: https://github.com/servo/servo
Source-Revision: af42f1afc1dd2bcad50690c694c52b6b4f2d121a
2014-11-23 11:57:36 -07:00
nwin
824de84a6a servo: Merge #4075 - Fixes 4037. Enable backtrace on run cmd (from nwin:fix-4037); r=Ms2ger
Fixes #4037

Source-Repo: https://github.com/servo/servo
Source-Revision: 593e3bc40c8c135f4fa1f0c6e59c6159edd76d74
2014-11-23 09:33:36 -07:00
Matthew Rasmus
cd45e5cabf servo: Merge #4063 - Run a single WPT test from a relative path (from mttr:test_wpt_from_relpath); r=mbrubeck
Fixes #4055

This PR allows `./mach test-wpt` to be run  (from /path/to/servo) with a single relative path to some wpt test.

For example:
```
./mach test-wpt tests/wpt/web-platform-tests/dom/sometest.html
```
The argument `tests/wpt/web-platform-tests/dom/sometest.html` is passed on as `--include dom/sometest.html`.

Source-Repo: https://github.com/servo/servo
Source-Revision: e6e73b8da70a6acaeabc1abf13071d044996f103
2014-11-21 20:24:30 -07:00
Matthew Rasmus
54f678e9fa servo: Merge #4045 - Add a mach update command that invokes cargo update for all ports (fixes #3736) (from mttr:mach_update); r=jdm
Example usage:

``` sh
$ ./mach update-cargo -p rust-xml
.
    Updating git repository `https://github.com/netvl/rust-xml`
ports/cef
    Updating git repository `https://github.com/netvl/rust-xml`
ports/android/glut_app
    Updating git repository `https://github.com/netvl/rust-xml`
```

Source-Repo: https://github.com/servo/servo
Source-Revision: 9a139dac342dc72ec853749ce263c4c69a8a2b5f
2014-11-20 10:45:31 -07:00
Matt Brubeck
b4ac373f92 servo: Merge #3987 - Use the correct Rust path in Android packaging (from mbrubeck:rust-root); r=larsbergstrom
r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 2bda68f03862ae9b58673d7685ec80e61d5ba65e
2014-11-17 09:21:28 -07:00
Simon Sapin
c5ccdcb9ad servo: Merge #3971 - Download Cargo over HTTPS. Fix #3582 (from SimonSapin:cargo-https); r=Ms2ger
Download from https://static-rust-lang-org.s3.amazonaws.com, which apparently does not require SNI? This bypasses the CloudFront CDN and goes to directly to S3.

CC @brson

Source-Repo: https://github.com/servo/servo
Source-Revision: 8cb2b922ef8541aee9207efbacf0c125b61f8aaf
2014-11-13 14:24:45 -07:00
Fabrice Desré
991411f1d6 servo: Merge #3930 - Issue #3804 : Allow enabling debug-mozjs from servobuild config (from fabricedesre:issue3804); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 23b75816a2fafe9004c2def038f0c0fe774cc1a8
2014-11-07 01:24:28 -07:00
Philip Munksgaard
aaddf7d989 servo: Merge #3907 - Add serve-docs command to mach (from Munksgaard:serve-docs); r=jdm
This enables the user to run `./mach serve-docs` (with an optional port
number), starting a local web server that hosts the documentation for
Servo and Rust.

This closes #3807

Source-Repo: https://github.com/servo/servo
Source-Revision: 0e6a67c76b9dd862baae5ee5d3b729d3d573dd82
2014-11-05 20:39:33 -07:00
Matt Brubeck
8be40db719 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
Orvar Segerström
a22ec69c33 servo: Merge #3894 - Panic when bootstrap downloads fail (from awestroke:feauture-warn-32bit-bootstrap); r=jdm
Also hints that 32bit snapshots are unavailable on failure

Resolves #3739

![screenshot from 2014-11-05 13 42 39](https://cloud.githubusercontent.com/assets/1098408/4917781/6edc0dd2-64e9-11e4-98bd-dbd1829ee913.png)

Source-Repo: https://github.com/servo/servo
Source-Revision: 10072c73fd70a241dfa7280b0de1bb7b908de3f3
2014-11-05 15:42:51 -07:00
Josh Matthews
10c654fd65 servo: Merge #3803 - Add an optional --debug-mozjs argument to mach build that enables a no (from jdm:mozjsdebug); r=mbrubeck
...n-optimized, debug build of mozjs and rust-mozjs. Update the Cargo snapshot to enable new feature support.

Source-Repo: https://github.com/servo/servo
Source-Revision: e100a1834f40599952a790d2537d2b1262585e82
2014-10-24 14:39:33 -06:00
Fabrice Desré
2c98d7e10c servo: Merge #3751 - Update toml.py to upstream 1069d2449760525535ca77514a92e9237ee0deaf (from fabricedesre:update-toml); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: cf789e40c58179f1a314439f53e8c8be9a5da6b7
2014-10-21 20:36:33 -06:00
Matt Brubeck
b28677c053 servo: Merge #3563 - Move windowing code out of compositor, take 2. r=larsberg (from mbrubeck:app2)
Source-Repo: https://github.com/servo/servo
Source-Revision: 205067f10bc412608827e9a314a760acfb2ae15e
2014-10-10 13:12:37 -07:00
Ms2ger
790b1f715e servo: Merge #3581 - Pin Cargo to the 2014-10-02 nightly (from Ms2ger:pin-cargo); r=metajack
Relevant to #3580.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8de734f00a9d7598b72acce991410f457169e27a
2014-10-06 09:33:32 -06:00
Matt Brubeck
b12d6375d5 servo: Merge #3568 - Add Android build config to mach/servobuild (from mbrubeck:mach-android); r=metajack
This allows setting Android toolchain paths in `.servobuild`, and also adds a `--android` option that sets the correct default target and causes `mach build` to also build the APK.

Source-Repo: https://github.com/servo/servo
Source-Revision: bf7beb4837246aa53f611492b1ff0986f221a47e
2014-10-03 15:45:28 -06:00
Jack Moffitt
dd31d555a9 servo: Merge #3566 - Fix up and run unit tests (from metajack:fixup-unit-tests); r=mbrubeck
This adds the subpackages to `./mach test-unit`.

Source-Repo: https://github.com/servo/servo
Source-Revision: d4e977a2be1f1fea81c32d1f7024b228cb161966
2014-10-03 09:57:26 -06:00
Jack Moffitt
e9d6349b91 servo: Merge #3561 - Add --verbose to build-cef command (from metajack:build-cef-verbose); r=zwarich
Source-Repo: https://github.com/servo/servo
Source-Revision: 76d1d78cc0e08185f372a53e0cb2ce9e46213c31
2014-10-02 11:36:25 -06:00
Simon Sapin
b3423c8393 servo: Merge #3487 - Upgrade Rust and enable style crate rustdoc (from servo:rustup-20140923); r=Ms2ger
The biggest language change is that enum variants now also reserve (for future use) a name in the type namespace, which must not collide with other types. Some things were renamed, and others qualified as `module::name`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7409685589c550ee7a9f94182f511acddab4c6fd
2014-09-29 10:45:27 -06:00
Simon Sapin
777eafb219 servo: Merge #3494 - Fix /python/servo code formatting (from SimonSapin:flake8)
Reviewed-by: larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: ecfa1a9040d7ffece59fb9dc6c4e4d5e8eb80891
2014-09-26 17:03:41 -06:00
Simon Sapin
2cbc591beb servo: Merge #3448 - Have mach update (not just init) submodules as needed. Fix #3447 (from SimonSapin:mach-update-submodules)
Source-Repo: https://github.com/servo/servo
Source-Revision: 9af2df254063916a568fece070634a953c1f927a
2014-09-22 01:09:03 +01:00
Andreas Tolfsen
5004874e07 servo: Merge #3405 - Support dumb terminals in bootstrap downloads (from andreastt/ato:mach_dumb_term)
Source-Repo: https://github.com/servo/servo
Source-Revision: 8ec41f254676c5d089e838152111c72b4a88cff9
2014-09-18 15:19:25 +01:00
Matt Brubeck
fcd0ec296b servo: Merge #3372 - Make test_wpt params optional. r=me (from mbrubeck:wpt-params)
Source-Repo: https://github.com/servo/servo
Source-Revision: 340ebdfd85f9f9bb3caa352f5c679b4f3b3b9f97
2014-09-17 17:05:59 -07:00
Tetsuharu OHZEKI
5ba9439229 servo: Merge #3382 - Fix mach cargo is missing (from saneyuki:mach)
Source-Repo: https://github.com/servo/servo
Source-Revision: aa935c7b027bf00bf1f6756b0f5e1f4d0866c964
2014-09-17 02:33:35 -04:00
Matt Brubeck
964246415b servo: Merge #3345 - Don't throw on non-zero exit in mach commands (from mbrubeck:mach-exception)
Source-Repo: https://github.com/servo/servo
Source-Revision: 5f10d15e74ca5ee331a8271dede03fdca5adcb6c
2014-09-15 14:59:37 -06:00
Matt Brubeck
3e0c5b9455 servo: Merge #3334 - Add a mach rustc command (from mbrubeck:mach-rustc)
Source-Repo: https://github.com/servo/servo
Source-Revision: 203144e2075117159e8c872b1a468c88c829def3
2014-09-14 13:38:30 -06:00
Matt Brubeck
a3a97b7617 servo: Merge #3312 - Add more arguments to mach test commands. r=jack (from mbrubeck:test-name)
Source-Repo: https://github.com/servo/servo
Source-Revision: 25f263b7516e7accc569b5a045ff9bf23c56f8a7
2014-09-12 21:57:40 -07:00
Tetsuharu OHZEKI
c56ebd9fad servo: Merge #3315 - Add 'mach clean'.; r=Manishearth (from saneyuki:mach)
Source-Repo: https://github.com/servo/servo
Source-Revision: 88aa7d55537e8a8fcf76517c5145b6ff206a77e3
2014-09-13 09:07:29 +05:00
Dirk Leifeld
7a06f9b8a0 servo: Merge #3291 - Add -v or --verbose to mach build (from EdorianDark:master)
Source-Repo: https://github.com/servo/servo
Source-Revision: 0fbb93820ccddfc0003361a18ef31828785f3959
2014-09-11 14:44:34 -06:00