cmm: Modularize by isolating tool

Signed-off-by: Nick Spinale <nick@nickspinale.com>
seL4 · Nov 7, 2023 · 5069421 · 5069421
1 parent 00a199c
commit 5069421
Show file tree

Hide file tree

Showing 23 changed files with 10 additions and 4 deletions.
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -6,7 +6,7 @@ Source: http://sel4.systems
 Files:
   Cargo.lock
   support/*.json
-  hacking/cargo-manifest-management/Cargo.lock
+  hacking/cargo-manifest-management/tool/Cargo.lock
   hacking/nix/scope/capdl-tool/capDL-tool.nix
   hacking/nix/scope/capdl-tool/base-compat-0-11-2.nix
   hacking/nix/scope/capdl-tool/base-compat-batteries-0-11-2.nix

diff --git a/hacking/cargo-manifest-management/.gitignore b/hacking/cargo-manifest-management/.gitignore
@@ -4,5 +4,4 @@
 # SPDX-License-Identifier: BSD-2-Clause
 #
 
-/target/
 blueprint.json
diff --git a/hacking/cargo-manifest-management/Makefile b/hacking/cargo-manifest-management/Makefile
@@ -6,7 +6,7 @@
 
 blueprint := blueprint.json
 
-run := cargo run -p manage-cargo-manifests --
+run := cargo run --manifest-path=tool/Cargo.toml -p manage-cargo-manifests --
 
 .PHONY: none
 none:

diff --git a/hacking/cargo-manifest-management/default.nix b/hacking/cargo-manifest-management/default.nix
@@ -9,7 +9,7 @@ rec {
 
   inherit (pkgs) lib;
 
-  makeBlueprint = import ./make-blueprint.nix {
+  makeBlueprint = import ./tool/make-blueprint.nix {
     inherit lib;
   };
 

diff --git a/hacking/cargo-manifest-management/tool/.gitignore b/hacking/cargo-manifest-management/tool/.gitignore
@@ -0,0 +1,7 @@
+#
+# Copyright 2023, Colias Group, LLC
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+
+/target/
diff --git a/hacking/cargo-manifest-management/Cargo.lock → ...cargo-manifest-management/tool/Cargo.lock b/hacking/cargo-manifest-management/Cargo.lock → ...cargo-manifest-management/tool/Cargo.lock
diff --git a/hacking/cargo-manifest-management/Cargo.toml → ...cargo-manifest-management/tool/Cargo.toml b/hacking/cargo-manifest-management/Cargo.toml → ...cargo-manifest-management/tool/Cargo.toml
diff --git a/.../crates/manage-cargo-manifests/Cargo.toml → .../crates/manage-cargo-manifests/Cargo.toml b/.../crates/manage-cargo-manifests/Cargo.toml → .../crates/manage-cargo-manifests/Cargo.toml
diff --git a/...crates/manage-cargo-manifests/src/main.rs → ...crates/manage-cargo-manifests/src/main.rs b/...crates/manage-cargo-manifests/src/main.rs → ...crates/manage-cargo-manifests/src/main.rs
diff --git a/...nagement/crates/toml-normalize/Cargo.toml → ...ent/tool/crates/toml-normalize/Cargo.toml b/...nagement/crates/toml-normalize/Cargo.toml → ...ent/tool/crates/toml-normalize/Cargo.toml
diff --git a/...es/toml-normalize/src/builtin_policies.rs → ...es/toml-normalize/src/builtin_policies.rs b/...es/toml-normalize/src/builtin_policies.rs → ...es/toml-normalize/src/builtin_policies.rs
diff --git a/...ement/crates/toml-normalize/src/format.rs → .../tool/crates/toml-normalize/src/format.rs b/...ement/crates/toml-normalize/src/format.rs → .../tool/crates/toml-normalize/src/format.rs
diff --git a/...nagement/crates/toml-normalize/src/lib.rs → ...ent/tool/crates/toml-normalize/src/lib.rs b/...nagement/crates/toml-normalize/src/lib.rs → ...ent/tool/crates/toml-normalize/src/lib.rs
diff --git a/...agement/crates/toml-normalize/src/main.rs → ...nt/tool/crates/toml-normalize/src/main.rs b/...agement/crates/toml-normalize/src/main.rs → ...nt/tool/crates/toml-normalize/src/main.rs
diff --git a/...ement/crates/toml-normalize/src/policy.rs → .../tool/crates/toml-normalize/src/policy.rs b/...ement/crates/toml-normalize/src/policy.rs → .../tool/crates/toml-normalize/src/policy.rs
diff --git a/...agement/crates/toml-path-regex/Cargo.toml → ...nt/tool/crates/toml-path-regex/Cargo.toml b/...agement/crates/toml-path-regex/Cargo.toml → ...nt/tool/crates/toml-path-regex/Cargo.toml
diff --git a/...ates/toml-path-regex/src/generic_regex.rs → ...ates/toml-path-regex/src/generic_regex.rs b/...ates/toml-path-regex/src/generic_regex.rs → ...ates/toml-path-regex/src/generic_regex.rs
diff --git a/...t/crates/toml-path-regex/src/grammar.pest → ...l/crates/toml-path-regex/src/grammar.pest b/...t/crates/toml-path-regex/src/grammar.pest → ...l/crates/toml-path-regex/src/grammar.pest
diff --git a/...agement/crates/toml-path-regex/src/lib.rs → ...nt/tool/crates/toml-path-regex/src/lib.rs b/...agement/crates/toml-path-regex/src/lib.rs → ...nt/tool/crates/toml-path-regex/src/lib.rs
diff --git a/...ement/crates/toml-path-regex/src/parse.rs → .../tool/crates/toml-path-regex/src/parse.rs b/...ement/crates/toml-path-regex/src/parse.rs → .../tool/crates/toml-path-regex/src/parse.rs
diff --git a/...gement/crates/toml-path-regex/src/path.rs → ...t/tool/crates/toml-path-regex/src/path.rs b/...gement/crates/toml-path-regex/src/path.rs → ...t/tool/crates/toml-path-regex/src/path.rs
diff --git a/...-path-regex/src/path_segment_predicate.rs → ...-path-regex/src/path_segment_predicate.rs b/...-path-regex/src/path_segment_predicate.rs → ...-path-regex/src/path_segment_predicate.rs
diff --git a/...go-manifest-management/make-blueprint.nix → ...nifest-management/tool/make-blueprint.nix b/...go-manifest-management/make-blueprint.nix → ...nifest-management/tool/make-blueprint.nix