Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Build spidermonkey and bindings

Browse source
This commit is contained in:
Brian Anderson 2012-05-06 02:03:07 -07:00
parent 12a679df46
commit 1e686a16d9
6 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -7,3 +7,9 @@
[submodule "src/rust-cocoa"] [submodule "src/rust-cocoa"]
path = src/rust-cocoa path = src/rust-cocoa
url = git://github.com/pcwalton/rust-cocoa.git url = git://github.com/pcwalton/rust-cocoa.git
[submodule "src/mozjs"]
path = src/mozjs
url = git://github.com/brson/mozjs.git
[submodule "src/rust-mozjs"]
path = src/rust-mozjs
url = git://github.com/brson/rust-mozjs.git

18
Makefile.in
View file

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

4
configure vendored
View file

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

1
src/mozjs Submodule

@ -0,0 +1 @@
Subproject commit a971b9dd53975db0225bb900c216f2a1f4cd1de9

1
src/rust-mozjs Submodule

@ -0,0 +1 @@
Subproject commit f46084656c10471438ee5ef2488e514227d3e6d5

1
src/servo/servo.rc
View file

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