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

Add rust-core-foundation

Browse source
This commit is contained in:
Patrick Walton 2012-08-30 18:01:35 -07:00
parent f8dd3e38a6
commit 97baed9f9c
5 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -43,4 +43,7 @@
[submodule "src/rust-hubbub"] [submodule "src/rust-hubbub"]
path = src/rust-hubbub path = src/rust-hubbub
url = git://github.com/pcwalton/rust-hubbub.git url = git://github.com/pcwalton/rust-hubbub.git
[submodule "src/rust-core-foundation"]
path = src/rust-core-foundation
url = git://github.com/pcwalton/rust-core-foundation.git

24
Makefile.in
View file

@ -29,6 +29,7 @@ RUSTLIBS = \
-L src/rust-layers \ -L src/rust-layers \
-L src/rust-http-client \ -L src/rust-http-client \
-L src/rust-hubbub \ -L src/rust-hubbub \
-L src/rust-rust-core-foundation \
$(NULL) $(NULL)
RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs') RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@ -50,13 +51,13 @@ LAYERS_DEPS = \
src/rust-azure/libazure.dummy src/rust-azure/libazure.dummy
ifeq ($(OSTYPE),darwin) ifeq ($(OSTYPE),darwin)
SERVO_DEPS += rust-cocoa SERVO_DEPS += rust-cocoa rust-core-foundation
# I want the cocoa check to come before the servo check since if cocoa # I want the cocoa check to come before the servo check since if cocoa
# doesn't work neither does servo # doesn't work neither does servo
CHECK_DEPS += check-rust-cocoa CHECK_DEPS += check-rust-cocoa check-rust-core-foundation
CLEAN_DEPS += clean-rust-cocoa CLEAN_DEPS += clean-rust-cocoa clean-rust-core-foundation
AZURE_DEPS += rust-cocoa AZURE_DEPS += rust-cocoa rust-core-foundation
LAYERS_DEPS += rust-cocoa LAYERS_DEPS += rust-cocoa rust-core-foundation
endif endif
SERVO_DEPS += \ SERVO_DEPS += \
@ -127,7 +128,7 @@ reftest: src/reftest/reftest.rs libservo.dummy
.PHONY: mozjs rust-harfbuzz rust-mozjs rust-azure rust-cocoa \ .PHONY: mozjs rust-harfbuzz rust-mozjs rust-azure rust-cocoa \
rust-stb-image rust-geom rust-opengles rust-glut rust-layers \ rust-stb-image rust-geom rust-opengles rust-glut rust-layers \
rust-http-client rust-http-client rust-core-foundation
mozjs: src/mozjs/libjs_static.a mozjs: src/mozjs/libjs_static.a
@ -151,6 +152,8 @@ rust-layers: src/rust-layers/librustlayers.dummy
rust-http-client: src/rust-http-client/libhttp_client.dummy rust-http-client: src/rust-http-client/libhttp_client.dummy
rust-core-foundation: src/rust-core-foundation/librustcorefoundation.dummy
libparserutils: src/libparserutils/libparserutils.dummy libparserutils: src/libparserutils/libparserutils.dummy
libhubbub: src/libhubbub/libhubbub.dummy libhubbub: src/libhubbub/libhubbub.dummy
@ -207,6 +210,9 @@ src/servo-sandbox/servo-sandbox.dummy:
src/rust-hubbub/librusthubbub.dummy: src/rust-hubbub/librusthubbub.dummy:
$(MAKE) -C src/rust-hubbub $(MAKE) -C src/rust-hubbub
src/rust-core-foundation/librustcorefoundation.dummy:
$(MAKE) -C src/rust-core-foundation
# Testing targets # Testing targets
@ -252,6 +258,9 @@ check-rust-layers: $(LAYERS_DEPS)
check-rust-http-client: check-rust-http-client:
$(MAKE) check -C src/rust-http-client $(MAKE) check -C src/rust-http-client
check-rust-core-foundation:
$(MAKE) check -C src/rust-core-foundation
# Clean targets # Clean targets
@ -292,6 +301,9 @@ clean-rust-layers:
clean-rust-http-client: clean-rust-http-client:
$(MAKE) clean -C src/rust-http-client $(MAKE) clean -C src/rust-http-client
clean-rust-core-foundation:
$(MAKE) clean -C src/rust-core-foundation
clean-servo: clean-servo:
rm -f servo servo-test rm -f servo servo-test

2
configure.in
View file

@ -18,6 +18,7 @@ mkdir -p src/libparserutils || exit $?
mkdir -p src/libhubbub || exit $? mkdir -p src/libhubbub || exit $?
mkdir -p src/servo-sandbox || exit $? mkdir -p src/servo-sandbox || exit $?
mkdir -p src/rust-hubbub || exit $? mkdir -p src/rust-hubbub || exit $?
mkdir -p src/rust-core-foundation || exit $?
mkdir -p src/test/ref || exit $? mkdir -p src/test/ref || exit $?
@ -36,3 +37,4 @@ mkdir -p src/test/ref || exit $?
(cd src/libhubbub && sh ${SRCDIR}/src/libhubbub/configure) || exit $? (cd src/libhubbub && sh ${SRCDIR}/src/libhubbub/configure) || exit $?
(cd src/servo-sandbox && sh ${SRCDIR}/src/servo-sandbox/configure) || exit $? (cd src/servo-sandbox && sh ${SRCDIR}/src/servo-sandbox/configure) || exit $?
(cd src/rust-hubbub && sh ${SRCDIR}/src/rust-hubbub/configure) || exit $? (cd src/rust-hubbub && sh ${SRCDIR}/src/rust-hubbub/configure) || exit $?
(cd src/rust-core-foundation && sh ${SRCDIR}/src/rust-core-foundation/configure) || exit $?

1
src/rust-core-foundation Submodule

@ -0,0 +1 @@
Subproject commit 0225d541957f23c181def64d787bdb4db6156f81

2
src/servo-sandbox

@ -1 +1 @@
Subproject commit c1a3cd94ee7ea21d27b9a90d1576417dc3d8edbf Subproject commit 4fc86aceb448ebb9658664e60e8ffdb1d5e3c989