From c0a5e8f6eb10148f8e56ba242140fc7565a563df Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 11 Oct 2013 17:18:12 +0100 Subject: [PATCH] Add a new 'style' crate. (Empty for now.) --- Makefile.in | 13 ++++++++++--- configure | 1 + mk/clean.mk | 4 ++++ src/components/style/style.rc | 14 ++++++++++++++ 4 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 src/components/style/style.rc diff --git a/Makefile.in b/Makefile.in index 2ed8a76e21d..31edcf0f818 100644 --- a/Makefile.in +++ b/Makefile.in @@ -238,12 +238,19 @@ DONE_script = $(B)src/components/script/libscript.dummy DEPS_script = $(CRATE_script) $(SRC_script) $(DONE_SUBMODULES) $(DONE_util) $(DONE_net) $(DONE_gfx) $(DONE_msg) -RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/gfx -L $(B)src/components/util -L $(B)src/components/net -L $(B)src/components/script -L $(B)src/components/msg +RFLAGS_style = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/util +SRC_style = $(call rwildcard,$(S)src/components/style/,*.rs) +CRATE_style = $(S)src/components/style/style.rc +DONE_style = $(B)src/components/style/libstyle.dummy + +DEPS_style = $(CRATE_style) $(SRC_style) $(DONE_SUBMODULES) $(DONE_util) + +RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/gfx -L $(B)src/components/util -L $(B)src/components/net -L $(B)src/components/script -L $(B)src/components/style -L $(B)src/components/msg SRC_servo = $(call rwildcard,$(S)src/components/main/,*.rs) CRATE_servo = $(S)src/components/main/servo.rc -DEPS_servo = $(CRATE_servo) $(SRC_servo) $(DONE_SUBMODULES) $(DONE_util) $(DONE_gfx) $(DONE_script) $(DONE_net) $(DONE_msg) +DEPS_servo = $(CRATE_servo) $(SRC_servo) $(DONE_SUBMODULES) $(DONE_util) $(DONE_gfx) $(DONE_script) $(DONE_style) $(DONE_net) $(DONE_msg) .DEFAULT_GOAL := all .PHONY: all @@ -251,7 +258,7 @@ all: servo package # Servo helper libraries -SERVO_LIB_CRATES = util net msg gfx script +SERVO_LIB_CRATES = util net msg gfx script style define DEF_LIB_CRATE_RULES $$(DONE_$(1)): $$(DEPS_$(1)) diff --git a/configure b/configure index af25ebc9adc..319ec852ee1 100755 --- a/configure +++ b/configure @@ -583,6 +583,7 @@ make_dir ${CFG_BUILD_DIR}src/components/msg make_dir ${CFG_BUILD_DIR}src/components/net make_dir ${CFG_BUILD_DIR}src/components/gfx make_dir ${CFG_BUILD_DIR}src/components/script +make_dir ${CFG_BUILD_DIR}src/components/style make_dir ${CFG_BUILD_DIR}src/components/main make_dir src/test/html/ref make_dir src/compiler/rust diff --git a/mk/clean.mk b/mk/clean.mk index 448136fcdcd..ccb37f9a7a2 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -45,6 +45,10 @@ clean-script: @$(call E, "cleaning script") $(Q)cd $(B)/src/components/script/ && rm -rf libscript*.dylib libscript*.dSYM libscript*.so $(DONE_script) +clean-style: + @$(call E, "cleaning style") + $(Q)cd $(B)/src/components/style/ && rm -rf libstyle*.dylib libstyle*.dSYM libstyle*.so $(DONE_style) + clean-servo: clean-gfx clean-util clean-net clean-script clean-msg @$(call E, "cleaning servo") $(Q)rm -f servo servo-test $(foreach lib_crate,$(SERVO_LIB_CRATES),servo-test-$(lib_crate)) libservo*.so diff --git a/src/components/style/style.rc b/src/components/style/style.rc new file mode 100644 index 00000000000..d80842a555f --- /dev/null +++ b/src/components/style/style.rc @@ -0,0 +1,14 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#[link(name = "style", + vers = "0.1", + uuid = "4a50ca00-3283-11e3-aa6e-0800200c9a66", + url = "http://servo.org/")]; + +#[comment = "The Servo Parallel Browser Project"]; +#[license = "MPL"]; +#[crate_type = "lib"]; + +extern mod cssparser;