Cargoify servo

.cargo/config

@@ -0,0 +1,7 @@
+paths = ["support/glfw-rs"]
+
+[target.arm-linux-androideabi]
+ar = "arm-linux-androideabi-ar"
+linker = "arm-linux-androideabi-g++"
+
+

.gitignore

@@ -1,3 +1,21 @@
+/target
+/rust
+/cargo
+/ports/cef/target
+/ports/android/bin
+/ports/android/libs
+/ports/android/local.properties
+/ports/android/obj
+/components/script/dom/bindings/codegen/*.rs
+/components/script/dom/bindings/codegen/_cache
+/components/script/dom/bindings/codegen/Bindings
+/components/script/dom/bindings/codegen/test/*.rs
+/components/script/dom/bindings/codegen/RegisterBindings.cpp
+/components/script/dom/bindings/codegen/PrototypeList.h
+/components/script/dom/bindings/codegen/UnionTypes.h
+/components/script/dom/bindings/codegen/UnionConversions.h
+/.servobuild
+/_virtualenv
 *~
 *#
 *.o
@@ -14,14 +32,6 @@
 servo-test
 Servo.app
 .config.mk.last
-/build*
-objdir
 parser.out
-src/components/script/dom/bindings/codegen/*.rs
-src/components/script/dom/bindings/codegen/_cache/
-src/components/script/dom/bindings/codegen/Bindings/
-src/components/script/dom/bindings/codegen/test/*.rs
-src/components/script/dom/bindings/codegen/RegisterBindings.cpp
-src/components/script/dom/bindings/codegen/PrototypeList.h
-src/components/script/dom/bindings/codegen/UnionTypes.h
-src/components/script/dom/bindings/codegen/UnionConversions.h
+/glfw
+

.gitmodules

@@ -1,122 +1,6 @@
-[submodule "src/support/azure/rust-azure"]
-	path = src/support/azure/rust-azure
-	url = https://github.com/servo/rust-azure.git
-[submodule "src/platform/macos/rust-cocoa"]
-	path = src/platform/macos/rust-cocoa
-	url = https://github.com/servo/rust-cocoa.git
-[submodule "src/support/spidermonkey/mozjs"]
-	path = src/support/spidermonkey/mozjs
-	url = https://github.com/servo/mozjs.git
-[submodule "src/support/spidermonkey/rust-mozjs"]
-	path = src/support/spidermonkey/rust-mozjs
-	url = https://github.com/servo/rust-mozjs.git
-[submodule "src/support/harfbuzz/rust-harfbuzz"]
-	path = src/support/harfbuzz/rust-harfbuzz
-	url = https://github.com/servo/rust-harfbuzz.git
-[submodule "src/support/stb-image/rust-stb-image"]
-	path = src/support/stb-image/rust-stb-image
-	url = https://github.com/servo/rust-stb-image.git
-[submodule "src/support/geom/rust-geom"]
-	path = src/support/geom/rust-geom
-	url = https://github.com/servo/rust-geom.git
-[submodule "src/support/opengles/rust-opengles"]
-	path = src/support/opengles/rust-opengles
-	url = https://github.com/servo/rust-opengles.git
-[submodule "src/support/layers/rust-layers"]
-	path = src/support/layers/rust-layers
-	url = https://github.com/servo/rust-layers.git
-[submodule "src/support/hubbub/libhubbub"]
-	path = src/support/hubbub/libhubbub
-	url = https://github.com/servo/libhubbub.git
-[submodule "src/support/libparserutils/libparserutils"]
-	path = src/support/libparserutils/libparserutils
-	url = https://github.com/servo/libparserutils.git
-[submodule "src/support/hubbub/rust-hubbub"]
-	path = src/support/hubbub/rust-hubbub
-	url = https://github.com/servo/rust-hubbub.git
-[submodule "src/platform/macos/rust-core-foundation"]
-	path = src/platform/macos/rust-core-foundation
-	url = https://github.com/servo/rust-core-foundation.git
-[submodule "src/platform/macos/rust-io-surface"]
-	path = src/platform/macos/rust-io-surface
-	url = https://github.com/servo/rust-io-surface.git
-[submodule "src/support/sharegl/sharegl"]
-	path = src/support/sharegl/sharegl
-	url = https://github.com/servo/sharegl.git
-[submodule "src/platform/macos/rust-core-graphics"]
-	path = src/platform/macos/rust-core-graphics
-	url = https://github.com/servo/rust-core-graphics.git
-[submodule "src/platform/macos/rust-core-text"]
-	path = src/platform/macos/rust-core-text
-	url = https://github.com/servo/rust-core-text.git
-[submodule "src/platform/linux/rust-freetype"]
-	path = src/platform/linux/rust-freetype
-	url = https://github.com/servo/rust-freetype.git
-[submodule "src/platform/linux/rust-fontconfig"]
-	path = src/platform/linux/rust-fontconfig
-	url = https://github.com/servo/rust-fontconfig.git
-[submodule "src/platform/linux/rust-xlib"]
-	path = src/platform/linux/rust-xlib
-	url = https://github.com/servo/rust-xlib.git
-[submodule "src/support/skia/skia"]
-	path = src/support/skia/skia
-	url = https://github.com/servo/skia.git
-[submodule "src/support/alert/rust-alert"]
-	path = src/support/alert/rust-alert
-	url = https://github.com/servo/rust-alert.git
-[submodule "src/support/glfw/glfw"]
-	path = src/support/glfw/glfw
-	url = https://github.com/servo/glfw.git
-[submodule "src/support/glfw/glfw-rs"]
-	path = src/support/glfw/glfw-rs
+[submodule "support/glfw-rs"]
+	path = support/glfw-rs
 	url = https://github.com/servo/glfw-rs.git
-[submodule "src/support/css/rust-cssparser"]
-	path = src/support/css/rust-cssparser
-	url = https://github.com/servo/rust-cssparser.git
-[submodule "src/support/png/rust-png"]
-	path = src/support/png/rust-png
-	url = https://github.com/servo/rust-png.git
-[submodule "src/support/png/libpng"]
-	path = src/support/png/libpng
-	url = https://github.com/servo/libpng.git
-[submodule "src/platform/android/libexpat"]
-	path = src/platform/android/libexpat
-	url = https://github.com/servo/libexpat.git
-	ignore = dirty
-[submodule "src/platform/android/libfreetype2"]
-	path = src/platform/android/libfreetype2
-	url = https://github.com/servo/libfreetype2.git
-[submodule "src/support/glut/rust-glut"]
-	path = src/support/glut/rust-glut
-	url = https://github.com/servo/rust-glut.git
-[submodule "src/support/http/rust-http"]
-	path = src/support/http/rust-http
-	url = https://github.com/servo/rust-http
-[submodule "src/support/encoding/rust-encoding"]
-	path = src/support/encoding/rust-encoding
-	url = https://github.com/servo/rust-encoding.git
-	branch = rust-servo
-[submodule "src/support/egl/rust-egl"]
-	path = src/support/egl/rust-egl
-	url = https://github.com/servo/rust-egl.git
-[submodule "src/platform/android/servo-android-glue"]
-	path = src/platform/android/servo-android-glue
-	url = https://github.com/servo/servo-android-glue.git
-[submodule "src/test/wpt/web-platform-tests"]
-	path = src/test/wpt/web-platform-tests
+[submodule "tests/wpt/web-platform-tests"]
+	path = tests/wpt/web-platform-tests
 	url = https://github.com/servo/web-platform-tests.git
-[submodule "src/support/phf/rust-phf"]
-	path = src/support/phf/rust-phf
-	url = https://github.com/servo/rust-phf.git
-[submodule "src/support/stringcache/string-cache"]
-	path = src/support/stringcache/string-cache
-	url = https://github.com/servo/string-cache.git
-[submodule "src/support/url/rust-url"]
-	path = src/support/url/rust-url
-	url = https://github.com/servo/rust-url.git
-[submodule "src/support/ssl/rust-openssl"]
-	path = src/support/ssl/rust-openssl
-	url = https://github.com/servo/rust-openssl.git
-[submodule "src/platform/fontconfig/fontconfig"]
-	path = src/platform/fontconfig/fontconfig
-	url = https://github.com/servo/fontconfig.git

.travis.yml

@@ -4,23 +4,14 @@ os:
 - linux
 - osx
 
-install:
-- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./travis.linux.install.deps.sh; fi
-- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./travis.osx.install.deps.sh; fi
+install: ./etc/ci/travis.install.sh
 
-before_script:
-- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./travis.linux.before_script.sh; fi
-- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./travis.osx.before_script.sh; fi
+before_script: ./etc/ci/travis.before_script.sh
 
-script:
-- mkdir -p build
-- cd build
-- ../mk/build.sh
-- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ../travis.linux.script.sh $AFTER_BUILD; fi
-- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ../travis.osx.script.sh $AFTER_BUILD; fi
+script: ./etc/ci/travis.script.sh
 
 git:
-  submodules: true
+  submodules: false
 
 notifications:
   irc:
@@ -31,18 +22,16 @@ notifications:
 
 env:
   global:
+    - LD_LIBRARY_PATH: /usr/local/lib
     - secure: "C/9/o+5KdTY1LZ4qZGE1+gY6mEGamG/VDHP69Om9dklfchJD6C+j8K8dvmE26FeRnLhSL7eGf1b3m6lfgkTZeVFjjiZE0Exvf1yI9Y3QPWR7ViaFxWk1z1I4HaSu4fpBo++e8FW+0EGjIkIrRtAn+bav3eDpAhgSih10KmAx4a8="
   matrix:
-    - AFTER_BUILD=content
-    - AFTER_BUILD=ref
+    - TASKS=build,test-content,test-ref
 
 matrix:
   include:
-    - os: linux
-      env: AFTER_BUILD=unit-doc
     - os: osx
-      env: AFTER_BUILD=unit
+      env: TASKS=build,test-wpt1
     - os: osx
-      env: AFTER_BUILD=wpt1
+      env: TASKS=build,test-wpt2
     - os: osx
-      env: AFTER_BUILD=wpt2
+      env: TASKS=build-cef

Cargo.lock

@@ -0,0 +1,463 @@
+[root]
+name = "servo"
+version = "0.0.1"
+dependencies = [
+ "compositing 0.0.1",
+ "gfx 0.0.1",
+ "layout 0.0.1",
+ "msg 0.0.1",
+ "net 0.0.1",
+ "png 0.1.0 (git+https://github.com/servo/rust-png#f3640b37e71a02ee3e140e181cc9accb0a123e16)",
+ "script 0.0.1",
+ "util 0.0.1",
+]
+
+[[package]]
+name = "alert"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-alert#fdc24f13be8d8a2d15214ec228d166b3221b809e"
+dependencies = [
+ "cocoa 0.1.0 (git+https://github.com/servo/rust-cocoa#f5da9ccfaeb701ff1b5ab9e1784e999d04530e8f)",
+ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#9aeaee0bceb3241d6efca07cc6b82747339ffbff)",
+]
+
+[[package]]
+name = "azure"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-azure#9c5567b79d8b87e8ef3b48c5842f453978035d21"
+dependencies = [
+ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#9aeaee0bceb3241d6efca07cc6b82747339ffbff)",
+ "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics#04bd18a4eb83a645a1a32326a33149ba2d0e81be)",
+ "core_text 0.1.0 (git+https://github.com/servo/rust-core-text#e2280222889c030df27ded9a378c14a0e31ab463)",
+ "egl 0.1.0 (git+https://github.com/servo/rust-egl#48b85e30d557ab2ee536730a73dd86a8160d618b)",
+ "freetype 0.1.0 (git+https://github.com/servo/rust-freetype#fb15dd309750c8ec664b2c9f245cfcb06731872e)",
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#dd1a111c827994886d2cdebf91a1838603256390)",
+ "layers 0.1.0 (git+https://github.com/servo/rust-layers#c04029907be1f2242d48235d3b03608b905bbd9f)",
+ "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#13cccda11011716fd75526a74dfd03122110f95a)",
+ "skia-sys 0.0.20130412 (git+https://github.com/servo/skia#6d696712962fd0d41120b7a414a48417da8e6a92)",
+ "xlib 0.1.0 (git+https://github.com/servo/rust-xlib#79904fb42ff8a0e888f70fae336fbf6c11f1e6c8)",
+]
+
+[[package]]
+name = "canvas"
+version = "0.0.1"
+dependencies = [
+ "azure 0.1.0 (git+https://github.com/servo/rust-azure#9c5567b79d8b87e8ef3b48c5842f453978035d21)",
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+]
+
+[[package]]
+name = "cocoa"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-cocoa#f5da9ccfaeb701ff1b5ab9e1784e999d04530e8f"
+
+[[package]]
+name = "compositing"
+version = "0.0.1"
+dependencies = [
+ "alert 0.1.0 (git+https://github.com/servo/rust-alert#fdc24f13be8d8a2d15214ec228d166b3221b809e)",
+ "azure 0.1.0 (git+https://github.com/servo/rust-azure#9c5567b79d8b87e8ef3b48c5842f453978035d21)",
+ "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics#04bd18a4eb83a645a1a32326a33149ba2d0e81be)",
+ "core_text 0.1.0 (git+https://github.com/servo/rust-core-text#e2280222889c030df27ded9a378c14a0e31ab463)",
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "gfx 0.0.1",
+ "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#dd1a111c827994886d2cdebf91a1838603256390)",
+ "glut 0.0.1 (git+https://github.com/servo/rust-glut#d351eed425464c58671c6ec33445ee896fd42ff1)",
+ "layers 0.1.0 (git+https://github.com/servo/rust-layers#c04029907be1f2242d48235d3b03608b905bbd9f)",
+ "layout_traits 0.0.1",
+ "msg 0.0.1",
+ "net 0.0.1",
+ "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#13cccda11011716fd75526a74dfd03122110f95a)",
+ "png 0.1.0 (git+https://github.com/servo/rust-png#f3640b37e71a02ee3e140e181cc9accb0a123e16)",
+ "script_traits 0.0.1",
+ "url 0.1.0 (git+https://github.com/servo/rust-url#678bb4d52638b1cfdab78ef8e521566c9240fb1a)",
+ "util 0.0.1",
+]
+
+[[package]]
+name = "core_foundation"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-core-foundation#9aeaee0bceb3241d6efca07cc6b82747339ffbff"
+
+[[package]]
+name = "core_graphics"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-core-graphics#04bd18a4eb83a645a1a32326a33149ba2d0e81be"
+dependencies = [
+ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#9aeaee0bceb3241d6efca07cc6b82747339ffbff)",
+]
+
+[[package]]
+name = "core_text"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-core-text#e2280222889c030df27ded9a378c14a0e31ab463"
+dependencies = [
+ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#9aeaee0bceb3241d6efca07cc6b82747339ffbff)",
+ "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics#04bd18a4eb83a645a1a32326a33149ba2d0e81be)",
+]
+
+[[package]]
+name = "cssparser"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-cssparser#42346400a6629b17a48d06f0a9b28ae498947c6f"
+dependencies = [
+ "encoding 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding#12b6610adff6eddc060691888c36017cd3ad57f7)",
+]
+
+[[package]]
+name = "egl"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-egl#48b85e30d557ab2ee536730a73dd86a8160d618b"
+
+[[package]]
+name = "encoding"
+version = "0.1.0"
+source = "git+https://github.com/lifthrasiir/rust-encoding#12b6610adff6eddc060691888c36017cd3ad57f7"
+
+[[package]]
+name = "expat-sys"
+version = "2.1.0"
+source = "git+https://github.com/servo/libexpat#da2ddaf78cbef836b8790807bb76b357c58df3a1"
+
+[[package]]
+name = "fontconfig"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-fontconfig#6e02b6df7815dc4bf1f8ef20b926e717891f8544"
+dependencies = [
+ "fontconfig-sys 2.11.1 (git+https://github.com/servo/libfontconfig#1fc43065f581d70133d819070177094434cc3144)",
+]
+
+[[package]]
+name = "fontconfig-sys"
+version = "2.11.1"
+source = "git+https://github.com/servo/libfontconfig#1fc43065f581d70133d819070177094434cc3144"
+dependencies = [
+ "expat-sys 2.1.0 (git+https://github.com/servo/libexpat#da2ddaf78cbef836b8790807bb76b357c58df3a1)",
+ "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2#5b6499164106f094937565595c7b96d07de55521)",
+]
+
+[[package]]
+name = "freetype"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-freetype#fb15dd309750c8ec664b2c9f245cfcb06731872e"
+
+[[package]]
+name = "freetype-sys"
+version = "2.4.11"
+source = "git+https://github.com/servo/libfreetype2#5b6499164106f094937565595c7b96d07de55521"
+
+[[package]]
+name = "geom"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489"
+
+[[package]]
+name = "gfx"
+version = "0.0.1"
+dependencies = [
+ "azure 0.1.0 (git+https://github.com/servo/rust-azure#9c5567b79d8b87e8ef3b48c5842f453978035d21)",
+ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#9aeaee0bceb3241d6efca07cc6b82747339ffbff)",
+ "core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics#04bd18a4eb83a645a1a32326a33149ba2d0e81be)",
+ "core_text 0.1.0 (git+https://github.com/servo/rust-core-text#e2280222889c030df27ded9a378c14a0e31ab463)",
+ "fontconfig 0.1.0 (git+https://github.com/servo/rust-fontconfig#6e02b6df7815dc4bf1f8ef20b926e717891f8544)",
+ "freetype 0.1.0 (git+https://github.com/servo/rust-freetype#fb15dd309750c8ec664b2c9f245cfcb06731872e)",
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "harfbuzz 0.1.0 (git+https://github.com/servo/rust-harfbuzz#f07c6ae3111a94945f0f04b5f0d7c4e7c20958e9)",
+ "layers 0.1.0 (git+https://github.com/servo/rust-layers#c04029907be1f2242d48235d3b03608b905bbd9f)",
+ "macros 0.0.1",
+ "msg 0.0.1",
+ "net 0.0.1",
+ "png 0.1.0 (git+https://github.com/servo/rust-png#f3640b37e71a02ee3e140e181cc9accb0a123e16)",
+ "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image#f5022de4ad6bb474a03493d1f274dde9b0f1af0c)",
+ "style 0.0.1",
+ "url 0.1.0 (git+https://github.com/servo/rust-url#678bb4d52638b1cfdab78ef8e521566c9240fb1a)",
+ "util 0.0.1",
+]
+
+[[package]]
+name = "glfw"
+version = "0.0.1"
+source = "git+https://github.com/servo/glfw-rs?ref=servo#dd1a111c827994886d2cdebf91a1838603256390"
+dependencies = [
+ "link_glfw 0.1.0 (git+https://github.com/servo/glfw-rs?ref=servo#dd1a111c827994886d2cdebf91a1838603256390)",
+ "semver 0.0.1 (git+https://github.com/rust-lang/semver#df163f7b22686493b037eee1f1f9d1a2742f9bbe)",
+]
+
+[[package]]
+name = "glut"
+version = "0.0.1"
+source = "git+https://github.com/servo/rust-glut#d351eed425464c58671c6ec33445ee896fd42ff1"
+dependencies = [
+ "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#13cccda11011716fd75526a74dfd03122110f95a)",
+]
+
+[[package]]
+name = "harfbuzz"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-harfbuzz#f07c6ae3111a94945f0f04b5f0d7c4e7c20958e9"
+
+[[package]]
+name = "http"
+version = "0.1.0-pre"
+source = "git+https://github.com/servo/rust-http?ref=servo#13be91d968d3e5ba032d19a3bb3438c2c4c6b372"
+dependencies = [
+ "openssl 0.0.0 (git+https://github.com/sfackler/rust-openssl.git#cd40d25cb5721064c5c2002c41a616d2dba7399a)",
+ "url 0.1.0 (git+https://github.com/servo/rust-url#678bb4d52638b1cfdab78ef8e521566c9240fb1a)",
+]
+
+[[package]]
+name = "hubbub"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-hubbub#c7f868e688de6e9cbdc26aa09292ed072bc2648b"
+dependencies = [
+ "hubbub-sys 0.1.2 (git+https://github.com/servo/libhubbub#6d09893991dedc616b264058442a304c03842213)",
+]
+
+[[package]]
+name = "hubbub-sys"
+version = "0.1.2"
+source = "git+https://github.com/servo/libhubbub#6d09893991dedc616b264058442a304c03842213"
+dependencies = [
+ "parserutils-sys 0.1.1 (git+http://github.com/servo/libparserutils#651b636ba1214bceeb0907adb1eab60efe0d4598)",
+]
+
+[[package]]
+name = "io_surface"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-io-surface#05f102273e16e9432245f813e5fe6280087e2b44"
+dependencies = [
+ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#9aeaee0bceb3241d6efca07cc6b82747339ffbff)",
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#13cccda11011716fd75526a74dfd03122110f95a)",
+]
+
+[[package]]
+name = "js"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-mozjs#c9bd679428e8e83e585702a949d593bda8ac04d6"
+dependencies = [
+ "mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs#47cd6a4e60c75642ba182f0df9a42b71ec7c2c88)",
+]
+
+[[package]]
+name = "layers"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-layers#c04029907be1f2242d48235d3b03608b905bbd9f"
+dependencies = [
+ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#9aeaee0bceb3241d6efca07cc6b82747339ffbff)",
+ "egl 0.1.0 (git+https://github.com/servo/rust-egl#48b85e30d557ab2ee536730a73dd86a8160d618b)",
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#05f102273e16e9432245f813e5fe6280087e2b44)",
+ "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#13cccda11011716fd75526a74dfd03122110f95a)",
+ "xlib 0.1.0 (git+https://github.com/servo/rust-xlib#79904fb42ff8a0e888f70fae336fbf6c11f1e6c8)",
+]
+
+[[package]]
+name = "layout"
+version = "0.0.1"
+dependencies = [
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "gfx 0.0.1",
+ "layout_traits 0.0.1",
+ "macros 0.0.1",
+ "net 0.0.1",
+ "script 0.0.1",
+ "script_traits 0.0.1",
+ "style 0.0.1",
+ "url 0.1.0 (git+https://github.com/servo/rust-url#678bb4d52638b1cfdab78ef8e521566c9240fb1a)",
+ "util 0.0.1",
+]
+
+[[package]]
+name = "layout_traits"
+version = "0.0.1"
+dependencies = [
+ "gfx 0.0.1",
+ "msg 0.0.1",
+ "net 0.0.1",
+ "script_traits 0.0.1",
+ "util 0.0.1",
+]
+
+[[package]]
+name = "link_glfw"
+version = "0.1.0"
+source = "git+https://github.com/servo/glfw-rs?ref=servo#dd1a111c827994886d2cdebf91a1838603256390"
+
+[[package]]
+name = "macros"
+version = "0.0.1"
+
+[[package]]
+name = "mozjs-sys"
+version = "0.0.0"
+source = "git+https://github.com/servo/mozjs#47cd6a4e60c75642ba182f0df9a42b71ec7c2c88"
+
+[[package]]
+name = "msg"
+version = "0.0.1"
+dependencies = [
+ "azure 0.1.0 (git+https://github.com/servo/rust-azure#9c5567b79d8b87e8ef3b48c5842f453978035d21)",
+ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#9aeaee0bceb3241d6efca07cc6b82747339ffbff)",
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#05f102273e16e9432245f813e5fe6280087e2b44)",
+ "layers 0.1.0 (git+https://github.com/servo/rust-layers#c04029907be1f2242d48235d3b03608b905bbd9f)",
+ "url 0.1.0 (git+https://github.com/servo/rust-url#678bb4d52638b1cfdab78ef8e521566c9240fb1a)",
+ "util 0.0.1",
+]
+
+[[package]]
+name = "net"
+version = "0.0.1"
+dependencies = [
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo#13be91d968d3e5ba032d19a3bb3438c2c4c6b372)",
+ "png 0.1.0 (git+https://github.com/servo/rust-png#f3640b37e71a02ee3e140e181cc9accb0a123e16)",
+ "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image#f5022de4ad6bb474a03493d1f274dde9b0f1af0c)",
+ "url 0.1.0 (git+https://github.com/servo/rust-url#678bb4d52638b1cfdab78ef8e521566c9240fb1a)",
+ "util 0.0.1",
+]
+
+[[package]]
+name = "opengles"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-opengles#13cccda11011716fd75526a74dfd03122110f95a"
+
+[[package]]
+name = "openssl"
+version = "0.0.0"
+source = "git+https://github.com/sfackler/rust-openssl.git#cd40d25cb5721064c5c2002c41a616d2dba7399a"
+
+[[package]]
+name = "parserutils-sys"
+version = "0.1.1"
+source = "git+http://github.com/servo/libparserutils#651b636ba1214bceeb0907adb1eab60efe0d4598"
+
+[[package]]
+name = "phf"
+version = "0.0.0"
+source = "git+https://github.com/sfackler/rust-phf#fa5d803428dd760287330571c919c7c5e11b2e1b"
+
+[[package]]
+name = "phf_mac"
+version = "0.0.0"
+source = "git+https://github.com/sfackler/rust-phf#fa5d803428dd760287330571c919c7c5e11b2e1b"
+
+[[package]]
+name = "png"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-png#f3640b37e71a02ee3e140e181cc9accb0a123e16"
+dependencies = [
+ "png-sys 1.6.3 (git+https://github.com/servo/libpng?ref=servo#d01f32b4eb86904695efe7fc02b574f902e21a98)",
+]
+
+[[package]]
+name = "png-sys"
+version = "1.6.3"
+source = "git+https://github.com/servo/libpng?ref=servo#d01f32b4eb86904695efe7fc02b574f902e21a98"
+
+[[package]]
+name = "script"
+version = "0.0.1"
+dependencies = [
+ "canvas 0.0.1",
+ "cssparser 0.1.0 (git+https://github.com/servo/rust-cssparser#42346400a6629b17a48d06f0a9b28ae498947c6f)",
+ "encoding 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding#12b6610adff6eddc060691888c36017cd3ad57f7)",
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "gfx 0.0.1",
+ "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo#13be91d968d3e5ba032d19a3bb3438c2c4c6b372)",
+ "hubbub 0.1.0 (git+https://github.com/servo/rust-hubbub#c7f868e688de6e9cbdc26aa09292ed072bc2648b)",
+ "js 0.1.0 (git+https://github.com/servo/rust-mozjs#c9bd679428e8e83e585702a949d593bda8ac04d6)",
+ "macros 0.0.1",
+ "msg 0.0.1",
+ "net 0.0.1",
+ "script_traits 0.0.1",
+ "style 0.0.1",
+ "url 0.1.0 (git+https://github.com/servo/rust-url#678bb4d52638b1cfdab78ef8e521566c9240fb1a)",
+ "util 0.0.1",
+]
+
+[[package]]
+name = "script_traits"
+version = "0.0.1"
+dependencies = [
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "msg 0.0.1",
+ "net 0.0.1",
+ "url 0.1.0 (git+https://github.com/servo/rust-url#678bb4d52638b1cfdab78ef8e521566c9240fb1a)",
+]
+
+[[package]]
+name = "semver"
+version = "0.0.1"
+source = "git+https://github.com/rust-lang/semver#df163f7b22686493b037eee1f1f9d1a2742f9bbe"
+
+[[package]]
+name = "skia-sys"
+version = "0.0.20130412"
+source = "git+https://github.com/servo/skia#6d696712962fd0d41120b7a414a48417da8e6a92"
+dependencies = [
+ "expat-sys 2.1.0 (git+https://github.com/servo/libexpat#da2ddaf78cbef836b8790807bb76b357c58df3a1)",
+ "freetype-sys 2.4.11 (git+https://github.com/servo/libfreetype2#5b6499164106f094937565595c7b96d07de55521)",
+]
+
+[[package]]
+name = "stb_image"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-stb-image#f5022de4ad6bb474a03493d1f274dde9b0f1af0c"
+
+[[package]]
+name = "string_cache"
+version = "0.0.0"
+source = "git+https://github.com/servo/string-cache#aa4365ac8da8504a82c709f97b6bcace9b0af4a1"
+dependencies = [
+ "phf 0.0.0 (git+https://github.com/sfackler/rust-phf#fa5d803428dd760287330571c919c7c5e11b2e1b)",
+ "phf_mac 0.0.0 (git+https://github.com/sfackler/rust-phf#fa5d803428dd760287330571c919c7c5e11b2e1b)",
+ "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache#aa4365ac8da8504a82c709f97b6bcace9b0af4a1)",
+]
+
+[[package]]
+name = "string_cache_macros"
+version = "0.0.0"
+source = "git+https://github.com/servo/string-cache#aa4365ac8da8504a82c709f97b6bcace9b0af4a1"
+
+[[package]]
+name = "style"
+version = "0.0.1"
+dependencies = [
+ "cssparser 0.1.0 (git+https://github.com/servo/rust-cssparser#42346400a6629b17a48d06f0a9b28ae498947c6f)",
+ "encoding 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding#12b6610adff6eddc060691888c36017cd3ad57f7)",
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "macros 0.0.1",
+ "url 0.1.0 (git+https://github.com/servo/rust-url#678bb4d52638b1cfdab78ef8e521566c9240fb1a)",
+ "util 0.0.1",
+]
+
+[[package]]
+name = "task_info"
+version = "0.0.1"
+
+[[package]]
+name = "url"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-url#678bb4d52638b1cfdab78ef8e521566c9240fb1a"
+dependencies = [
+ "encoding 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding#12b6610adff6eddc060691888c36017cd3ad57f7)",
+]
+
+[[package]]
+name = "util"
+version = "0.0.1"
+dependencies = [
+ "azure 0.1.0 (git+https://github.com/servo/rust-azure#9c5567b79d8b87e8ef3b48c5842f453978035d21)",
+ "geom 0.1.0 (git+https://github.com/servo/rust-geom#2982b770db6e5e3270305e0fd6b8068f6f80a489)",
+ "string_cache 0.0.0 (git+https://github.com/servo/string-cache#aa4365ac8da8504a82c709f97b6bcace9b0af4a1)",
+ "task_info 0.0.1",
+]
+
+[[package]]
+name = "xlib"
+version = "0.1.0"
+source = "git+https://github.com/servo/rust-xlib#79904fb42ff8a0e888f70fae336fbf6c11f1e6c8"
+

Cargo.toml

@@ -0,0 +1,51 @@
+[package]
+
+name = "servo"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+
+[lib]
+name = "servo"
+crate-type = ["rlib", "dylib"]
+
+[[bin]]
+name = "servo"
+test = false
+doc = false
+bench = false
+
+[[test]]
+name = "reftest"
+path = "tests/reftest.rs"
+harness = false
+
+[[test]]
+name = "contenttest"
+path = "tests/contenttest.rs"
+harness = false
+
+
+[dependencies.compositing]
+path = "components/compositing"
+
+[dependencies.net]
+path = "components/net"
+
+[dependencies.msg]
+path = "components/msg"
+
+[dependencies.util]
+path = "components/util"
+
+[dependencies.script]
+path = "components/script"
+
+[dependencies.layout]
+path = "components/layout"
+
+[dependencies.gfx]
+path = "components/gfx"
+
+[dependencies.png]
+git = "https://github.com/servo/rust-png"
+

Makefile.in

@@ -1,2 +0,0 @@
-include config.mk
-include $(CFG_SRC_DIR)mk/main.mk

ORGANIZATION.md

@@ -0,0 +1,40 @@
+# Servo code organization
+
+## Servo components
+
+* `src/bin.rs`: Servo's entry point
+* `src/lib.rs`: libservo entry point
+* `components/layout`: The layout system.
+* `components/style`: The CSS styling system.
+* `components/script`: The JavaScript and DOM systems.
+* `components/compositing`: The compositor and windowing systems.
+* `components/gfx`: Graphics rendering, fonts, and text shaping.
+* `components/net`: Networking, caching, image decoding.
+* `components/msg`: Message structure definitions for inter-task communication.
+* `components/*_traits`: Trait definitions to break crate dependencies.
+* `components/macros`: Macros used by the rest of Servo.
+* `components/util`: Various utility functions used by other Servo components.
+
+## Supporting libraries
+
+These libraries are either internal but used by Servo or external and need
+special integration:
+
+* `support/glfw-rs`: Wrapping for the GLFW library. Will eventually move to
+  being completely out of tree.
+* `support/rust-task_info`: A binding to the task_info library on OS X.
+
+## Tests
+
+* `tests/contenttest.rs`: Content (JavaScript) test runner
+* `tests/contenttest`: Content tests
+* `tests/reftest.rs`: Reference (layout) test runner
+* `tests/reftest`: Reference tests
+* `tests/html`: Manual test cases and examples
+* `tests/power`: Tests for measuring power usage
+* `tests/wpt`: Web platform tests and harness
+
+## Miscellaneous
+
+* `etc`: Various scripts and files that don't belong anywhere else.
+* `etc/patches`: Patches for upstream libraries.

README.md

@@ -27,7 +27,8 @@ On Debian-based Linuxes:
 ``` sh
 sudo apt-get install autoconf2.13 curl freeglut3-dev libtool \
     libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \
-    msttcorefonts gperf g++ automake cmake python-virtualenv
+    msttcorefonts gperf g++ automake cmake python-virtualenv \
+    libssl-dev
 ```
 
 On Fedora:
@@ -35,7 +36,8 @@ On Fedora:
 ``` sh
 sudo yum install autoconf213 curl freeglut-devel libtool gcc-c++ libXi-devel \
     freetype-devel mesa-libGL-devel glib2-devel libX11-devel libXrandr-devel gperf \
-    fontconfig-devel cabextract ttmkfdir python python-virtualenv expat-devel rpm-build
+    fontconfig-devel cabextract ttmkfdir python python-virtualenv expat-devel \
+    rpm-build openssl-devel
 pushd .
 cd /tmp
 wget http://corefonts.sourceforge.net/msttcorefonts-2.5-1.spec
@@ -73,24 +75,21 @@ Servo cannot be built in-tree; you must create a directory in which to run
 configure and make and place the build artifacts.
 
 ``` sh
-git clone https://github.com/mozilla/servo.git
+git clone https://github.com/servo/servo.git
 cd servo
-mkdir -p build && cd build
-../configure
-make && make check
-./servo ../src/test/html/about-mozilla.html
+./mach build
+./mach run tests/html/about-mozilla.html
 ```
 
-###Building for Android target
+### Building for Android target
 
 ``` sh
-git clone https://github.com/mozilla/servo.git
+git clone https://github.com/servo/servo.git
 cd servo
-mkdir -p build && cd build
-../configure --target=arm-linux-androideabi --android-cross-path=<Android toolchain path> --android-ndk-path=<Android NDK path> --android-sdk-path=<Android SDK path>
-make
-(or make package)
-
+ANDROID_TOOLCHAIN=/path/to/toolchain ANDROID_NDK=/path/to/ndk PATH=$PATH:/path/to/toolchain/bin ./mach build --target arm-linux-androideabi
+cd ports/android
+ANDROID_NDK=/path/to/ndk ANDROID_SDK=/path/to/sdk make
+ANDROID_SDK=/path/to/sdk make install
 ```
 
 ## Running
@@ -113,15 +112,4 @@ make
 
 ## Developing
 
-There are lots of make targets you can use:
-
-- `make clean` - cleans Servo and its dependencies, but not Rust
-- `make clean-rust` - cleans Rust
-- `make clean-servo` - only cleans Servo itself (code in `src/components`)
-- `make clean-DEP` - cleans the dependency `DEP`. e.g. `make clean-rust-opengles`
-- `make bindings` - generate the Rust WebIDL bindings
-- `make DEP` - builds only the specified dependency. e.g. `make rust-opengles`
-- `make check-DEP` - build and run tests for specified dependency
-- `make package` - build and make app package for specific OS. e.g. apk file of Android
-
-The `make check-*` targets for running tests are listed [here](https://github.com/mozilla/servo/wiki/Testing)
+There are lots of mach commands you can use. You can list them with `./mach --help`.

bld/linux.py

@@ -1,11 +0,0 @@
-config = {
-    'mock_target': 'mozilla-centos6-x86_64',
-    'mock_packages': ['freetype-devel', 'fontconfig-devel', 'glib2-devel', 'autoconf213', 'git', 'make', 'libX11-devel', 'mesa-libGL-devel', 'freeglut-devel',
-                      'xorg-x11-server-devel', 'libXrandr-devel', 'libXi-devel', 'libpng-devel', 'expat-devel', 'gperf', 'gcc473_0moz1'],
-    'mock_files': [('/home/servobld/.ssh', '/home/mock_mozilla/.ssh')],
-    'concurrency': 6,
-    'add_actions': ['setup-mock'],
-    'env': {'PATH': '/tools/gcc-4.7.3-0moz1/bin:%(PATH)s',
-            'LIBRARY_PATH': '/tools/gcc-4.7.3-0moz1/lib64',
-            'LD_LIBRARY_PATH': '/tools/gcc-4.7.3-0moz1/lib64'},
-}

bld/mac.py

@@ -1,3 +0,0 @@
-config = {
-    'concurrency': 6,
-}

components/canvas/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "canvas"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+
+[lib]
+name = "canvas"
+path = "lib.rs"
+
+[dependencies.azure]
+git = "https://github.com/servo/rust-azure"
+
+[dependencies.geom]
+git = "https://github.com/servo/rust-geom"

components/canvas/lib.rs

@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![crate_name = "canvas"]
-#![crate_type = "rlib"]
-
 extern crate azure;
 extern crate geom;
 

components/compositing/Cargo.toml

@@ -0,0 +1,61 @@
+[package]
+name = "compositing"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+
+[lib]
+name = "compositing"
+path = "lib.rs"
+
+[dependencies.gfx]
+path = "../gfx"
+
+[dependencies.layout_traits]
+path = "../layout_traits"
+
+[dependencies.script_traits]
+path = "../script_traits"
+
+[dependencies.msg]
+path = "../msg"
+
+[dependencies.net]
+path = "../net"
+
+[dependencies.util]
+path = "../util"
+
+[dependencies.alert]
+git = "https://github.com/servo/rust-alert"
+
+[dependencies.azure]
+git = "https://github.com/servo/rust-azure"
+
+[dependencies.geom]
+git = "https://github.com/servo/rust-geom"
+
+[dependencies.glfw]
+git = "https://github.com/servo/glfw-rs"
+branch = "servo"
+
+[dependencies.layers]
+git = "https://github.com/servo/rust-layers"
+
+[dependencies.opengles]
+git = "https://github.com/servo/rust-opengles"
+
+[dependencies.png]
+git = "https://github.com/servo/rust-png"
+
+[dependencies.url]
+git = "https://github.com/servo/rust-url"
+
+[dependencies.core_graphics]
+git = "https://github.com/servo/rust-core-graphics"
+
+[dependencies.core_text]
+git = "https://github.com/servo/rust-core-text"
+
+[dependencies.glut]
+git = "https://github.com/servo/rust-glut"
+

components/compositing/lib.rs

@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![crate_name = "compositing"]
-#![crate_type = "rlib"]
-
 #![comment = "The Servo Parallel Browser Project"]
 #![license = "MPL"]
 

components/gfx/Cargo.toml

@@ -0,0 +1,62 @@
+[package]
+
+name = "gfx"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+
+[lib]
+name = "gfx"
+path = "lib.rs"
+
+[dependencies.macros]
+path = "../macros"
+
+[dependencies.net]
+path = "../net"
+
+[dependencies.util]
+path = "../util"
+
+[dependencies.msg]
+path = "../msg"
+
+[dependencies.style]
+path = "../style"
+
+[dependencies.azure]
+git = "https://github.com/servo/rust-azure"
+
+[dependencies.geom]
+git = "https://github.com/servo/rust-geom"
+
+[dependencies.layers]
+git = "https://github.com/servo/rust-layers"
+
+[dependencies.stb_image]
+git = "https://github.com/servo/rust-stb-image"
+
+[dependencies.png]
+git = "https://github.com/servo/rust-png"
+
+[dependencies.url]
+git = "https://github.com/servo/rust-url"
+
+[dependencies.harfbuzz]
+git = "https://github.com/servo/rust-harfbuzz"
+
+[dependencies.fontconfig]
+git = "https://github.com/servo/rust-fontconfig"
+
+[dependencies.freetype]
+git = "https://github.com/servo/rust-freetype"
+
+[dependencies.core_foundation]
+git = "http://github.com/servo/rust-core-foundation"
+
+[dependencies.core_graphics]
+git = "http://github.com/servo/rust-core-graphics"
+
+[dependencies.core_text]
+git = "http://github.com/servo/rust-core-text"
+
+

components/gfx/lib.rs

@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![crate_name = "gfx"]
-#![crate_type = "rlib"]
-
 #![feature(globs, macro_rules, phase, unsafe_destructor)]
 
 #![feature(phase)]

components/layout/Cargo.toml

@@ -0,0 +1,38 @@
+[package]
+name = "layout"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+
+[lib]
+name = "layout"
+path = "lib.rs"
+
+[dependencies.gfx]
+path = "../gfx"
+
+[dependencies.script]
+path = "../script"
+
+[dependencies.layout_traits]
+path = "../layout_traits"
+
+[dependencies.script_traits]
+path = "../script_traits"
+
+[dependencies.style]
+path = "../style"
+
+[dependencies.macros]
+path = "../macros"
+
+[dependencies.net]
+path = "../net"
+
+[dependencies.util]
+path = "../util"
+
+[dependencies.geom]
+git = "https://github.com/servo/rust-geom"
+
+[dependencies.url]
+git = "https://github.com/servo/rust-url"

components/layout/lib.rs

@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![crate_name = "layout"]
-#![crate_type = "rlib"]
-
 #![comment = "The Servo Parallel Browser Project"]
 #![license = "MPL"]
 

components/layout_traits/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "layout_traits"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+
+[lib]
+name = "layout_traits"
+path = "lib.rs"
+
+[dependencies.gfx]
+path = "../gfx"
+
+[dependencies.script_traits]
+path = "../script_traits"
+
+[dependencies.msg]
+path = "../msg"
+
+[dependencies.net]
+path = "../net"
+
+[dependencies.util]
+path = "../util"

components/layout_traits/lib.rs

@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![crate_name = "layout_traits"]
-#![crate_type = "rlib"]
-
 #![comment = "The Servo Parallel Browser Project"]
 #![license = "MPL"]
 

components/macros/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "macros"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+
+[lib]
+name = "macros"
+path = "lib.rs"
+plugin = true

components/macros/lib.rs

@@ -2,10 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![crate_name = "macros"]
-#![crate_type = "rlib"]
-
-#![feature(macro_rules)]
+#![feature(macro_rules, plugin_registrar, quote, phase)]
 
 //! Exports macros for use in other Servo crates.
 

components/msg/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+
+name = "msg"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+
+[lib]
+name = "msg"
+path = "lib.rs"
+
+[dependencies.util]
+path = "../util"
+
+[dependencies.azure]
+git = "http://github.com/servo/rust-azure"
+
+[dependencies.geom]
+git = "http://github.com/servo/rust-geom"
+
+[dependencies.layers]
+git = "http://github.com/servo/rust-layers"
+
+[dependencies.core_foundation]
+git = "http://github.com/servo/rust-core-foundation"
+
+[dependencies.io_surface]
+git = "http://github.com/servo/rust-io-surface"
+
+[dependencies.url]
+git = "http://github.com/servo/rust-url"

components/msg/lib.rs

@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#![crate_name = "msg"]
-#![crate_type = "rlib"]
-
 extern crate azure;
 extern crate geom;
 extern crate layers;

components/net/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "net"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+
+[lib]
+name = "net"
+path = "lib.rs"
+
+[dependencies.util]
+path = "../util"
+
+[dependencies.geom]
+git = "https://github.com/servo/rust-geom"
+
+[dependencies.http]
+git = "https://github.com/servo/rust-http"
+branch = "servo"
+
+[dependencies.png]
+git = "https://github.com/servo/rust-png"
+
+[dependencies.stb_image]
+git = "https://github.com/servo/rust-stb-image"
+
+[dependencies.url]
+git = "https://github.com/servo/rust-url"