diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2013-12-11 14:25:07 +0000 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2013-12-11 14:25:07 +0000 |
| commit | b98acc2f752aaa783f68483a81b79984a2dc7b16 (patch) | |
| tree | 8a81a478a56853d14b5b2b8566784c704ea3d656 | |
| parent | bc36ca860d353fed91e4dacaf952a5a4c6a1f7eb (diff) | |
| download | servo-b98acc2f752aaa783f68483a81b79984a2dc7b16.tar.gz servo-b98acc2f752aaa783f68483a81b79984a2dc7b16.zip | |
Add rust-encoding as a submodule.
Upstream: https://github.com/lifthrasiir/rust-encoding
Servo’s fork: https://github.com/mozilla-servo/rust-encoding
As of this writing, upstream’s master branch targets Rust 0.8,
and its rust-0.9-pre branch targets Rust master.
Servo uses a Rust version in-between those.
I pushed a rust-servo branch to our fork
that backports from rust-0.9-pre.
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | mk/sub.mk | 9 | ||||
| m--------- | src/support/encoding/rust-encoding | 0 |
4 files changed, 14 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 6e01b1c87fc..e9d92f3f743 100644 --- a/.gitmodules +++ b/.gitmodules @@ -106,3 +106,7 @@ [submodule "src/support/http/rust-http"] path = src/support/http/rust-http url = https://github.com/mozilla-servo/rust-http +[submodule "src/support/encoding/rust-encoding"] + path = src/support/encoding/rust-encoding + url = https://github.com/mozilla-servo/rust-encoding.git + branch = rust-servo diff --git a/configure b/configure index 5de771e9268..e870f7b50f4 100755 --- a/configure +++ b/configure @@ -498,6 +498,7 @@ CFG_SUBMODULES="\ support/alert/rust-alert \ support/azure/rust-azure \ support/css/rust-cssparser \ + support/encoding/rust-encoding \ support/harfbuzz/rust-harfbuzz \ support/http/rust-http \ support/hubbub/libhubbub \ diff --git a/mk/sub.mk b/mk/sub.mk index d4ccf03883c..da506cb2b1a 100644 --- a/mk/sub.mk +++ b/mk/sub.mk @@ -50,6 +50,15 @@ DEPS_rust-azure += \ rust \ $(NULL) +DEPS_rust-cssparser += \ + rust-encoding \ + rust \ + $(NULL) + +DEPS_rust-encoding += \ + rust \ + $(NULL) + DEPS_glfw-rs += \ glfw \ rust \ diff --git a/src/support/encoding/rust-encoding b/src/support/encoding/rust-encoding new file mode 160000 +Subproject 2c486a34dedba1faace3de641e0ace103c7f314 |