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