13 files changed, 155 insertions, 104 deletions
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 9eccd2f57a5..ac1aa402cb4 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 
-name = "servo"
+name = "libservo"
 version = "0.0.1"
 authors = ["The Servo Project Developers"]
 license = "MPL-2.0"
@@ -12,13 +12,6 @@ name = "servo"
 path = "lib.rs"
 crate-type = ["rlib"]
 
-[[bin]]
-name = "servo"
-path = "main.rs"
-test = false
-doc = false
-bench = false
-
 [features]
 default = ["webdriver", "max_log_level"]
 max_log_level = ["log/release_max_level_info"]
@@ -26,6 +19,7 @@ webdriver = ["webdriver_server"]
 energy-profiling = ["profile_traits/energy-profiling"]
 testing = ["style/testing"]
 clippy = ["plugins/clippy"]
+debugmozjs = ["script/debugmozjs"]
 
 [profile.release]
 opt-level = 3
@@ -33,18 +27,6 @@ opt-level = 3
 # debug = true
 # lto = false
 
-[dev-dependencies]
-compiletest_helper = {path = "../../tests/compiletest/helper"}
-gfx_tests = {path = "../../tests/unit/gfx"}
-layout_tests = {path = "../../tests/unit/layout"}
-net_tests = {path = "../../tests/unit/net"}
-net_traits_tests = {path = "../../tests/unit/net_traits"}
-plugin_compiletest = {path = "../../tests/compiletest/plugin"}
-profile_tests = {path = "../../tests/unit/profile"}
-script_tests = {path = "../../tests/unit/script"}
-style_tests = {path = "../../tests/unit/style"}
-util_tests = {path = "../../tests/unit/util"}
-
 [dependencies]
 backtrace = "0.2"
 bluetooth_traits = {path = "../bluetooth_traits"}
@@ -61,7 +43,6 @@ env_logger = "0.3"
 euclid = "0.10.1"
 gfx = {path = "../gfx"}
 gleam = "0.2"
