[librsvg: 3/11] Move everything under rust/ one level up in the hierarchy
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 3/11] Move everything under rust/ one level up in the hierarchy
- Date: Fri, 23 Feb 2018 02:26:32 +0000 (UTC)
commit 087073fb09c63d4043c3f5f8154678d352e212fc
Author: Federico Mena Quintero <federico gnome org>
Date: Thu Feb 22 19:25:22 2018 -0600
Move everything under rust/ one level up in the hierarchy
Our toplevel directory will be the crate root.
rust/Cargo.lock => Cargo.lock | 0
rust/Cargo.toml => Cargo.toml | 0
Makefile.am | 97 +++++++++++-----------
rust/cargo-vendor-config => cargo-vendor-config | 0
{rust/rsvg_internals => rsvg_internals}/Cargo.toml | 0
{rust/rsvg_internals => rsvg_internals}/build.rs | 0
.../src/aspect_ratio.rs | 0
.../src/attributes.rs | 0
.../rsvg_internals => rsvg_internals}/src/bbox.rs | 0
.../rsvg_internals => rsvg_internals}/src/chars.rs | 0
.../src/clip_path.rs | 0
.../rsvg_internals => rsvg_internals}/src/cnode.rs | 0
.../rsvg_internals => rsvg_internals}/src/color.rs | 0
.../src/coord_units.rs | 0
.../src/drawing_ctx.rs | 0
.../rsvg_internals => rsvg_internals}/src/error.rs | 0
.../src/gradient.rs | 0
.../src/handle.rs | 0
.../rsvg_internals => rsvg_internals}/src/image.rs | 0
.../src/length.rs | 0
{rust/rsvg_internals => rsvg_internals}/src/lib.rs | 0
.../src/marker.rs | 0
.../rsvg_internals => rsvg_internals}/src/mask.rs | 0
.../rsvg_internals => rsvg_internals}/src/node.rs | 0
.../src/opacity.rs | 0
.../src/paint_server.rs | 0
.../src/parse_transform.lalrpop | 0
.../src/parsers.rs | 0
.../src/path_builder.rs | 0
.../src/path_parser.rs | 0
.../src/pattern.rs | 0
.../src/property_bag.rs | 0
.../src/shapes.rs | 0
.../rsvg_internals => rsvg_internals}/src/space.rs | 0
.../rsvg_internals => rsvg_internals}/src/state.rs | 0
.../rsvg_internals => rsvg_internals}/src/stop.rs | 0
.../src/structure.rs | 0
.../rsvg_internals => rsvg_internals}/src/text.rs | 0
.../src/transform.rs | 0
.../rsvg_internals => rsvg_internals}/src/util.rs | 0
.../src/viewbox.rs | 0
.../src/viewport.rs | 0
42 files changed, 49 insertions(+), 48 deletions(-)
---
diff --git a/rust/Cargo.lock b/Cargo.lock
similarity index 100%
rename from rust/Cargo.lock
rename to Cargo.lock
diff --git a/rust/Cargo.toml b/Cargo.toml
similarity index 100%
rename from rust/Cargo.toml
rename to Cargo.toml
diff --git a/Makefile.am b/Makefile.am
index f8b92c89..fcd4d4d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,48 +63,49 @@ librsvg_@RSVG_API_MAJOR_VERSION@_la_SOURCES = \
librsvg/rsvg.h \
$(NULL)
-RUST_SOURCES = \
- rust/Cargo.toml \
- rust/rsvg_internals/build.rs \
- rust/rsvg_internals/src/aspect_ratio.rs \
- rust/rsvg_internals/src/attributes.rs \
- rust/rsvg_internals/src/bbox.rs \
- rust/rsvg_internals/src/chars.rs \
- rust/rsvg_internals/src/clip_path.rs \
- rust/rsvg_internals/src/cnode.rs \
- rust/rsvg_internals/src/color.rs \
- rust/rsvg_internals/src/coord_units.rs \
- rust/rsvg_internals/src/drawing_ctx.rs \
- rust/rsvg_internals/src/error.rs \
- rust/rsvg_internals/src/gradient.rs \
- rust/rsvg_internals/src/handle.rs \
- rust/rsvg_internals/src/image.rs \
- rust/rsvg_internals/src/length.rs \
- rust/rsvg_internals/src/lib.rs \
- rust/rsvg_internals/src/marker.rs \
- rust/rsvg_internals/src/mask.rs \
- rust/rsvg_internals/src/node.rs \
- rust/rsvg_internals/src/opacity.rs \
- rust/rsvg_internals/src/paint_server.rs \
- rust/rsvg_internals/src/parsers.rs \
- rust/rsvg_internals/src/path_builder.rs \
- rust/rsvg_internals/src/path_parser.rs \
- rust/rsvg_internals/src/pattern.rs \
- rust/rsvg_internals/src/property_bag.rs \
- rust/rsvg_internals/src/shapes.rs \
- rust/rsvg_internals/src/space.rs \
- rust/rsvg_internals/src/state.rs \
- rust/rsvg_internals/src/stop.rs \
- rust/rsvg_internals/src/structure.rs \
- rust/rsvg_internals/src/text.rs \
- rust/rsvg_internals/src/transform.rs \
- rust/rsvg_internals/src/util.rs \
- rust/rsvg_internals/src/viewbox.rs \
- rust/rsvg_internals/src/viewport.rs
+RUST_SRC = \
+ Cargo.toml \
+ rsvg_internals/Cargo.toml \
+ rsvg_internals/build.rs \
+ rsvg_internals/src/aspect_ratio.rs \
+ rsvg_internals/src/attributes.rs \
+ rsvg_internals/src/bbox.rs \
+ rsvg_internals/src/chars.rs \
+ rsvg_internals/src/clip_path.rs \
+ rsvg_internals/src/cnode.rs \
+ rsvg_internals/src/color.rs \
+ rsvg_internals/src/coord_units.rs \
+ rsvg_internals/src/drawing_ctx.rs \
+ rsvg_internals/src/error.rs \
+ rsvg_internals/src/gradient.rs \
+ rsvg_internals/src/handle.rs \
+ rsvg_internals/src/image.rs \
+ rsvg_internals/src/length.rs \
+ rsvg_internals/src/lib.rs \
+ rsvg_internals/src/marker.rs \
+ rsvg_internals/src/mask.rs \
+ rsvg_internals/src/node.rs \
+ rsvg_internals/src/opacity.rs \
+ rsvg_internals/src/paint_server.rs \
+ rsvg_internals/src/parsers.rs \
+ rsvg_internals/src/path_builder.rs \
+ rsvg_internals/src/path_parser.rs \
+ rsvg_internals/src/pattern.rs \
+ rsvg_internals/src/property_bag.rs \
+ rsvg_internals/src/shapes.rs \
+ rsvg_internals/src/space.rs \
+ rsvg_internals/src/state.rs \
+ rsvg_internals/src/stop.rs \
+ rsvg_internals/src/structure.rs \
+ rsvg_internals/src/text.rs \
+ rsvg_internals/src/transform.rs \
+ rsvg_internals/src/util.rs \
+ rsvg_internals/src/viewbox.rs \
+ rsvg_internals/src/viewport.rs
RUST_EXTRA = \
- rust/Cargo.lock \
- rust/cargo-vendor-config
+ Cargo.lock \
+ cargo-vendor-config
if DEBUG_RELEASE
CARGO_RELEASE_ARGS=
@@ -121,25 +122,25 @@ cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY))
cargo_verbose_0 =
cargo_verbose_1 = --verbose
-RUST_LIB=@abs_top_builddir@/rust/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
-CARGO_TARGET_DIR=@abs_top_builddir@/rust/target
+RUST_LIB=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
+CARGO_TARGET_DIR=@abs_top_builddir@/target
check-local:
- cd $(srcdir)/rust && \
+ cd $(srcdir) && \
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo test
clean-local:
- cd $(top_srcdir)/rust && \
+ cd $(top_srcdir) && \
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) cargo clean
dist-hook:
- (cd $(distdir)/rust && \
+ (cd $(distdir) && \
cargo vendor -q && \
mkdir .cargo && \
cp cargo-vendor-config .cargo/config)
-$(RUST_LIB): $(RUST_SOURCES)
- +cd $(top_srcdir)/rust/rsvg_internals && \
+$(RUST_LIB): $(RUST_SRC)
+ +cd $(top_srcdir)/rsvg_internals && \
PKG_CONFIG_ALLOW_CROSS=1 \
PKG_CONFIG='$(PKG_CONFIG)' \
CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \
@@ -238,7 +239,7 @@ dist_doc_DATA = \
code-of-conduct.md
EXTRA_DIST = \
- $(RUST_SOURCES) \
+ $(RUST_SRC) \
$(RUST_EXTRA) \
librsvg.doap \
AUTHORS \
diff --git a/rust/cargo-vendor-config b/cargo-vendor-config
similarity index 100%
rename from rust/cargo-vendor-config
rename to cargo-vendor-config
diff --git a/rust/rsvg_internals/Cargo.toml b/rsvg_internals/Cargo.toml
similarity index 100%
rename from rust/rsvg_internals/Cargo.toml
rename to rsvg_internals/Cargo.toml
diff --git a/rust/rsvg_internals/build.rs b/rsvg_internals/build.rs
similarity index 100%
rename from rust/rsvg_internals/build.rs
rename to rsvg_internals/build.rs
diff --git a/rust/rsvg_internals/src/aspect_ratio.rs b/rsvg_internals/src/aspect_ratio.rs
similarity index 100%
rename from rust/rsvg_internals/src/aspect_ratio.rs
rename to rsvg_internals/src/aspect_ratio.rs
diff --git a/rust/rsvg_internals/src/attributes.rs b/rsvg_internals/src/attributes.rs
similarity index 100%
rename from rust/rsvg_internals/src/attributes.rs
rename to rsvg_internals/src/attributes.rs
diff --git a/rust/rsvg_internals/src/bbox.rs b/rsvg_internals/src/bbox.rs
similarity index 100%
rename from rust/rsvg_internals/src/bbox.rs
rename to rsvg_internals/src/bbox.rs
diff --git a/rust/rsvg_internals/src/chars.rs b/rsvg_internals/src/chars.rs
similarity index 100%
rename from rust/rsvg_internals/src/chars.rs
rename to rsvg_internals/src/chars.rs
diff --git a/rust/rsvg_internals/src/clip_path.rs b/rsvg_internals/src/clip_path.rs
similarity index 100%
rename from rust/rsvg_internals/src/clip_path.rs
rename to rsvg_internals/src/clip_path.rs
diff --git a/rust/rsvg_internals/src/cnode.rs b/rsvg_internals/src/cnode.rs
similarity index 100%
rename from rust/rsvg_internals/src/cnode.rs
rename to rsvg_internals/src/cnode.rs
diff --git a/rust/rsvg_internals/src/color.rs b/rsvg_internals/src/color.rs
similarity index 100%
rename from rust/rsvg_internals/src/color.rs
rename to rsvg_internals/src/color.rs
diff --git a/rust/rsvg_internals/src/coord_units.rs b/rsvg_internals/src/coord_units.rs
similarity index 100%
rename from rust/rsvg_internals/src/coord_units.rs
rename to rsvg_internals/src/coord_units.rs
diff --git a/rust/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
similarity index 100%
rename from rust/rsvg_internals/src/drawing_ctx.rs
rename to rsvg_internals/src/drawing_ctx.rs
diff --git a/rust/rsvg_internals/src/error.rs b/rsvg_internals/src/error.rs
similarity index 100%
rename from rust/rsvg_internals/src/error.rs
rename to rsvg_internals/src/error.rs
diff --git a/rust/rsvg_internals/src/gradient.rs b/rsvg_internals/src/gradient.rs
similarity index 100%
rename from rust/rsvg_internals/src/gradient.rs
rename to rsvg_internals/src/gradient.rs
diff --git a/rust/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
similarity index 100%
rename from rust/rsvg_internals/src/handle.rs
rename to rsvg_internals/src/handle.rs
diff --git a/rust/rsvg_internals/src/image.rs b/rsvg_internals/src/image.rs
similarity index 100%
rename from rust/rsvg_internals/src/image.rs
rename to rsvg_internals/src/image.rs
diff --git a/rust/rsvg_internals/src/length.rs b/rsvg_internals/src/length.rs
similarity index 100%
rename from rust/rsvg_internals/src/length.rs
rename to rsvg_internals/src/length.rs
diff --git a/rust/rsvg_internals/src/lib.rs b/rsvg_internals/src/lib.rs
similarity index 100%
rename from rust/rsvg_internals/src/lib.rs
rename to rsvg_internals/src/lib.rs
diff --git a/rust/rsvg_internals/src/marker.rs b/rsvg_internals/src/marker.rs
similarity index 100%
rename from rust/rsvg_internals/src/marker.rs
rename to rsvg_internals/src/marker.rs
diff --git a/rust/rsvg_internals/src/mask.rs b/rsvg_internals/src/mask.rs
similarity index 100%
rename from rust/rsvg_internals/src/mask.rs
rename to rsvg_internals/src/mask.rs
diff --git a/rust/rsvg_internals/src/node.rs b/rsvg_internals/src/node.rs
similarity index 100%
rename from rust/rsvg_internals/src/node.rs
rename to rsvg_internals/src/node.rs
diff --git a/rust/rsvg_internals/src/opacity.rs b/rsvg_internals/src/opacity.rs
similarity index 100%
rename from rust/rsvg_internals/src/opacity.rs
rename to rsvg_internals/src/opacity.rs
diff --git a/rust/rsvg_internals/src/paint_server.rs b/rsvg_internals/src/paint_server.rs
similarity index 100%
rename from rust/rsvg_internals/src/paint_server.rs
rename to rsvg_internals/src/paint_server.rs
diff --git a/rust/rsvg_internals/src/parse_transform.lalrpop b/rsvg_internals/src/parse_transform.lalrpop
similarity index 100%
rename from rust/rsvg_internals/src/parse_transform.lalrpop
rename to rsvg_internals/src/parse_transform.lalrpop
diff --git a/rust/rsvg_internals/src/parsers.rs b/rsvg_internals/src/parsers.rs
similarity index 100%
rename from rust/rsvg_internals/src/parsers.rs
rename to rsvg_internals/src/parsers.rs
diff --git a/rust/rsvg_internals/src/path_builder.rs b/rsvg_internals/src/path_builder.rs
similarity index 100%
rename from rust/rsvg_internals/src/path_builder.rs
rename to rsvg_internals/src/path_builder.rs
diff --git a/rust/rsvg_internals/src/path_parser.rs b/rsvg_internals/src/path_parser.rs
similarity index 100%
rename from rust/rsvg_internals/src/path_parser.rs
rename to rsvg_internals/src/path_parser.rs
diff --git a/rust/rsvg_internals/src/pattern.rs b/rsvg_internals/src/pattern.rs
similarity index 100%
rename from rust/rsvg_internals/src/pattern.rs
rename to rsvg_internals/src/pattern.rs
diff --git a/rust/rsvg_internals/src/property_bag.rs b/rsvg_internals/src/property_bag.rs
similarity index 100%
rename from rust/rsvg_internals/src/property_bag.rs
rename to rsvg_internals/src/property_bag.rs
diff --git a/rust/rsvg_internals/src/shapes.rs b/rsvg_internals/src/shapes.rs
similarity index 100%
rename from rust/rsvg_internals/src/shapes.rs
rename to rsvg_internals/src/shapes.rs
diff --git a/rust/rsvg_internals/src/space.rs b/rsvg_internals/src/space.rs
similarity index 100%
rename from rust/rsvg_internals/src/space.rs
rename to rsvg_internals/src/space.rs
diff --git a/rust/rsvg_internals/src/state.rs b/rsvg_internals/src/state.rs
similarity index 100%
rename from rust/rsvg_internals/src/state.rs
rename to rsvg_internals/src/state.rs
diff --git a/rust/rsvg_internals/src/stop.rs b/rsvg_internals/src/stop.rs
similarity index 100%
rename from rust/rsvg_internals/src/stop.rs
rename to rsvg_internals/src/stop.rs
diff --git a/rust/rsvg_internals/src/structure.rs b/rsvg_internals/src/structure.rs
similarity index 100%
rename from rust/rsvg_internals/src/structure.rs
rename to rsvg_internals/src/structure.rs
diff --git a/rust/rsvg_internals/src/text.rs b/rsvg_internals/src/text.rs
similarity index 100%
rename from rust/rsvg_internals/src/text.rs
rename to rsvg_internals/src/text.rs
diff --git a/rust/rsvg_internals/src/transform.rs b/rsvg_internals/src/transform.rs
similarity index 100%
rename from rust/rsvg_internals/src/transform.rs
rename to rsvg_internals/src/transform.rs
diff --git a/rust/rsvg_internals/src/util.rs b/rsvg_internals/src/util.rs
similarity index 100%
rename from rust/rsvg_internals/src/util.rs
rename to rsvg_internals/src/util.rs
diff --git a/rust/rsvg_internals/src/viewbox.rs b/rsvg_internals/src/viewbox.rs
similarity index 100%
rename from rust/rsvg_internals/src/viewbox.rs
rename to rsvg_internals/src/viewbox.rs
diff --git a/rust/rsvg_internals/src/viewport.rs b/rsvg_internals/src/viewport.rs
similarity index 100%
rename from rust/rsvg_internals/src/viewport.rs
rename to rsvg_internals/src/viewport.rs
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]