Move the servo binary to ports.

Ms2ger · Ms2ger · commit e0b1ffb2e884 · 2016-11-11T13:37:15.000+01:00
diff --git 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,39 +12,21 @@ 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"]
 webdriver = ["webdriver_server"]
 energy-profiling = ["profile_traits/energy-profiling"]
 testing = ["style/testing"]
 clippy = ["plugins/clippy"]
+debugmozjs = ["script/debugmozjs"]
 
 [profile.release]
 opt-level = 3
 # Uncomment to profile on Linux:
 # 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/servo/Cargo.lock b/ports/servo/Cargo.lock
diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml
@@ -0,0 +1,54 @@
+[package]
+
+name = "servo"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+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/ports/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/python/servo/build_commands.py b/python/servo/build_commands.py
@@ -214,7 +214,7 @@ def build(self, target=None, release=False, dev=False, jobs=None,
         self.ensure_bootstrapped(target=target)
 
         if debug_mozjs:
-            features += ["script/debugmozjs"]
+            features += ["debugmozjs"]
 
         if features:
             opts += ["--features", "%s" % ' '.join(features)]
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
@@ -498,13 +498,13 @@ def build_env(self, hosts_file_path=None, target=None, is_build=False):
         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):
