[librsvg: 1/11] Initial switch to a cargo workspace.

From: Federico Mena Quintero <federico src gnome org>
To: commits-list gnome org
Cc:
Subject: [librsvg: 1/11] Initial switch to a cargo workspace.
Date: Fri, 23 Feb 2018 02:26:22 +0000 (UTC)
commit fd214c48d20a97ae7f99d3b5979011edd6010919
Author: Jordan Petridis <jordanpetridis protonmail com>
Date:   Sat Feb 10 01:33:17 2018 +0200

    Initial switch to a cargo workspace.

 Makefile.am                                        | 78 +++++++++++-----------
 rust/Cargo.lock                                    |  6 +-
 rust/Cargo.toml                                    | 53 ++-------------
 rust/rsvg_internals/Cargo.toml                     | 51 ++++++++++++++
 rust/{ => rsvg_internals}/build.rs                 |  0
 rust/{ => rsvg_internals}/src/aspect_ratio.rs      |  0
 rust/{ => rsvg_internals}/src/attributes.rs        |  0
 rust/{ => rsvg_internals}/src/bbox.rs              |  0
 rust/{ => rsvg_internals}/src/chars.rs             |  0
 rust/{ => rsvg_internals}/src/clip_path.rs         |  0
 rust/{ => rsvg_internals}/src/cnode.rs             |  0
 rust/{ => rsvg_internals}/src/color.rs             |  0
 rust/{ => rsvg_internals}/src/coord_units.rs       |  0
 rust/{ => rsvg_internals}/src/drawing_ctx.rs       |  0
 rust/{ => rsvg_internals}/src/error.rs             |  0
 rust/{ => rsvg_internals}/src/gradient.rs          |  0
 rust/{ => rsvg_internals}/src/handle.rs            |  0
 rust/{ => rsvg_internals}/src/image.rs             |  0
 rust/{ => rsvg_internals}/src/length.rs            |  0
 rust/{ => rsvg_internals}/src/lib.rs               |  0
 rust/{ => rsvg_internals}/src/marker.rs            |  0
 rust/{ => rsvg_internals}/src/mask.rs              |  0
 rust/{ => rsvg_internals}/src/node.rs              |  0
 rust/{ => rsvg_internals}/src/opacity.rs           |  0
 rust/{ => rsvg_internals}/src/paint_server.rs      |  0
 .../src/parse_transform.lalrpop                    |  0
 rust/{ => rsvg_internals}/src/parsers.rs           |  0
 rust/{ => rsvg_internals}/src/path_builder.rs      |  0
 rust/{ => rsvg_internals}/src/path_parser.rs       |  0
 rust/{ => rsvg_internals}/src/pattern.rs           |  0
 rust/{ => rsvg_internals}/src/property_bag.rs      |  0
 rust/{ => rsvg_internals}/src/shapes.rs            |  0
 rust/{ => rsvg_internals}/src/space.rs             |  0
 rust/{ => rsvg_internals}/src/state.rs             |  0
 rust/{ => rsvg_internals}/src/stop.rs              |  0
 rust/{ => rsvg_internals}/src/structure.rs         |  0
 rust/{ => rsvg_internals}/src/text.rs              |  0
 rust/{ => rsvg_internals}/src/transform.rs         |  0
 rust/{ => rsvg_internals}/src/util.rs              |  0
 rust/{ => rsvg_internals}/src/viewbox.rs           |  0
 rust/{ => rsvg_internals}/src/viewport.rs          |  0
 41 files changed, 97 insertions(+), 91 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ff5d817e..83a4c42f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,44 +63,44 @@ librsvg_@RSVG_API_MAJOR_VERSION@_la_SOURCES = \
        rsvg.h                  \
        $(NULL)
 
-RUST_SOURCES =                                 \
-       rust/Cargo.toml                         \
-       rust/build.rs                           \
-       rust/src/aspect_ratio.rs                \
-       rust/src/attributes.rs                  \
-       rust/src/bbox.rs                        \
-       rust/src/chars.rs                       \
-       rust/src/clip_path.rs                   \
-       rust/src/cnode.rs                       \
-       rust/src/color.rs                       \
-       rust/src/coord_units.rs                 \
-       rust/src/drawing_ctx.rs                 \
-       rust/src/error.rs                       \
-       rust/src/gradient.rs                    \
-       rust/src/handle.rs                      \
-       rust/src/image.rs                       \
-       rust/src/length.rs                      \
-       rust/src/lib.rs                         \
-       rust/src/marker.rs                      \
-       rust/src/mask.rs                        \
-       rust/src/node.rs                        \
-       rust/src/opacity.rs                     \
-       rust/src/paint_server.rs                \
-       rust/src/parsers.rs                     \
-       rust/src/path_builder.rs                \
-       rust/src/path_parser.rs                 \
-       rust/src/pattern.rs                     \
-       rust/src/property_bag.rs                \
-       rust/src/shapes.rs                      \
-       rust/src/space.rs                       \
-       rust/src/state.rs                       \
-       rust/src/stop.rs                        \
-       rust/src/structure.rs                   \
-       rust/src/text.rs                        \
-       rust/src/transform.rs                   \
-       rust/src/util.rs                        \
-       rust/src/viewbox.rs                     \
-       rust/src/viewport.rs
+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_EXTRA =                                   \
        rust/Cargo.lock                         \
