mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Remove the servo-
prefix from core components.
This commit is contained in:
parent
c658c6dea9
commit
c7bce98236
215 changed files with 59 additions and 55 deletions
54
Makefile.in
54
Makefile.in
|
@ -171,35 +171,35 @@ $(eval $(call DEF_SUBMODULE_RULES,$(submodule))))
|
|||
|
||||
DONE_SUBMODULES = $(foreach submodule,$(SUBMODULES),$(DONE_$(submodule)))
|
||||
|
||||
RFLAGS_servo_util = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES))
|
||||
SRC_servo_util = $(call rwildcard,$(S)src/components/servo-util/,*.rs)
|
||||
CRATE_servo_util = $(S)src/components/servo-util/servo_util.rc
|
||||
DONE_servo_util = $(B)src/components/servo-util/libservoutil.dummy
|
||||
RFLAGS_util = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES))
|
||||
SRC_util = $(call rwildcard,$(S)src/components/util/,*.rs)
|
||||
CRATE_util = $(S)src/components/util/util.rc
|
||||
DONE_util = $(B)src/components/util/libutil.dummy
|
||||
|
||||
DEPS_servo_util = $(CRATE_servo_util) $(SRC_servo_util) $(DONE_SUBMODULES)
|
||||
DEPS_util = $(CRATE_util) $(SRC_util) $(DONE_SUBMODULES)
|
||||
|
||||
RFLAGS_servo_net = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/servo-util
|
||||
SRC_servo_net = $(call rwildcard,$(S)src/components/servo-net/,*.rs)
|
||||
CRATE_servo_net = $(S)src/components/servo-net/servo_net.rc
|
||||
DONE_servo_net = $(B)src/components/servo-net/libservonet.dummy
|
||||
RFLAGS_net = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/util
|
||||
SRC_net = $(call rwildcard,$(S)src/components/net/,*.rs)
|
||||
CRATE_net = $(S)src/components/net/net.rc
|
||||
DONE_net = $(B)src/components/net/libnet.dummy
|
||||
|
||||
DEPS_servo_net = $(CRATE_servo_net) $(SRC_servo_net) $(DONE_SUBMODULES) $(DONE_servo_util)
|
||||
DEPS_net = $(CRATE_net) $(SRC_net) $(DONE_SUBMODULES) $(DONE_util)
|
||||
|
||||
RFLAGS_servo_gfx = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/servo-util -L $(B)src/components/servo-net
|
||||
SRC_servo_gfx = $(call rwildcard,$(S)src/components/servo-gfx/,*.rs)
|
||||
CRATE_servo_gfx = $(S)src/components/servo-gfx/servo_gfx.rc
|
||||
DONE_servo_gfx = $(B)src/components/servo-gfx/libservogfx.dummy
|
||||
RFLAGS_gfx = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/util -L $(B)src/components/net
|
||||
SRC_gfx = $(call rwildcard,$(S)src/components/gfx/,*.rs)
|
||||
CRATE_gfx = $(S)src/components/gfx/gfx.rc
|
||||
DONE_gfx = $(B)src/components/gfx/libgfx.dummy
|
||||
|
||||
DEPS_servo_gfx = $(CRATE_servo_gfx) $(SRC_servo_gfx) $(DONE_SUBMODULES) $(DONE_servo_util) $(DONE_servo_net)
|
||||
DEPS_gfx = $(CRATE_gfx) $(SRC_gfx) $(DONE_SUBMODULES) $(DONE_util) $(DONE_net)
|
||||
|
||||
RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components/servo-gfx -L $(B)src/components/servo-util -L $(B)src/components/servo-net
|
||||
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
|
||||
|
||||
WEBIDL_servo = $(call rwildcard,$(S)src/components/servo/,*.webidl)
|
||||
WEBIDL_servo = $(call rwildcard,$(S)src/components/main/,*.webidl)
|
||||
AUTOGEN_SRC_servo = $(patsubst %.webidl, %Binding.rs, $(WEBIDL_servo))
|
||||
SRC_servo = $(call rwildcard,$(S)src/components/servo/,*.rs) $(AUTOGEN_SRC_servo)
|
||||
CRATE_servo = $(S)src/components/servo/servo.rc
|
||||
SRC_servo = $(call rwildcard,$(S)src/components/main/,*.rs) $(AUTOGEN_SRC_servo)
|
||||
CRATE_servo = $(S)src/components/main/servo.rc
|
||||
|
||||
DEPS_servo = $(CRATE_servo) $(SRC_servo) $(DONE_SUBMODULES) $(DONE_servo_util) $(DONE_servo_gfx) $(DONE_servo_net)
|
||||
DEPS_servo = $(CRATE_servo) $(SRC_servo) $(DONE_SUBMODULES) $(DONE_util) $(DONE_gfx) $(DONE_net)
|
||||
|
||||
# rules that depend on having correct meta-target vars (DEPS_CLEAN, DEPS_servo, etc)
|
||||
include $(S)mk/check.mk
|
||||
|
@ -211,16 +211,16 @@ all: servo package
|
|||
|
||||
# Servo helper libraries
|
||||
|
||||
$(DONE_servo_util): $(DEPS_servo_util)
|
||||
$(RUSTC) $(RFLAGS_servo_util) -o $@ $< && touch $@
|
||||
$(DONE_util): $(DEPS_util)
|
||||
$(RUSTC) $(RFLAGS_util) -o $@ $< && touch $@
|
||||
|
||||
$(DONE_servo_net): $(DEPS_servo_net)
|
||||
$(RUSTC) $(RFLAGS_servo_net) -o $@ $< && touch $@
|
||||
$(DONE_net): $(DEPS_net)
|
||||
$(RUSTC) $(RFLAGS_net) -o $@ $< && touch $@
|
||||
|
||||
$(DONE_servo_gfx): $(DEPS_servo_gfx)
|
||||
$(RUSTC) $(RFLAGS_servo_gfx) -o $@ $< && touch $@
|
||||
$(DONE_gfx): $(DEPS_gfx)
|
||||
$(RUSTC) $(RFLAGS_gfx) -o $@ $< && touch $@
|
||||
|
||||
BINDINGS_SRC = $(S)/src/components/servo/dom/bindings/codegen
|
||||
BINDINGS_SRC = $(S)/src/components/main/dom/bindings/codegen
|
||||
|
||||
CACHE_DIR = $(BINDINGS_SRC)/_cache
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# The Servo Parallel Browser Project
|
||||
zRThe Servo Parallel Browser Project
|
||||
|
||||
Servo is a prototype web browser engine written in the [Rust](https://github.com/mozilla/rust)
|
||||
language. It is currently developed on 64bit OS X and 64bit Linux.
|
||||
|
@ -36,7 +36,7 @@ cd servo
|
|||
mkdir -p build && cd build
|
||||
../configure
|
||||
make && make check
|
||||
./servo ../src/test/about-mozilla.html
|
||||
./servo ../src/test/html/about-mozilla.html
|
||||
```
|
||||
|
||||
[issue]: https://github.com/mxcl/homebrew/issues/5117
|
||||
|
|
7
configure
vendored
7
configure
vendored
|
@ -449,9 +449,10 @@ do
|
|||
make_dir ${CFG_BUILD_DIR}src/${i}
|
||||
done
|
||||
|
||||
make_dir ${CFG_BUILD_DIR}src/components/servo-util
|
||||
make_dir ${CFG_BUILD_DIR}src/components/servo-net
|
||||
make_dir ${CFG_BUILD_DIR}src/components/servo-gfx
|
||||
make_dir ${CFG_BUILD_DIR}src/components/util
|
||||
make_dir ${CFG_BUILD_DIR}src/components/net
|
||||
make_dir ${CFG_BUILD_DIR}src/components/gfx
|
||||
make_dir ${CFG_BUILD_DIR}src/components/main
|
||||
make_dir src/test/html/ref
|
||||
make_dir src/compiler/rust
|
||||
|
||||
|
|
14
mk/clean.mk
14
mk/clean.mk
|
@ -25,14 +25,14 @@ clean-fast: $(DEPS_CLEAN_TARGETS_FAST) clean-servo
|
|||
$(Q)echo "Cleaning targets:"
|
||||
$(Q)echo "$(filter-out $(SLOW_BUILDS),$(DEPS_CLEAN_ALL))"
|
||||
|
||||
clean-servo-util:
|
||||
cd $(B)/src/components/servo-util/ && rm -rf libservo_util*.dylib $(DONE_servo_util)
|
||||
clean-util:
|
||||
cd $(B)/src/components/util/ && rm -rf libservo_util*.dylib $(DONE_servo_util)
|
||||
|
||||
clean-servo-net:
|
||||
cd $(B)/src/components/servo-net/ && rm -rf libservo_net*.dylib $(DONE_servo_net)
|
||||
clean-net:
|
||||
cd $(B)/src/components/net/ && rm -rf libservo_net*.dylib $(DONE_servo_net)
|
||||
|
||||
clean-servo-gfx:
|
||||
cd $(B)/src/components/servo-gfx/ && rm -rf libservo_gfx*.dylib $(DONE_servo_gfx)
|
||||
clean-gfx:
|
||||
cd $(B)/src/components/gfx/ && rm -rf libservo_gfx*.dylib $(DONE_servo_gfx)
|
||||
|
||||
clean-servo: clean-servo-gfx clean-servo-util clean-servo-net
|
||||
clean-servo: clean-gfx clean-util clean-net
|
||||
rm -f servo servo-test
|
||||
|
|
|
@ -3,12 +3,10 @@ crate or library.
|
|||
|
||||
## Servo components
|
||||
|
||||
* `components/contenttest`: JavaScript test runner.
|
||||
* `components/reftest`: Reference (layout) test runner.
|
||||
* `components/servo`: The top-level Servo crate. Contains compositing, DOM, layout, and script.
|
||||
* `components/servo-gfx`: Graphics rendering, fonts, and text shaping.
|
||||
* `components/servo-net`: Networking, caching, image decoding.
|
||||
* `components/servo-util`: Various utility functions used by other Servo components.
|
||||
* `components/gfx`: Graphics rendering, fonts, and text shaping.
|
||||
* `components/main`: The top-level Servo crate. Contains compositing, DOM, layout, and script.
|
||||
* `components/net`: Networking, caching, image decoding.
|
||||
* `components/util`: Various utility functions used by other Servo components.
|
||||
|
||||
## The Rust compiler
|
||||
|
||||
|
@ -60,9 +58,14 @@ they are designed to be useful in other Rust projects.
|
|||
* `platform/macos/rust-core-text`: Bindings to Core Text.
|
||||
* `platform/macos/rust-io-surface`: Bindings to the `IOSurface` library.
|
||||
|
||||
## Tests
|
||||
|
||||
* `test/harness/contenttest`: JavaScript test runner.
|
||||
* `test/harness/reftest`: Reference (layout) test runner.
|
||||
* `test/html`: Test cases.
|
||||
|
||||
## Miscellaneous
|
||||
|
||||
* `etc`: Various scripts and files that don't belong anywhere else.
|
||||
* `etc/patches`: Patches for upstream libraries.
|
||||
* `test`: Test cases.
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* 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 = "servo_gfx",
|
||||
#[link(name = "gfx",
|
||||
vers = "0.1",
|
||||
uuid = "0106bb54-6ea9-45bf-a39e-a738621f15e5",
|
||||
url = "http://servo.org/")];
|
||||
|
@ -13,8 +13,8 @@ extern mod geom;
|
|||
extern mod http_client;
|
||||
extern mod stb_image;
|
||||
extern mod std;
|
||||
extern mod servo_net;
|
||||
extern mod servo_util (name = "servo_util");
|
||||
extern mod servo_net (name = "net");
|
||||
extern mod servo_util (name = "util");
|
||||
|
||||
// Eventually we would like the shaper to be pluggable, as many operating systems have their own
|
||||
// shapers. For now, however, this is a hard dependency.
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue