From 50694216c98a954e7c8e05698c801a994a035410 Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Tue, 7 Nov 2023 06:37:18 +0000
Subject: [PATCH] cmm: Modularize by isolating tool

Signed-off-by: Nick Spinale <nick@nickspinale.com>
---
 .reuse/dep5                                                | 2 +-
 hacking/cargo-manifest-management/.gitignore               | 1 -
 hacking/cargo-manifest-management/Makefile                 | 2 +-
 hacking/cargo-manifest-management/default.nix              | 2 +-
 hacking/cargo-manifest-management/tool/.gitignore          | 7 +++++++
 hacking/cargo-manifest-management/{ => tool}/Cargo.lock    | 0
 hacking/cargo-manifest-management/{ => tool}/Cargo.toml    | 0
 .../{ => tool}/crates/manage-cargo-manifests/Cargo.toml    | 0
 .../{ => tool}/crates/manage-cargo-manifests/src/main.rs   | 0
 .../{ => tool}/crates/toml-normalize/Cargo.toml            | 0
 .../crates/toml-normalize/src/builtin_policies.rs          | 0
 .../{ => tool}/crates/toml-normalize/src/format.rs         | 0
 .../{ => tool}/crates/toml-normalize/src/lib.rs            | 0
 .../{ => tool}/crates/toml-normalize/src/main.rs           | 0
 .../{ => tool}/crates/toml-normalize/src/policy.rs         | 0
 .../{ => tool}/crates/toml-path-regex/Cargo.toml           | 0
 .../{ => tool}/crates/toml-path-regex/src/generic_regex.rs | 0
 .../{ => tool}/crates/toml-path-regex/src/grammar.pest     | 0
 .../{ => tool}/crates/toml-path-regex/src/lib.rs           | 0
 .../{ => tool}/crates/toml-path-regex/src/parse.rs         | 0
 .../{ => tool}/crates/toml-path-regex/src/path.rs          | 0
 .../crates/toml-path-regex/src/path_segment_predicate.rs   | 0
 .../{ => tool}/make-blueprint.nix                          | 0
 23 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 hacking/cargo-manifest-management/tool/.gitignore
 rename hacking/cargo-manifest-management/{ => tool}/Cargo.lock (100%)
 rename hacking/cargo-manifest-management/{ => tool}/Cargo.toml (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/manage-cargo-manifests/Cargo.toml (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/manage-cargo-manifests/src/main.rs (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-normalize/Cargo.toml (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-normalize/src/builtin_policies.rs (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-normalize/src/format.rs (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-normalize/src/lib.rs (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-normalize/src/main.rs (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-normalize/src/policy.rs (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-path-regex/Cargo.toml (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-path-regex/src/generic_regex.rs (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-path-regex/src/grammar.pest (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-path-regex/src/lib.rs (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-path-regex/src/parse.rs (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-path-regex/src/path.rs (100%)
 rename hacking/cargo-manifest-management/{ => tool}/crates/toml-path-regex/src/path_segment_predicate.rs (100%)
 rename hacking/cargo-manifest-management/{ => tool}/make-blueprint.nix (100%)

diff --git a/.reuse/dep5 b/.reuse/dep5
index b9ad3ed8b..0051650f8 100644
--- 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
index 92abaa828..9a07fe273 100644
--- 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
index eeda5c320..3d3e1feaf 100644
--- 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
index b2d67730a..ac069c052 100644
--- 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
new file mode 100644
index 000000000..3846a5860
--- /dev/null
+++ 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 b/hacking/cargo-manifest-management/tool/Cargo.lock
similarity index 100%
rename from hacking/cargo-manifest-management/Cargo.lock
rename to hacking/cargo-manifest-management/tool/Cargo.lock
diff --git a/hacking/cargo-manifest-management/Cargo.toml b/hacking/cargo-manifest-management/tool/Cargo.toml
similarity index 100%
rename from hacking/cargo-manifest-management/Cargo.toml
rename to hacking/cargo-manifest-management/tool/Cargo.toml
diff --git a/hacking/cargo-manifest-management/crates/manage-cargo-manifests/Cargo.toml b/hacking/cargo-manifest-management/tool/crates/manage-cargo-manifests/Cargo.toml
similarity index 100%
rename from hacking/cargo-manifest-management/crates/manage-cargo-manifests/Cargo.toml
rename to hacking/cargo-manifest-management/tool/crates/manage-cargo-manifests/Cargo.toml
diff --git a/hacking/cargo-manifest-management/crates/manage-cargo-manifests/src/main.rs b/hacking/cargo-manifest-management/tool/crates/manage-cargo-manifests/src/main.rs
similarity index 100%
rename from hacking/cargo-manifest-management/crates/manage-cargo-manifests/src/main.rs
rename to hacking/cargo-manifest-management/tool/crates/manage-cargo-manifests/src/main.rs
diff --git a/hacking/cargo-manifest-management/crates/toml-normalize/Cargo.toml b/hacking/cargo-manifest-management/tool/crates/toml-normalize/Cargo.toml
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-normalize/Cargo.toml
rename to hacking/cargo-manifest-management/tool/crates/toml-normalize/Cargo.toml
diff --git a/hacking/cargo-manifest-management/crates/toml-normalize/src/builtin_policies.rs b/hacking/cargo-manifest-management/tool/crates/toml-normalize/src/builtin_policies.rs
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-normalize/src/builtin_policies.rs
rename to hacking/cargo-manifest-management/tool/crates/toml-normalize/src/builtin_policies.rs
diff --git a/hacking/cargo-manifest-management/crates/toml-normalize/src/format.rs b/hacking/cargo-manifest-management/tool/crates/toml-normalize/src/format.rs
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-normalize/src/format.rs
rename to hacking/cargo-manifest-management/tool/crates/toml-normalize/src/format.rs
diff --git a/hacking/cargo-manifest-management/crates/toml-normalize/src/lib.rs b/hacking/cargo-manifest-management/tool/crates/toml-normalize/src/lib.rs
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-normalize/src/lib.rs
rename to hacking/cargo-manifest-management/tool/crates/toml-normalize/src/lib.rs
diff --git a/hacking/cargo-manifest-management/crates/toml-normalize/src/main.rs b/hacking/cargo-manifest-management/tool/crates/toml-normalize/src/main.rs
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-normalize/src/main.rs
rename to hacking/cargo-manifest-management/tool/crates/toml-normalize/src/main.rs
diff --git a/hacking/cargo-manifest-management/crates/toml-normalize/src/policy.rs b/hacking/cargo-manifest-management/tool/crates/toml-normalize/src/policy.rs
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-normalize/src/policy.rs
rename to hacking/cargo-manifest-management/tool/crates/toml-normalize/src/policy.rs
diff --git a/hacking/cargo-manifest-management/crates/toml-path-regex/Cargo.toml b/hacking/cargo-manifest-management/tool/crates/toml-path-regex/Cargo.toml
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-path-regex/Cargo.toml
rename to hacking/cargo-manifest-management/tool/crates/toml-path-regex/Cargo.toml
diff --git a/hacking/cargo-manifest-management/crates/toml-path-regex/src/generic_regex.rs b/hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/generic_regex.rs
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-path-regex/src/generic_regex.rs
rename to hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/generic_regex.rs
diff --git a/hacking/cargo-manifest-management/crates/toml-path-regex/src/grammar.pest b/hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/grammar.pest
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-path-regex/src/grammar.pest
rename to hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/grammar.pest
diff --git a/hacking/cargo-manifest-management/crates/toml-path-regex/src/lib.rs b/hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/lib.rs
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-path-regex/src/lib.rs
rename to hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/lib.rs
diff --git a/hacking/cargo-manifest-management/crates/toml-path-regex/src/parse.rs b/hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/parse.rs
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-path-regex/src/parse.rs
rename to hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/parse.rs
diff --git a/hacking/cargo-manifest-management/crates/toml-path-regex/src/path.rs b/hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/path.rs
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-path-regex/src/path.rs
rename to hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/path.rs
diff --git a/hacking/cargo-manifest-management/crates/toml-path-regex/src/path_segment_predicate.rs b/hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/path_segment_predicate.rs
similarity index 100%
rename from hacking/cargo-manifest-management/crates/toml-path-regex/src/path_segment_predicate.rs
rename to hacking/cargo-manifest-management/tool/crates/toml-path-regex/src/path_segment_predicate.rs
diff --git a/hacking/cargo-manifest-management/make-blueprint.nix b/hacking/cargo-manifest-management/tool/make-blueprint.nix
similarity index 100%
rename from hacking/cargo-manifest-management/make-blueprint.nix
rename to hacking/cargo-manifest-management/tool/make-blueprint.nix