From 7bbff6154ccab3b6d36cbc61b497e4e0f56341b8 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 12 Nov 2012 12:28:20 -0800 Subject: [PATCH] gfx: Rename servo-gfx-2 to servo-gfx --- Makefile.in | 8 ++++---- configure | 2 +- mk/sub.mk | 2 +- .../JosefinSans-SemiBold.ttf | Bin src/{servo-gfx-2 => servo-gfx}/OFL.txt | 0 src/{servo-gfx-2 => servo-gfx}/color.rs | 0 src/{servo-gfx-2 => servo-gfx}/compositor.rs | 0 src/{servo-gfx-2 => servo-gfx}/display_list.rs | 0 src/{servo-gfx-2 => servo-gfx}/font.rs | 0 src/{servo-gfx-2 => servo-gfx}/font_context.rs | 0 src/{servo-gfx-2 => servo-gfx}/font_list.rs | 0 .../fontconfig/font_list.rs | 0 src/{servo-gfx-2 => servo-gfx}/freetype/font.rs | 0 .../freetype/font_context.rs | 0 src/{servo-gfx-2 => servo-gfx}/geometry.rs | 0 src/{servo-gfx-2 => servo-gfx}/image/base.rs | 0 src/{servo-gfx-2 => servo-gfx}/image/encode/tga.rs | 0 src/{servo-gfx-2 => servo-gfx}/image/holder.rs | 0 src/{servo-gfx-2 => servo-gfx}/image/test.jpeg | Bin src/{servo-gfx-2 => servo-gfx}/native.rs | 0 src/{servo-gfx-2 => servo-gfx}/opts.rs | 0 src/{servo-gfx-2 => servo-gfx}/quartz/font.rs | 0 .../quartz/font_context.rs | 0 src/{servo-gfx-2 => servo-gfx}/quartz/font_list.rs | 0 src/{servo-gfx-2 => servo-gfx}/render_context.rs | 0 src/{servo-gfx-2 => servo-gfx}/render_layers.rs | 0 src/{servo-gfx-2 => servo-gfx}/render_task.rs | 0 .../resource/file_loader.rs | 0 .../resource/http_loader.rs | 0 .../resource/image_cache_task.rs | 0 .../resource/local_image_cache.rs | 0 .../resource/resource_task.rs | 0 src/{servo-gfx-2 => servo-gfx}/servo_gfx.rc | 0 src/{servo-gfx-2 => servo-gfx}/servo_gfx.rs | 0 src/{servo-gfx-2 => servo-gfx}/surface.rs | 0 src/{servo-gfx-2 => servo-gfx}/text.rs | 0 src/{servo-gfx-2 => servo-gfx}/text/glyph.rs | 0 .../text/harfbuzz/shaper.rs | 0 src/{servo-gfx-2 => servo-gfx}/text/shaper.rs | 0 src/{servo-gfx-2 => servo-gfx}/text/text_run.rs | 0 src/{servo-gfx-2 => servo-gfx}/text/util.rs | 0 src/{servo-gfx-2 => servo-gfx}/util/cache.rs | 0 src/{servo-gfx-2 => servo-gfx}/util/range.rs | 0 src/{servo-gfx-2 => servo-gfx}/util/time.rs | 0 src/{servo-gfx-2 => servo-gfx}/util/url.rs | 0 src/{servo-gfx-2 => servo-gfx}/util/vec.rs | 0 46 files changed, 6 insertions(+), 6 deletions(-) rename src/{servo-gfx-2 => servo-gfx}/JosefinSans-SemiBold.ttf (100%) rename src/{servo-gfx-2 => servo-gfx}/OFL.txt (100%) rename src/{servo-gfx-2 => servo-gfx}/color.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/compositor.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/display_list.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/font.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/font_context.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/font_list.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/fontconfig/font_list.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/freetype/font.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/freetype/font_context.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/geometry.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/image/base.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/image/encode/tga.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/image/holder.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/image/test.jpeg (100%) rename src/{servo-gfx-2 => servo-gfx}/native.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/opts.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/quartz/font.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/quartz/font_context.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/quartz/font_list.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/render_context.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/render_layers.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/render_task.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/resource/file_loader.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/resource/http_loader.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/resource/image_cache_task.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/resource/local_image_cache.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/resource/resource_task.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/servo_gfx.rc (100%) rename src/{servo-gfx-2 => servo-gfx}/servo_gfx.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/surface.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/text.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/text/glyph.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/text/harfbuzz/shaper.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/text/shaper.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/text/text_run.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/text/util.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/util/cache.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/util/range.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/util/time.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/util/url.rs (100%) rename src/{servo-gfx-2 => servo-gfx}/util/vec.rs (100%) diff --git a/Makefile.in b/Makefile.in index f7d5fa4c16d..f2c4be30684 100644 --- 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 diff --git a/configure b/configure index c11398e0f4d..b4231582955 100755 --- a/configure +++ b/configure @@ -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, diff --git a/mk/sub.mk b/mk/sub.mk index b2ff78d9bf7..ac1206fed61 100644 --- 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) diff --git a/src/servo-gfx-2/JosefinSans-SemiBold.ttf b/src/servo-gfx/JosefinSans-SemiBold.ttf similarity index 100% rename from src/servo-gfx-2/JosefinSans-SemiBold.ttf rename to src/servo-gfx/JosefinSans-SemiBold.ttf diff --git a/src/servo-gfx-2/OFL.txt b/src/servo-gfx/OFL.txt similarity index 100% rename from src/servo-gfx-2/OFL.txt rename to src/servo-gfx/OFL.txt diff --git a/src/servo-gfx-2/color.rs b/src/servo-gfx/color.rs similarity index 100% rename from src/servo-gfx-2/color.rs rename to src/servo-gfx/color.rs diff --git a/src/servo-gfx-2/compositor.rs b/src/servo-gfx/compositor.rs similarity index 100% rename from src/servo-gfx-2/compositor.rs rename to src/servo-gfx/compositor.rs diff --git a/src/servo-gfx-2/display_list.rs b/src/servo-gfx/display_list.rs similarity index 100% rename from src/servo-gfx-2/display_list.rs rename to src/servo-gfx/display_list.rs diff --git a/src/servo-gfx-2/font.rs b/src/servo-gfx/font.rs similarity index 100% rename from src/servo-gfx-2/font.rs rename to src/servo-gfx/font.rs diff --git a/src/servo-gfx-2/font_context.rs b/src/servo-gfx/font_context.rs similarity index 100% rename from src/servo-gfx-2/font_context.rs rename to src/servo-gfx/font_context.rs diff --git a/src/servo-gfx-2/font_list.rs b/src/servo-gfx/font_list.rs similarity index 100% rename from src/servo-gfx-2/font_list.rs rename to src/servo-gfx/font_list.rs diff --git a/src/servo-gfx-2/fontconfig/font_list.rs b/src/servo-gfx/fontconfig/font_list.rs similarity index 100% rename from src/servo-gfx-2/fontconfig/font_list.rs rename to src/servo-gfx/fontconfig/font_list.rs diff --git a/src/servo-gfx-2/freetype/font.rs b/src/servo-gfx/freetype/font.rs similarity index 100% rename from src/servo-gfx-2/freetype/font.rs rename to src/servo-gfx/freetype/font.rs diff --git a/src/servo-gfx-2/freetype/font_context.rs b/src/servo-gfx/freetype/font_context.rs similarity index 100% rename from src/servo-gfx-2/freetype/font_context.rs rename to src/servo-gfx/freetype/font_context.rs diff --git a/src/servo-gfx-2/geometry.rs b/src/servo-gfx/geometry.rs similarity index 100% rename from src/servo-gfx-2/geometry.rs rename to src/servo-gfx/geometry.rs diff --git a/src/servo-gfx-2/image/base.rs b/src/servo-gfx/image/base.rs similarity index 100% rename from src/servo-gfx-2/image/base.rs rename to src/servo-gfx/image/base.rs diff --git a/src/servo-gfx-2/image/encode/tga.rs b/src/servo-gfx/image/encode/tga.rs similarity index 100% rename from src/servo-gfx-2/image/encode/tga.rs rename to src/servo-gfx/image/encode/tga.rs diff --git a/src/servo-gfx-2/image/holder.rs b/src/servo-gfx/image/holder.rs similarity index 100% rename from src/servo-gfx-2/image/holder.rs rename to src/servo-gfx/image/holder.rs diff --git a/src/servo-gfx-2/image/test.jpeg b/src/servo-gfx/image/test.jpeg similarity index 100% rename from src/servo-gfx-2/image/test.jpeg rename to src/servo-gfx/image/test.jpeg diff --git a/src/servo-gfx-2/native.rs b/src/servo-gfx/native.rs similarity index 100% rename from src/servo-gfx-2/native.rs rename to src/servo-gfx/native.rs diff --git a/src/servo-gfx-2/opts.rs b/src/servo-gfx/opts.rs similarity index 100% rename from src/servo-gfx-2/opts.rs rename to src/servo-gfx/opts.rs diff --git a/src/servo-gfx-2/quartz/font.rs b/src/servo-gfx/quartz/font.rs similarity index 100% rename from src/servo-gfx-2/quartz/font.rs rename to src/servo-gfx/quartz/font.rs diff --git a/src/servo-gfx-2/quartz/font_context.rs b/src/servo-gfx/quartz/font_context.rs similarity index 100% rename from src/servo-gfx-2/quartz/font_context.rs rename to src/servo-gfx/quartz/font_context.rs diff --git a/src/servo-gfx-2/quartz/font_list.rs b/src/servo-gfx/quartz/font_list.rs similarity index 100% rename from src/servo-gfx-2/quartz/font_list.rs rename to src/servo-gfx/quartz/font_list.rs diff --git a/src/servo-gfx-2/render_context.rs b/src/servo-gfx/render_context.rs similarity index 100% rename from src/servo-gfx-2/render_context.rs rename to src/servo-gfx/render_context.rs diff --git a/src/servo-gfx-2/render_layers.rs b/src/servo-gfx/render_layers.rs similarity index 100% rename from src/servo-gfx-2/render_layers.rs rename to src/servo-gfx/render_layers.rs diff --git a/src/servo-gfx-2/render_task.rs b/src/servo-gfx/render_task.rs similarity index 100% rename from src/servo-gfx-2/render_task.rs rename to src/servo-gfx/render_task.rs diff --git a/src/servo-gfx-2/resource/file_loader.rs b/src/servo-gfx/resource/file_loader.rs similarity index 100% rename from src/servo-gfx-2/resource/file_loader.rs rename to src/servo-gfx/resource/file_loader.rs diff --git a/src/servo-gfx-2/resource/http_loader.rs b/src/servo-gfx/resource/http_loader.rs similarity index 100% rename from src/servo-gfx-2/resource/http_loader.rs rename to src/servo-gfx/resource/http_loader.rs diff --git a/src/servo-gfx-2/resource/image_cache_task.rs b/src/servo-gfx/resource/image_cache_task.rs similarity index 100% rename from src/servo-gfx-2/resource/image_cache_task.rs rename to src/servo-gfx/resource/image_cache_task.rs diff --git a/src/servo-gfx-2/resource/local_image_cache.rs b/src/servo-gfx/resource/local_image_cache.rs similarity index 100% rename from src/servo-gfx-2/resource/local_image_cache.rs rename to src/servo-gfx/resource/local_image_cache.rs diff --git a/src/servo-gfx-2/resource/resource_task.rs b/src/servo-gfx/resource/resource_task.rs similarity index 100% rename from src/servo-gfx-2/resource/resource_task.rs rename to src/servo-gfx/resource/resource_task.rs diff --git a/src/servo-gfx-2/servo_gfx.rc b/src/servo-gfx/servo_gfx.rc similarity index 100% rename from src/servo-gfx-2/servo_gfx.rc rename to src/servo-gfx/servo_gfx.rc diff --git a/src/servo-gfx-2/servo_gfx.rs b/src/servo-gfx/servo_gfx.rs similarity index 100% rename from src/servo-gfx-2/servo_gfx.rs rename to src/servo-gfx/servo_gfx.rs diff --git a/src/servo-gfx-2/surface.rs b/src/servo-gfx/surface.rs similarity index 100% rename from src/servo-gfx-2/surface.rs rename to src/servo-gfx/surface.rs diff --git a/src/servo-gfx-2/text.rs b/src/servo-gfx/text.rs similarity index 100% rename from src/servo-gfx-2/text.rs rename to src/servo-gfx/text.rs diff --git a/src/servo-gfx-2/text/glyph.rs b/src/servo-gfx/text/glyph.rs similarity index 100% rename from src/servo-gfx-2/text/glyph.rs rename to src/servo-gfx/text/glyph.rs diff --git a/src/servo-gfx-2/text/harfbuzz/shaper.rs b/src/servo-gfx/text/harfbuzz/shaper.rs similarity index 100% rename from src/servo-gfx-2/text/harfbuzz/shaper.rs rename to src/servo-gfx/text/harfbuzz/shaper.rs diff --git a/src/servo-gfx-2/text/shaper.rs b/src/servo-gfx/text/shaper.rs similarity index 100% rename from src/servo-gfx-2/text/shaper.rs rename to src/servo-gfx/text/shaper.rs diff --git a/src/servo-gfx-2/text/text_run.rs b/src/servo-gfx/text/text_run.rs similarity index 100% rename from src/servo-gfx-2/text/text_run.rs rename to src/servo-gfx/text/text_run.rs diff --git a/src/servo-gfx-2/text/util.rs b/src/servo-gfx/text/util.rs similarity index 100% rename from src/servo-gfx-2/text/util.rs rename to src/servo-gfx/text/util.rs diff --git a/src/servo-gfx-2/util/cache.rs b/src/servo-gfx/util/cache.rs similarity index 100% rename from src/servo-gfx-2/util/cache.rs rename to src/servo-gfx/util/cache.rs diff --git a/src/servo-gfx-2/util/range.rs b/src/servo-gfx/util/range.rs similarity index 100% rename from src/servo-gfx-2/util/range.rs rename to src/servo-gfx/util/range.rs diff --git a/src/servo-gfx-2/util/time.rs b/src/servo-gfx/util/time.rs similarity index 100% rename from src/servo-gfx-2/util/time.rs rename to src/servo-gfx/util/time.rs diff --git a/src/servo-gfx-2/util/url.rs b/src/servo-gfx/util/url.rs similarity index 100% rename from src/servo-gfx-2/util/url.rs rename to src/servo-gfx/util/url.rs diff --git a/src/servo-gfx-2/util/vec.rs b/src/servo-gfx/util/vec.rs similarity index 100% rename from src/servo-gfx-2/util/vec.rs rename to src/servo-gfx/util/vec.rs