Auto merge of #11977 - larsbergstrom:rollup, r=larsbergstrom

Rollup of 2 pull requests

- Successful merges: #11975, #11976
- Failed merges:

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11977)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-06-30 21:26:47 -05:00 committed by GitHub
commit 63d99c188c
3 changed files with 7 additions and 7 deletions

View file

@ -4,7 +4,7 @@ version = "0.0.1"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"browserhtml 0.1.11 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
"browserhtml 0.1.14 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"compiletest_helper 0.0.1",
@ -189,8 +189,8 @@ source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dc
[[package]]
name = "browserhtml"
version = "0.1.11"
source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#cb89e4281961a24032dff1d65462ab6a38fc55ac"
version = "0.1.14"
source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#aa577e5d9f436f98b4bd80424a8e48e43f370c43"
[[package]]
name = "byteorder"

6
ports/cef/Cargo.lock generated
View file

@ -163,8 +163,8 @@ source = "git+https://github.com/ende76/brotli-rs#d8507fd07e9fa57ed8251d5dc500dc
[[package]]
name = "browserhtml"
version = "0.1.11"
source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#cb89e4281961a24032dff1d65462ab6a38fc55ac"
version = "0.1.14"
source = "git+https://github.com/browserhtml/browserhtml?branch=gh-pages#aa577e5d9f436f98b4bd80424a8e48e43f370c43"
[[package]]
name = "byteorder"
@ -1926,7 +1926,7 @@ version = "0.0.1"
dependencies = [
"android_glue 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"browserhtml 0.1.11 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
"browserhtml 0.1.14 (git+https://github.com/browserhtml/browserhtml?branch=gh-pages)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
"compositing 0.0.1",

View file

@ -174,7 +174,7 @@ class PackageCommands(CommandBase):
'--pref', 'shell.builtin-key-shortcuts.enabled=false',
path.join(browserhtml_path, 'out', 'index.html')]
runservo = os.open(dir_to_package + 'runservo.sh', os.O_WRONLY | os.O_CREAT, int("0755", 8))
runservo = os.open(dir_to_package + '/runservo.sh', os.O_WRONLY | os.O_CREAT, int("0755", 8))
os.write(runservo, "./servo " + ' '.join(servo_args))
os.close(runservo)
print("Creating tarball")