Commit Graph

8 Commits

Author SHA1 Message Date
Sumith
6b8d5eebdc servo: Merge #6362 - Entries in servobuild.example file (from Sumith1896:servobuildexample); r=Manishearth
Entries in the servobuild.example file that are not defaults were
commented out, defaults were mentioned in comments.
Fix to https://github.com/servo/servo/issues/6361

Source-Repo: https://github.com/servo/servo
Source-Revision: 3c1b8041d496746189c03dcd0f6e2af1ebca56b0
2015-06-12 23:39:01 -06:00
Jinank Jain
59ab94ecc1 servo: Merge #6038 - Add --dev option to mach build (from mbrubeck:jinankjain-Bug#5933); r=mbrubeck
Require either `--dev` or `--release`, unless a default build.mode is set in `.servobuild`.  This is @jinankjain's patch from #5965, rebased onto master.  It is already reviewed, and only waiting for servo/saltfs#28 to be deployed.

Source-Repo: https://github.com/servo/servo
Source-Revision: c0d8488b719ea72e73e435618e015c2f705853cc
2015-05-14 11:26:18 -05:00
Manish Goregaokar
263b2e76cf servo: Merge #5168 - Add support for $CARGO_HOME in servobuild (from Manishearth:cargo-home); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: e8ea41658111cccc0cd2b4fd85e511750f907daa
2015-03-08 00:03:45 -07:00
Manish Goregaokar
ec73aa2e35 servo: Merge #4991 - Add ./mach build-gonk; unbreak gonk build; document (from Manishearth:gonkup); r=larsbergstrom
r? @larsbergstrom

cc @mwu

Source-Repo: https://github.com/servo/servo
Source-Revision: d326e75c5e0314903ed2d297dcb72e535c543c2f
2015-02-20 22:27:49 -07:00
Matt Brubeck
da246a4107 servo: Merge #4755 - Move snapshot dir inside the source dir by default (from mbrubeck:cache-dir); r=metajack
As discussed in a previous weekly meeting, this avoids changing any directories outside the repo, which is better for some automation scenarios.

The servobuild.example file has a "cache-dir" setting that restores the previous default location of `~/.servo`, which is useful for developers working with multiple clones on the same machine.

I'm not sure which setting we want to use for our buildbot hosts.

r? @metajack or @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 74e32d119c864f527510a3ca008f88c26818df0b
2015-01-28 16:06:52 -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
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
132ee35633 servo: Merge #3230 - Cargoify servo (from servo:cargoify)
Source-Repo: https://github.com/servo/servo
Source-Revision: b1305bb7d051f83850c51bb0da0ccc86a5e07922
2014-09-09 08:18:18 -06:00