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

Work on integrating rust-cocoa

Browse source
This commit is contained in:
Brian Anderson 2012-04-18 15:25:30 -07:00
parent 698d133571
commit f403129da4
5 changed files with 74 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.gitignore vendored
View file

@ -1,3 +1,10 @@
*~ *~
*#
*.o
*.so
*.dylib
*.dSYM
*.dll
*.dummy
servo-test
Makefile Makefile
servo-test

76
Makefile.in
View file

@ -3,37 +3,87 @@ VPATH=%VPATH%
RUSTC?=rustc RUSTC?=rustc
RUSTFLAGS?= RUSTFLAGS?=
RUSTFLAGS += -L src/rust-azure -L src/rust-sdl UNAME=$(shell uname)
ifeq ($(UNAME),Darwin)
OSTYPE=darwin
endif
ifeq ($(UNAME),Linux)
OSTYPE=linux
endif
RUSTFLAGS += -L src/rust-azure -L src/rust-sdl -L src/rust-cocoa
RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs') RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
SERVO_DEPS = \
src/servo/servo.rc \
$(RUST_SRC) \
$(NULL)
CHECK_DEPS =
ifeq ($(OSTYPE),darwin)
SERVO_DEPS += src/rust-cocoa/libcocoa.dummy
# I want the cocoa check to come before the servo check since if cocoa
# doesn't work neither does servo
CHECK_DEPS += check-cocoa
endif
SERVO_DEPS += \
src/rust-azure/libazure.dummy \
src/rust-sdl/libsdl.dummy \
$(NULL)
CHECK_DEPS += \
check-sdl \
check-azure \
check-servo \
$(NULL)
.PHONY: all .PHONY: all
all: servo all: servo
servo: \ servo: $(SERVO_DEPS)
src/servo/servo.rc $(RUST_SRC) \
src/rust-azure/libazure.dummy \
src/rust-sdl/libsdl.dummy
$(RUSTC) $(RUSTFLAGS) -o $@ $< $(RUSTC) $(RUSTFLAGS) -o $@ $<
servo-test: \ servo-test: $(SERVO_DEPS)
src/servo/servo.rc $(RUST_SRC) \
src/rust-azure/libazure.dummy \
src/rust-sdl/libsdl.dummy
$(RUSTC) $(RUSTFLAGS) --test -o $@ $< $(RUSTC) $(RUSTFLAGS) --test -o $@ $<
check: $(CHECK_DEPS)
check-servo: servo-test
./servo-test
check-azure: src/rust-azure/azure-test
src/rust-azure/azure-test
check-sdl: src/rust-sdl/sdl-test
src/rust-sdl/sdl-test
check-cocoa: src/rust-cocoa/cocoa-test
src/rust-cocoa/cocoa-test
src/rust-azure/libazure.dummy: src/rust-azure/libazure.dummy:
make -C src/rust-azure make -C src/rust-azure
src/rust-sdl/libsdl.dummy: src/rust-sdl/libsdl.dummy:
make -C src/rust-sdl make -C src/rust-sdl
src/rust-cocoa/libcocoa.dummy:
make -C src/rust-cocoa
src/rust-azure/azure-test:
make check -C src/rust-azure
src/rust-sdl/sdl-test:
make check -C src/rust-sdl
src/rust-cocoa/cocoa-test:
make check -C src/rust-cocoa
.PHONY: clean .PHONY: clean
clean: clean:
make clean -C src/rust-azure make clean -C src/rust-azure
make clean -C src/rust-sdl make clean -C src/rust-sdl
make clean -C src/rust-cocoa
rm -f servo servo-test rm -f servo servo-test
.PHONY: test
test: servo-test
./servo-test

2
src/rust-azure

@ -1 +1 @@
Subproject commit ba501fe8d29e800c285171731088e1822869c655 Subproject commit de140b2ae578de31734ad90c56d9f69f57bc6ed9

1
src/rust-cocoa Submodule

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

2
src/rust-sdl

@ -1 +1 @@
Subproject commit c6587a967ff4fefbdd6b332a067ed3f402334122 Subproject commit 640aceb8769be9bf0ba2442ba1693d32656d5eeb