-glutin_app = {path = "../../ports/glutin"}
 ipc-channel = "0.5"
 layout = {path = "../layout"}
 layout_thread = {path = "../layout_thread"}
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 042e620cb8b..f940a33dc33 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -10,13 +10,13 @@ dependencies = [
  "gleam 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin_app 0.0.1",
  "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libservo 0.0.1",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "net_traits 0.0.1",
  "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "plugins 0.0.1",
  "script_traits 0.0.1",
- "servo 0.0.1",
  "style_traits 0.0.1",
  "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "util 0.0.1",
@@ -1269,6 +1269,49 @@ dependencies = [
 ]
 
 [[package]]
+name = "libservo"
+version = "0.0.1"
+dependencies = [
+ "android_glue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bluetooth 0.0.1",
+ "bluetooth_traits 0.0.1",
+ "browserhtml 0.1.17 (git+https://github.com/browserhtml/browserhtml?branch=crate)",
+ "canvas 0.0.1",
+ "canvas_traits 0.0.1",
+ "compositing 0.0.1",
+ "constellation 0.0.1",
+ "debugger 0.0.1",
+ "devtools 0.0.1",
+ "devtools_traits 0.0.1",
+ "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gaol 0.0.1 (git+https://github.com/servo/gaol)",
+ "gfx 0.0.1",
+ "gleam 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "layout 0.0.1",
+ "layout_thread 0.0.1",
+ "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "msg 0.0.1",
+ "net 0.0.1",
+ "net_traits 0.0.1",
+ "profile 0.0.1",
+ "profile_traits 0.0.1",
+ "script 0.0.1",
+ "script_layout_interface 0.0.1",
+ "script_traits 0.0.1",
+ "sig 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "style 0.0.1",
+ "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "util 0.0.1",
+ "webdriver_server 0.0.1",
+ "webrender 0.9.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.9.0 (git+https://github.com/servo/webrender)",
+]
+
+[[package]]
 name = "libz-sys"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2109,50 +2152,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "servo"
-version = "0.0.1"
-dependencies = [
- "android_glue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "bluetooth 0.0.1",
- "bluetooth_traits 0.0.1",
- "browserhtml 0.1.17 (git+https://github.com/browserhtml/browserhtml?branch=crate)",
- "canvas 0.0.1",
- "canvas_traits 0.0.1",
- "compositing 0.0.1",
- "constellation 0.0.1",
- "debugger 0.0.1",
- "devtools 0.0.1",
- "devtools_traits 0.0.1",
- "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gaol 0.0.1 (git+https://github.com/servo/gaol)",
- "gfx 0.0.1",
- "gleam 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "glutin_app 0.0.1",
- "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layout 0.0.1",
- "layout_thread 0.0.1",
- "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "msg 0.0.1",
- "net 0.0.1",
- "net_traits 0.0.1",
- "profile 0.0.1",
- "profile_traits 0.0.1",
- "script 0.0.1",
- "script_layout_interface 0.0.1",
- "script_traits 0.0.1",
- "sig 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "style 0.0.1",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "util 0.0.1",
- "webdriver_server 0.0.1",
- "webrender 0.9.0 (git+https://github.com/servo/webrender)",
- "webrender_traits 0.9.0 (git+https://github.com/servo/webrender)",
-]
-
-[[package]]
 name = "servo-egl"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml
index 8e0d4383121..400d8963597 100644
--- a/ports/cef/Cargo.toml
+++ b/ports/cef/Cargo.toml
@@ -14,6 +14,9 @@ opt-level = 3
 # debug = true
 # lto = false
 
+[features]
+debugmozjs = ["libservo/debugmozjs"]
+
 [dependencies]
 compositing = {path = "../../components/compositing"}
 devtools = {path = "../../components/devtools"}
@@ -27,7 +30,7 @@ msg = {path = "../../components/msg"}
 net_traits = {path = "../../components/net_traits"}
 plugins = {path = "../../components/plugins"}
 script_traits = {path = "../../components/script_traits"}
-servo = {path = "../../components/servo"}
+libservo = {path = "../../components/servo"}
 style_traits = {path = "../../components/style_traits"}
 url = "1.2"
 util = {path = "../../components/util"}
diff --git a/components/servo/.cargo/config b/ports/servo/.cargo/config
index 1cea095353f..1cea095353f 100644
--- a/components/servo/.cargo/config
+++ b/ports/servo/.cargo/config
diff --git a/components/servo/Cargo.lock b/ports/servo/Cargo.lock
index a4d60761fb1..c2f4a1b7c90 100644
--- a/components/servo/Cargo.lock
+++ b/ports/servo/Cargo.lock
@@ -4,53 +4,22 @@ version = "0.0.1"
 dependencies = [
  "android_glue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "bluetooth 0.0.1",
- "bluetooth_traits 0.0.1",
  "browserhtml 0.1.17 (git+https://github.com/browserhtml/browserhtml?branch=crate)",
- "canvas 0.0.1",
- "canvas_traits 0.0.1",
  "compiletest_helper 0.0.1",
- "compositing 0.0.1",
- "constellation 0.0.1",
- "debugger 0.0.1",
- "devtools 0.0.1",
- "devtools_traits 0.0.1",
- "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gaol 0.0.1 (git+https://github.com/servo/gaol)",
- "gfx 0.0.1",
  "gfx_tests 0.0.1",
- "gleam 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "glutin_app 0.0.1",
- "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "layout 0.0.1",
  "layout_tests 0.0.1",
- "layout_thread 0.0.1",
  "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libservo 0.0.1",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "msg 0.0.1",
- "net 0.0.1",
  "net_tests 0.0.1",
- "net_traits 0.0.1",
  "net_traits_tests 0.0.1",
  "plugin_compiletest 0.0.1",
- "plugins 0.0.1",
- "profile 0.0.1",
  "profile_tests 0.0.1",
- "profile_traits 0.0.1",
- "script 0.0.1",
- "script_layout_interface 0.0.1",
  "script_tests 0.0.1",
- "script_traits 0.0.1",
  "sig 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "style 0.0.1",
  "style_tests 0.0.1",
- "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "util 0.0.1",
  "util_tests 0.0.1",
- "webdriver_server 0.0.1",
- "webrender 0.9.0 (git+https://github.com/servo/webrender)",
- "webrender_traits 0.9.0 (git+https://github.com/servo/webrender)",
 ]
 
 [[package]]
@@ -1386,6 +1355,50 @@ dependencies = [
 ]
 
 [[package]]
+name = "libservo"
+version = "0.0.1"
+dependencies = [
+ "android_glue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bluetooth 0.0.1",
+ "bluetooth_traits 0.0.1",
+ "browserhtml 0.1.17 (git+https://github.com/browserhtml/browserhtml?branch=crate)",
+ "canvas 0.0.1",
+ "canvas_traits 0.0.1",
+ "compositing 0.0.1",
+ "constellation 0.0.1",
+ "debugger 0.0.1",
+ "devtools 0.0.1",
+ "devtools_traits 0.0.1",
+ "env_logger 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "euclid 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gaol 0.0.1 (git+https://github.com/servo/gaol)",
+ "gfx 0.0.1",
+ "gleam 0.2.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipc-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "layout 0.0.1",
+ "layout_thread 0.0.1",
+ "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "msg 0.0.1",
+ "net 0.0.1",
+ "net_traits 0.0.1",
+ "plugins 0.0.1",
+ "profile 0.0.1",
+ "profile_traits 0.0.1",
+ "script 0.0.1",
+ "script_layout_interface 0.0.1",
+ "script_traits 0.0.1",
+ "sig 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "style 0.0.1",
+ "url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "util 0.0.1",
+ "webdriver_server 0.0.1",
+ "webrender 0.9.0 (git+https://github.com/servo/webrender)",
+ "webrender_traits 0.9.0 (git+https://github.com/servo/webrender)",
+]
+
+[[package]]
 name = "libz-sys"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml
new file mode 100644
index 00000000000..a69bbf17784
--- /dev/null
+++ b/ports/servo/Cargo.toml
@@ -0,0 +1,55 @@
+[package]
+
+name = "servo"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
+publish = false
+
+[[bin]]
+name = "servo"
+path = "main.rs"
+test = false
+doc = false
+bench = false
+
+[dev-dependencies]
+compiletest_helper = {path = "../../tests/compiletest/helper"}
+gfx_tests = {path = "../../tests/unit/gfx"}
+layout_tests = {path = "../../tests/unit/layout"}
+net_tests = {path = "../../tests/unit/net"}
+net_traits_tests = {path = "../../tests/unit/net_traits"}
+plugin_compiletest = {path = "../../tests/compiletest/plugin"}
+profile_tests = {path = "../../tests/unit/profile"}
+script_tests = {path = "../../tests/unit/script"}
+style_tests = {path = "../../tests/unit/style"}
+util_tests = {path = "../../tests/unit/util"}
+
+[features]
+default = ["webdriver", "max_log_level"]
+max_log_level = ["log/release_max_level_info"]
+webdriver = ["libservo/webdriver_server"]
+energy-profiling = ["libservo/energy-profiling"]
+testing = ["libservo/testing"]
+clippy = ["libservo/clippy"]
+debugmozjs = ["libservo/debugmozjs"]
+
+[profile.release]
+opt-level = 3
+# Uncomment to profile on Linux:
+# debug = true
+# lto = false
+
+[dependencies]
+backtrace = "0.2"
+browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "crate"}
+glutin_app = {path = "../../ports/glutin"}
+log = "0.3"
+libservo = {path = "../../components/servo"}
+
+[target.'cfg(not(target_os = "android"))'.dependencies]
+sig = "0.1"
+
+[target.'cfg(target_os = "android")'.dependencies]
+libc = "0.2"
+android_glue = "0.2"
diff --git a/components/servo/fake-ld.cmd b/ports/servo/fake-ld.cmd
index b13c7e818ab..b13c7e818ab 100644
--- a/components/servo/fake-ld.cmd
+++ b/ports/servo/fake-ld.cmd
diff --git a/components/servo/fake-ld.sh b/ports/servo/fake-ld.sh
index 642f1ae0d0d..642f1ae0d0d 100755
--- a/components/servo/fake-ld.sh
+++ b/ports/servo/fake-ld.sh
diff --git a/components/servo/main.rs b/ports/servo/main.rs
index 62c0de43be0..228e4ec2447 100644
--- a/components/servo/main.rs
+++ b/ports/servo/main.rs
@@ -11,7 +11,7 @@
 //! of [glutin], the cross-platform OpenGL utility and windowing
 //! library.
 //!
-//! For the engine itself look next door in lib.rs.
+//! For the engine itself look next door in `components/servo/lib.rs`.
 //!
 //! [glutin]: https://github.com/tomaka/glutin
 
diff --git a/components/servo/platform/macos/Info.plist b/ports/servo/platform/macos/Info.plist
index c2855eb82b4..c2855eb82b4 100644
--- a/components/servo/platform/macos/Info.plist
+++ b/ports/servo/platform/macos/Info.plist
diff --git a/components/servo/platform/macos/mod.rs b/ports/servo/platform/macos/mod.rs
index b980b83f5fb..b980b83f5fb 100644
--- a/components/servo/platform/macos/mod.rs
+++ b/ports/servo/platform/macos/mod.rs
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index b78a286be61..514a8f87e69 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -214,7 +214,7 @@ class MachCommands(CommandBase):
         self.ensure_bootstrapped(target=target)
 
         if debug_mozjs:
-            features += ["script/debugmozjs"]
+            features += ["debugmozjs"]
 
         if features:
             opts += ["--features", "%s" % ' '.join(features)]
@@ -360,7 +360,7 @@ class MachCommands(CommandBase):
 
         servo_features = self.servo_features()
         if servo_features:
-            opts += ["--features", "%s" % ' '.join("servo/" + x for x in servo_features)]
+            opts += ["--features", "%s" % ' '.join(servo_features)]
 
         build_start = time()
         env = self.build_env(is_build=True)
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index a67ea0b208d..1a236bdf1fa 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -501,13 +501,13 @@ class CommandBase(object):
         return env
 
     def servo_crate(self):
-        return path.join(self.context.topdir, "components", "servo")
+        return path.join(self.context.topdir, "ports", "servo")
 
     def servo_features(self):
         """Return a list of optional features to enable for the Servo crate"""
         features = []
         if self.config["build"]["debug-mozjs"]:
-            features += ["script/debugmozjs"]
+            features += ["debugmozjs"]
         return features
 
     def android_support_dir(self):