servo: Build spidermonkey and bindings

Source-Repo: https://github.com/servo/servo
Source-Revision: 1e686a16d983300abbb422250ee2fb780f856102

servo/Makefile.in

@@ -13,6 +13,7 @@ ifeq ($(UNAME),Linux)
 endif
 
 RUSTFLAGS += \
+	-L src/rust-mozjs \
 	-L src/rust-azure \
 	-L src/rust-sdl \
 	-L src/rust-cocoa \
@@ -36,17 +37,20 @@ ifeq ($(OSTYPE),darwin)
 endif
 
 SERVO_DEPS += \
+	src/rust-mozjs/libmozjs.dummy \
 	src/rust-azure/libazure.dummy \
 	src/rust-sdl/libsdl.dummy \
 	$(NULL)
 
 CHECK_DEPS += \
+	check-mozjs \
 	check-sdl \
 	check-azure \
 	check-servo \
 	$(NULL)
 
 CLEAN_DEPS += \
+	clean-mozjs \
 	clean-sdl \
 	clean-azure \
 	clean-servo \
@@ -61,6 +65,12 @@ servo:	$(SERVO_DEPS)
 servo-test: $(SERVO_DEPS)
 	$(RUSTC) $(RUSTFLAGS) --test -o $@ $<
 
+src/mozjs/libjs_static.a:
+	$(MAKE) -C src/mozjs
+
+src/rust-mozjs/libmozjs.dummy: src/mozjs/libjs_static.a
+	$(MAKE) -C src/rust-mozjs RUSTFLAGS="-L ../mozjs/"
+
 src/rust-azure/libazure.dummy:
 	$(MAKE) -C src/rust-azure
 
@@ -75,6 +85,10 @@ check: $(CHECK_DEPS)
 check-servo: servo-test
 	./servo-test
 
+.PHONY: check-mozjs
+check-mozjs:
+	$(MAKE) check -C src/rust-mozjs RUSTFLAGS="-L ../mozjs/"
+
 .PHONY: check-azure
 check-azure:
 	$(MAKE) check -C src/rust-azure
@@ -90,6 +104,10 @@ check-cocoa:
 .PHONY:	clean
 clean: $(CLEAN_DEPS)
 
+.PHONY: clean-mozjs
+clean-mozjs:
+	$(MAKE) clean -C src/rust-mozjs
+
 .PHONY: clean-azure
 clean-azure:
 	$(MAKE) clean -C src/rust-azure

servo/configure

@@ -3,10 +3,14 @@
 SRCDIR="$(cd $(dirname $0) && pwd)"
 sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile
 
+mkdir -p src/mozjs
+mkdir -p src/rust-mozjs
 mkdir -p src/rust-sdl
 mkdir -p src/rust-azure
 mkdir -p src/rust-cocoa
 
+(cd src/mozjs && sh ${SRCDIR}/src/mozjs/js/src/configure)
+(cd src/rust-mozjs && sh ${SRCDIR}/src/rust-mozjs/configure)
 (cd src/rust-sdl && sh ${SRCDIR}/src/rust-sdl/configure)
 (cd src/rust-azure && sh ${SRCDIR}/src/rust-azure/configure)
 (cd src/rust-cocoa && sh ${SRCDIR}/src/rust-cocoa/configure)

servo/src/servo/servo.rc

@@ -9,6 +9,7 @@
 use std;
 use sdl;
 use azure;
+use js;
 
 mod dom {
     mod base;