gfx: Rename servo-gfx-2 to servo-gfx

2025-08-05 13:40:08 +01:00 · 2012-11-12 12:28:20 -08:00 · 2012-11-12 12:28:20 -08:00 · 7bbff6154c
commit 7bbff6154c
parent 463b80090c
46 changed files with 6 additions and 6 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -133,13 +133,13 @@ $(eval $(call DEF_SUBMODULE_RULES,$(submodule))))
 DONE_SUBMODULES = $(foreach dep,$(DEPS_SUBMODULES),$(DONE_$(dep)))

 RFLAGS_servo_gfx = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES))
-SRC_servo_gfx = $(call rwildcard,$(S)src/servo-gfx-2/,*.rs)
-CRATE_servo_gfx = $(S)src/servo-gfx-2/servo_gfx.rc
-DONE_servo_gfx = $(B)src/servo-gfx-2/libservogfx.dummy
+SRC_servo_gfx = $(call rwildcard,$(S)src/servo-gfx/,*.rs)
+CRATE_servo_gfx = $(S)src/servo-gfx/servo_gfx.rc
+DONE_servo_gfx = $(B)src/servo-gfx/libservogfx.dummy

 DEPS_servo_gfx = $(CRATE_servo_gfx) $(SRC_servo_gfx) $(DONE_SUBMODULES)

-RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/servo-gfx-2
+RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/servo-gfx
 SRC_servo = $(call rwildcard,$(S)src/servo/,*.rs)
 CRATE_servo = $(S)src/servo/servo.rc

--- a/2
+++ b/2
@ -365,7 +365,7 @@ do
    make_dir ${CFG_BUILD_DIR}src/${i}
 done

-make_dir ${CFG_BUILD_DIR}src/servo-gfx-2
+make_dir ${CFG_BUILD_DIR}src/servo-gfx
 make_dir src/test/ref

 # TODO: don't run configure on submodules unless necessary. For an example,
--- a/mk/sub.mk
+++ b/mk/sub.mk
@ -95,7 +95,7 @@ DEPS_rust-cairo += \
 	rust-core-graphics \
 	$(NULL)

-dEPS_rust-io-surface += \
+DEPS_rust-io-surface += \
 	rust-core-foundation \
 	$(NULL)

--- a/src/servo-gfx-2/JosefinSans-SemiBold.ttf
+++ b/src/servo-gfx-2/JosefinSans-SemiBold.ttf
--- a/src/servo-gfx-2/OFL.txt
+++ b/src/servo-gfx-2/OFL.txt
--- a/src/servo-gfx-2/color.rs
+++ b/src/servo-gfx-2/color.rs
--- a/src/servo-gfx-2/compositor.rs
+++ b/src/servo-gfx-2/compositor.rs
--- a/src/servo-gfx-2/display_list.rs
+++ b/src/servo-gfx-2/display_list.rs
--- a/src/servo-gfx-2/font.rs
+++ b/src/servo-gfx-2/font.rs
--- a/src/servo-gfx-2/font_context.rs
+++ b/src/servo-gfx-2/font_context.rs
--- a/src/servo-gfx-2/font_list.rs
+++ b/src/servo-gfx-2/font_list.rs
--- a/src/servo-gfx-2/fontconfig/font_list.rs
+++ b/src/servo-gfx-2/fontconfig/font_list.rs
--- a/src/servo-gfx-2/freetype/font.rs
+++ b/src/servo-gfx-2/freetype/font.rs
--- a/src/servo-gfx-2/freetype/font_context.rs
+++ b/src/servo-gfx-2/freetype/font_context.rs
--- a/src/servo-gfx-2/geometry.rs
+++ b/src/servo-gfx-2/geometry.rs
--- a/src/servo-gfx-2/image/base.rs
+++ b/src/servo-gfx-2/image/base.rs
--- a/src/servo-gfx-2/image/encode/tga.rs
+++ b/src/servo-gfx-2/image/encode/tga.rs
--- a/src/servo-gfx-2/image/holder.rs
+++ b/src/servo-gfx-2/image/holder.rs
--- a/src/servo-gfx-2/image/test.jpeg
+++ b/src/servo-gfx-2/image/test.jpeg
--- a/src/servo-gfx-2/native.rs
+++ b/src/servo-gfx-2/native.rs
--- a/src/servo-gfx-2/opts.rs
+++ b/src/servo-gfx-2/opts.rs
--- a/src/servo-gfx-2/quartz/font.rs
+++ b/src/servo-gfx-2/quartz/font.rs
--- a/src/servo-gfx-2/quartz/font_context.rs
+++ b/src/servo-gfx-2/quartz/font_context.rs
--- a/src/servo-gfx-2/quartz/font_list.rs
+++ b/src/servo-gfx-2/quartz/font_list.rs
--- a/src/servo-gfx-2/render_context.rs
+++ b/src/servo-gfx-2/render_context.rs
--- a/src/servo-gfx-2/render_layers.rs
+++ b/src/servo-gfx-2/render_layers.rs
--- a/src/servo-gfx-2/render_task.rs
+++ b/src/servo-gfx-2/render_task.rs
--- a/src/servo-gfx-2/resource/file_loader.rs
+++ b/src/servo-gfx-2/resource/file_loader.rs
--- a/src/servo-gfx-2/resource/http_loader.rs
+++ b/src/servo-gfx-2/resource/http_loader.rs
--- a/src/servo-gfx-2/resource/image_cache_task.rs
+++ b/src/servo-gfx-2/resource/image_cache_task.rs
--- a/src/servo-gfx-2/resource/local_image_cache.rs
+++ b/src/servo-gfx-2/resource/local_image_cache.rs
--- a/src/servo-gfx-2/resource/resource_task.rs
+++ b/src/servo-gfx-2/resource/resource_task.rs
--- a/src/servo-gfx-2/servo_gfx.rc
+++ b/src/servo-gfx-2/servo_gfx.rc
--- a/src/servo-gfx-2/servo_gfx.rs
+++ b/src/servo-gfx-2/servo_gfx.rs
--- a/src/servo-gfx-2/surface.rs
+++ b/src/servo-gfx-2/surface.rs
--- a/src/servo-gfx-2/text.rs
+++ b/src/servo-gfx-2/text.rs
--- a/src/servo-gfx-2/text/glyph.rs
+++ b/src/servo-gfx-2/text/glyph.rs
--- a/src/servo-gfx-2/text/harfbuzz/shaper.rs
+++ b/src/servo-gfx-2/text/harfbuzz/shaper.rs
--- a/src/servo-gfx-2/text/shaper.rs
+++ b/src/servo-gfx-2/text/shaper.rs
--- a/src/servo-gfx-2/text/text_run.rs
+++ b/src/servo-gfx-2/text/text_run.rs
--- a/src/servo-gfx-2/text/util.rs
+++ b/src/servo-gfx-2/text/util.rs
--- a/src/servo-gfx-2/util/cache.rs
+++ b/src/servo-gfx-2/util/cache.rs
--- a/src/servo-gfx-2/util/range.rs
+++ b/src/servo-gfx-2/util/range.rs
--- a/src/servo-gfx-2/util/time.rs
+++ b/src/servo-gfx-2/util/time.rs
--- a/src/servo-gfx-2/util/url.rs
+++ b/src/servo-gfx-2/util/url.rs
--- a/src/servo-gfx-2/util/vec.rs
+++ b/src/servo-gfx-2/util/vec.rs