From 5fc1382cebebf4508766d21546392f9437df6a34 Mon Sep 17 00:00:00 2001
From: yukkop <hectic.yukkop@gmail.com>
Date: Thu, 8 Feb 2024 15:23:18 +0100
Subject: [PATCH] ci: some submodule magic

---
 Cargo.toml                                    | 32 +++++++++++++++++++
 crate/bevy_controls/Cargo.toml                | 31 ------------------
 .../script => script}/fetures-clippy.sh       |  7 ++--
 {crate/bevy_controls/src => src}/contract.rs  |  0
 {crate/bevy_controls/src => src}/lib.rs       |  0
 {crate/bevy_controls/src => src}/plugin.rs    |  0
 {crate/bevy_controls/src => src}/resource.rs  |  0
 {crate/bevy_controls/src => src}/util.rs      |  0
 utils                                         |  2 +-
 9 files changed, 38 insertions(+), 34 deletions(-)
 delete mode 100644 crate/bevy_controls/Cargo.toml
 rename {crate/bevy_controls/script => script}/fetures-clippy.sh (94%)
 rename {crate/bevy_controls/src => src}/contract.rs (100%)
 rename {crate/bevy_controls/src => src}/lib.rs (100%)
 rename {crate/bevy_controls/src => src}/plugin.rs (100%)
 rename {crate/bevy_controls/src => src}/resource.rs (100%)
 rename {crate/bevy_controls/src => src}/util.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 37c96ce..8cea379 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,36 @@
+[package]
+name = "bevy_controls"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+default = []
+serialize = ["bevy_input/serialize", "serde"]
+reflect = ["dep:bevy_reflect"]
+inspector-egui = ["reflect", "dep:bevy-inspector-egui"]
+
+[dependencies]
+bevy-inspector-egui = { version = "0.22.1", optional = true }
+bevy_app = "0.12.1"
+bevy_derive = "0.12.1"
+bevy_ecs = "0.12.1"
+bevy_input = "0.12.1"
+bevy_reflect = { version = "0.12.1", optional = true }
+bevy_utils = "0.12.1"
+log = "0.4.20"
+serde = { version = "1.0.194", optional = true }
+strum = "0.25.0"
+strum_macros = "0.25.3"
+
+[dev-dependencies]
+env_logger = "0.10.1"
+
 [workspace]
 resolver = "2"
 members = ["crate/*"]
 exclude = ["example/"]
+
+[[example]]
+name = "basic"
+path = "example/basic/src/main.rs"
+doc-scrape-examples = true
diff --git a/crate/bevy_controls/Cargo.toml b/crate/bevy_controls/Cargo.toml
deleted file mode 100644
index b9a4b9b..0000000
--- a/crate/bevy_controls/Cargo.toml
+++ /dev/null
@@ -1,31 +0,0 @@
-[package]
-name = "bevy_controls"
-version = "0.1.0"
-edition = "2021"
-
-[features]
-default = []
-serialize = ["bevy_input/serialize", "serde"]
-reflect = ["dep:bevy_reflect"]
-inspector-egui = ["reflect", "dep:bevy-inspector-egui"]
-
-[dependencies]
-bevy-inspector-egui = { version = "0.22.1", optional = true }
-bevy_app = "0.12.1"
-bevy_derive = "0.12.1"
-bevy_ecs = "0.12.1"
-bevy_input = "0.12.1"
-bevy_reflect = { version = "0.12.1", optional = true }
-bevy_utils = "0.12.1"
-log = "0.4.20"
-serde = { version = "1.0.194", optional = true }
-strum = "0.25.0"
-strum_macros = "0.25.3"
-
-[dev-dependencies]
-env_logger = "0.10.1"
-
-[[example]]
-name = "basic"
-path = "example/basic/src/main.rs"
-doc-scrape-examples = true
diff --git a/crate/bevy_controls/script/fetures-clippy.sh b/script/fetures-clippy.sh
similarity index 94%
rename from crate/bevy_controls/script/fetures-clippy.sh
rename to script/fetures-clippy.sh
index a9486e8..ce57420 100644
--- a/crate/bevy_controls/script/fetures-clippy.sh
+++ b/script/fetures-clippy.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+CURDIR="$(realpath "$(dirname "$0")")"
+
+. "${CURDIR}/../utils/sh/log.sh"
+log "enable logging"
+
 while [ "$#" -gt 0 ]; do
   case $1 in
     -h|-?|--help|help)
@@ -61,8 +66,6 @@ fi
 features=$(grep '^\[features\]' "$CARGO_PATH" -A99999999 | grep '^\[' -m 2 -B99999999 | grep -v '^\[' | cut -d '=' -f 1 | grep -v 'default')
 num_features=$(echo "$features" | wc -w | tr -d ' ')
 
-
-
 i=1
 while [ $i -le $num_features ]; do
     echo "Generating combinations of size $i"
diff --git a/crate/bevy_controls/src/contract.rs b/src/contract.rs
similarity index 100%
rename from crate/bevy_controls/src/contract.rs
rename to src/contract.rs
diff --git a/crate/bevy_controls/src/lib.rs b/src/lib.rs
similarity index 100%
rename from crate/bevy_controls/src/lib.rs
rename to src/lib.rs
diff --git a/crate/bevy_controls/src/plugin.rs b/src/plugin.rs
similarity index 100%
rename from crate/bevy_controls/src/plugin.rs
rename to src/plugin.rs
diff --git a/crate/bevy_controls/src/resource.rs b/src/resource.rs
similarity index 100%
rename from crate/bevy_controls/src/resource.rs
rename to src/resource.rs
diff --git a/crate/bevy_controls/src/util.rs b/src/util.rs
similarity index 100%
rename from crate/bevy_controls/src/util.rs
rename to src/util.rs
diff --git a/utils b/utils
index 3939c91..66c7b6a 160000
--- a/utils
+++ b/utils
@@ -1 +1 @@
-Subproject commit 3939c913ccb6baded89b8f5853fef394ba9e2550
+Subproject commit 66c7b6aa9d13c851c7f37899b927bab237c5af00