@@ -139,7 +139,7 @@ dist-hook:
        cp cargo-vendor-config .cargo/config)
 
 $(RUST_LIB): $(RUST_SOURCES)
-       +cd $(top_srcdir)/rust &&                                               \
+       +cd $(top_srcdir)/rust/rsvg_internals &&                                \
        PKG_CONFIG_ALLOW_CROSS=1                                                \
        PKG_CONFIG='$(PKG_CONFIG)'                                              \
        CARGO_TARGET_DIR=$(CARGO_TARGET_DIR)                                    \
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index f9179c55..fdcd65b4 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -268,7 +268,7 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index";
 dependencies = [
  "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -300,7 +300,7 @@ dependencies = [
  "pango-sys 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_codegen 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -421,7 +421,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index";
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = 
"7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = 
"15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
 "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
-"checksum regex 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = 
"744554e01ccbd98fff8c457c3b092cd67af62a555a43bfe97ae8a0451f7799fa"
+"checksum regex 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = 
"5be5347bde0c48cfd8c3fdc0766cdfe9d8a755ef84d620d6794c778c91de8b2b"
 "checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
 "checksum siphasher 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = 
"0df90a788073e8d0235a67e50441d47db7c8ad9debd91cbf43736a2a92d36537"
 "checksum smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = 
"44db0ecb22921ef790d17ae13a3f6d15784183ff5f2a01aa32098c7498d2b4b9"
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index ad20a0d9..78b4fd69 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -1,52 +1,7 @@
-[package]
-name = "rsvg_internals"
-version = "0.0.1"
-authors = ["Federico Mena Quintero <federico gnome org>"]
-build = "build.rs"
-
-[build-dependencies]
-phf_codegen = "0.7.21"
-
-[dependencies]
-libc = "0.2"
-downcast-rs = "^1.0.0"
-regex = "^0.2.1"
-itertools = "0.7.4"
-pango = "0.3.0"
-pango-sys = "0.5.0"
-cssparser = "0.23"
-lazy_static = "1.0.0"
-phf = "0.7.21"
-
-[dependencies.cairo-sys-rs]
-version = "0.5.0"
-#git = "https://github.com/gtk-rs/cairo.git";
-#branch = "master"
-#git = "https://github.com/federicomenaquintero/cairo.git";
-#branch = "matrix-try-invert"
-#git = "file:///home/federico/src/gtk-rs/cairo"
-#features = ["png"]
-
-[dependencies.cairo-rs]
-version = "0.3.0"
-#git = "https://github.com/gtk-rs/cairo.git";
-#branch = "master"
-#git = "file:///home/federico/src/gtk-rs/cairo"
-#features = ["png"]
-
-[dependencies.glib]
-version = "0.4.0"
-#git = "https://github.com/gtk-rs/glib.git";
-#branch = "master"
-
-[dependencies.glib-sys]
-version = "0.5.0"
-#git = "https://github.com/gtk-rs/sys";
-#branch = "master"
-
-[lib]
-name = "rsvg_internals"
-crate-type = ["staticlib"]
+[workspace]
+members = [
+    "rsvg_internals",
+]
 
 [profile.release]
 lto = true
diff --git a/rust/rsvg_internals/Cargo.toml b/rust/rsvg_internals/Cargo.toml
new file mode 100644
index 00000000..980070ae
--- /dev/null
+++ b/rust/rsvg_internals/Cargo.toml
@@ -0,0 +1,51 @@
+[package]
+name = "rsvg_internals"
+version = "0.0.1"
+authors = ["Federico Mena Quintero <federico gnome org>"]
+workspace = "../"
+build = "build.rs"
+
+[build-dependencies]
+phf_codegen = "0.7.21"
+
+[dependencies]
+libc = "0.2"
+downcast-rs = "^1.0.0"
+regex = "^0.2.1"
+itertools = "0.7.4"
+pango = "0.3.0"
+pango-sys = "0.5.0"
+cssparser = "0.23"
+lazy_static = "1.0.0"
+phf = "0.7.21"
+
+[dependencies.cairo-sys-rs]
+version = "0.5.0"
+#git = "https://github.com/gtk-rs/cairo.git";
+#branch = "master"
+#git = "https://github.com/federicomenaquintero/cairo.git";
+#branch = "matrix-try-invert"
+#git = "file:///home/federico/src/gtk-rs/cairo"
+#features = ["png"]
+
+[dependencies.cairo-rs]
+version = "0.3.0"
+#git = "https://github.com/gtk-rs/cairo.git";
+#branch = "master"
+#git = "file:///home/federico/src/gtk-rs/cairo"
+#features = ["png"]
+
+[dependencies.glib]
+version = "0.4.0"
+#git = "https://github.com/gtk-rs/glib.git";
+#branch = "master"
+
+[dependencies.glib-sys]
+version = "0.5.0"
+#git = "https://github.com/gtk-rs/sys";
+#branch = "master"
+
+[lib]
+name = "rsvg_internals"
+crate-type = ["staticlib"]
+
diff --git a/rust/build.rs b/rust/rsvg_internals/build.rs
similarity index 100%
rename from rust/build.rs
rename to rust/rsvg_internals/build.rs
diff --git a/rust/src/aspect_ratio.rs b/rust/rsvg_internals/src/aspect_ratio.rs
similarity index 100%
rename from rust/src/aspect_ratio.rs
rename to rust/rsvg_internals/src/aspect_ratio.rs
diff --git a/rust/src/attributes.rs b/rust/rsvg_internals/src/attributes.rs
similarity index 100%
rename from rust/src/attributes.rs
rename to rust/rsvg_internals/src/attributes.rs
diff --git a/rust/src/bbox.rs b/rust/rsvg_internals/src/bbox.rs
similarity index 100%
rename from rust/src/bbox.rs
rename to rust/rsvg_internals/src/bbox.rs
diff --git a/rust/src/chars.rs b/rust/rsvg_internals/src/chars.rs
similarity index 100%
rename from rust/src/chars.rs
rename to rust/rsvg_internals/src/chars.rs
diff --git a/rust/src/clip_path.rs b/rust/rsvg_internals/src/clip_path.rs
similarity index 100%
rename from rust/src/clip_path.rs
rename to rust/rsvg_internals/src/clip_path.rs
diff --git a/rust/src/cnode.rs b/rust/rsvg_internals/src/cnode.rs
similarity index 100%
rename from rust/src/cnode.rs
rename to rust/rsvg_internals/src/cnode.rs
diff --git a/rust/src/color.rs b/rust/rsvg_internals/src/color.rs
similarity index 100%
rename from rust/src/color.rs
rename to rust/rsvg_internals/src/color.rs
diff --git a/rust/src/coord_units.rs b/rust/rsvg_internals/src/coord_units.rs
similarity index 100%
rename from rust/src/coord_units.rs
rename to rust/rsvg_internals/src/coord_units.rs
diff --git a/rust/src/drawing_ctx.rs b/rust/rsvg_internals/src/drawing_ctx.rs
similarity index 100%
rename from rust/src/drawing_ctx.rs
rename to rust/rsvg_internals/src/drawing_ctx.rs
diff --git a/rust/src/error.rs b/rust/rsvg_internals/src/error.rs
similarity index 100%
rename from rust/src/error.rs
rename to rust/rsvg_internals/src/error.rs
diff --git a/rust/src/gradient.rs b/rust/rsvg_internals/src/gradient.rs
similarity index 100%
rename from rust/src/gradient.rs
rename to rust/rsvg_internals/src/gradient.rs
diff --git a/rust/src/handle.rs b/rust/rsvg_internals/src/handle.rs
similarity index 100%
rename from rust/src/handle.rs
rename to rust/rsvg_internals/src/handle.rs
diff --git a/rust/src/image.rs b/rust/rsvg_internals/src/image.rs
similarity index 100%
rename from rust/src/image.rs
rename to rust/rsvg_internals/src/image.rs
diff --git a/rust/src/length.rs b/rust/rsvg_internals/src/length.rs
similarity index 100%
rename from rust/src/length.rs
rename to rust/rsvg_internals/src/length.rs
diff --git a/rust/src/lib.rs b/rust/rsvg_internals/src/lib.rs
similarity index 100%
rename from rust/src/lib.rs
rename to rust/rsvg_internals/src/lib.rs
diff --git a/rust/src/marker.rs b/rust/rsvg_internals/src/marker.rs
similarity index 100%
rename from rust/src/marker.rs
rename to rust/rsvg_internals/src/marker.rs
diff --git a/rust/src/mask.rs b/rust/rsvg_internals/src/mask.rs
similarity index 100%
rename from rust/src/mask.rs
rename to rust/rsvg_internals/src/mask.rs
diff --git a/rust/src/node.rs b/rust/rsvg_internals/src/node.rs
similarity index 100%
rename from rust/src/node.rs
rename to rust/rsvg_internals/src/node.rs
diff --git a/rust/src/opacity.rs b/rust/rsvg_internals/src/opacity.rs
similarity index 100%
rename from rust/src/opacity.rs
rename to rust/rsvg_internals/src/opacity.rs
diff --git a/rust/src/paint_server.rs b/rust/rsvg_internals/src/paint_server.rs
similarity index 100%
rename from rust/src/paint_server.rs
rename to rust/rsvg_internals/src/paint_server.rs
diff --git a/rust/src/parse_transform.lalrpop b/rust/rsvg_internals/src/parse_transform.lalrpop
similarity index 100%
rename from rust/src/parse_transform.lalrpop
rename to rust/rsvg_internals/src/parse_transform.lalrpop
diff --git a/rust/src/parsers.rs b/rust/rsvg_internals/src/parsers.rs
similarity index 100%
rename from rust/src/parsers.rs
rename to rust/rsvg_internals/src/parsers.rs
diff --git a/rust/src/path_builder.rs b/rust/rsvg_internals/src/path_builder.rs
similarity index 100%
rename from rust/src/path_builder.rs
rename to rust/rsvg_internals/src/path_builder.rs
diff --git a/rust/src/path_parser.rs b/rust/rsvg_internals/src/path_parser.rs
similarity index 100%
rename from rust/src/path_parser.rs
rename to rust/rsvg_internals/src/path_parser.rs
diff --git a/rust/src/pattern.rs b/rust/rsvg_internals/src/pattern.rs
similarity index 100%
rename from rust/src/pattern.rs
rename to rust/rsvg_internals/src/pattern.rs
diff --git a/rust/src/property_bag.rs b/rust/rsvg_internals/src/property_bag.rs
similarity index 100%
rename from rust/src/property_bag.rs
rename to rust/rsvg_internals/src/property_bag.rs
diff --git a/rust/src/shapes.rs b/rust/rsvg_internals/src/shapes.rs
similarity index 100%
rename from rust/src/shapes.rs
rename to rust/rsvg_internals/src/shapes.rs
diff --git a/rust/src/space.rs b/rust/rsvg_internals/src/space.rs
similarity index 100%
rename from rust/src/space.rs
rename to rust/rsvg_internals/src/space.rs
diff --git a/rust/src/state.rs b/rust/rsvg_internals/src/state.rs
similarity index 100%
rename from rust/src/state.rs
rename to rust/rsvg_internals/src/state.rs
diff --git a/rust/src/stop.rs b/rust/rsvg_internals/src/stop.rs
similarity index 100%
rename from rust/src/stop.rs
rename to rust/rsvg_internals/src/stop.rs
diff --git a/rust/src/structure.rs b/rust/rsvg_internals/src/structure.rs
similarity index 100%
rename from rust/src/structure.rs
rename to rust/rsvg_internals/src/structure.rs
diff --git a/rust/src/text.rs b/rust/rsvg_internals/src/text.rs
similarity index 100%
rename from rust/src/text.rs
rename to rust/rsvg_internals/src/text.rs
diff --git a/rust/src/transform.rs b/rust/rsvg_internals/src/transform.rs
similarity index 100%
rename from rust/src/transform.rs
rename to rust/rsvg_internals/src/transform.rs
diff --git a/rust/src/util.rs b/rust/rsvg_internals/src/util.rs
similarity index 100%
rename from rust/src/util.rs
rename to rust/rsvg_internals/src/util.rs
diff --git a/rust/src/viewbox.rs b/rust/rsvg_internals/src/viewbox.rs
similarity index 100%
rename from rust/src/viewbox.rs
rename to rust/rsvg_internals/src/viewbox.rs
diff --git a/rust/src/viewport.rs b/rust/rsvg_internals/src/viewport.rs
similarity index 100%
rename from rust/src/viewport.rs
rename to rust/rsvg_internals/src/viewport.rs
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]