refactor library names

sdr-enthusiasts · Apr 19, 2024 · b0422c1 · b0422c1
1 parent 1e1e023
commit b0422c1
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,10 +1,10 @@
 [workspace]
 members = [
     "src/bin/sdre-hub",
+    "src/libraries/libshapi",
+    "src/libraries/libshconfig",
     "src/libraries/libsdrehub",
     "src/libraries/libsdrehubcommon",
-    "src/libraries/sdrehub-api",
-    "src/libraries/sdrehub-config",
 ]
 
 resolver = "2"

diff --git a/src/bin/sdre-hub/Cargo.toml b/src/bin/sdre-hub/Cargo.toml
@@ -15,6 +15,6 @@ keywords.workspace = true
 
 [dependencies]
 libsdrehub = { path = "../../libraries/libsdrehub" }
-sdrehub_api = { path = "../../libraries/sdrehub-api" }
-sdrehub_config = { path = "../../libraries/sdrehub-config" }
+libshapi = { path = "../../libraries/libshapi" }
+libshconfig = { path = "../../libraries/libshconfig" }
 tokio = { version = "1.37.0", features = ["full", "tracing"] }
diff --git a/src/bin/sdre-hub/src/main.rs b/src/bin/sdre-hub/src/main.rs
@@ -13,7 +13,7 @@
 )]
 
 use libsdrehub::SdreHub;
-use sdrehub_config::ShConfig;
+use libshconfig::ShConfig;
 use std::error::Error;
 
 #[tokio::main]

diff --git a/src/libraries/libsdrehub/Cargo.toml b/src/libraries/libsdrehub/Cargo.toml
@@ -18,6 +18,6 @@ keywords.workspace = true
 [dependencies]
 libsdrehubcommon = { path = "../libsdrehubcommon" }
 log = "0.4.21"
-sdrehub_api = { path = "../sdrehub-api" }
-sdrehub_config = { path = "../sdrehub-config" }
+libshapi = { path = "../libshapi" }
+libshconfig = { path = "../libshconfig" }
 tokio = { version = "1.37.0", features = ["full", "tracing"] }
diff --git a/src/libraries/libsdrehub/src/lib.rs b/src/libraries/libsdrehub/src/lib.rs
@@ -26,8 +26,8 @@
 extern crate log;
 
 use libsdrehubcommon::ShDataUserList;
-use sdrehub_api::ShWebServer;
-use sdrehub_config::ShConfig;
+use libshapi::ShWebServer;
+use libshconfig::ShConfig;
 use tokio::task::JoinSet;
 
 pub struct SdreHub {

diff --git a/src/libraries/sdrehub-api/Cargo.toml → src/libraries/libshapi/Cargo.toml b/src/libraries/sdrehub-api/Cargo.toml → src/libraries/libshapi/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sdrehub_api"
+name = "libshapi"
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/src/libraries/sdrehub-api/src/lib.rs → src/libraries/libshapi/src/lib.rs b/src/libraries/sdrehub-api/src/lib.rs → src/libraries/libshapi/src/lib.rs
diff --git a/src/libraries/sdrehub-config/Cargo.toml → src/libraries/libshconfig/Cargo.toml b/src/libraries/sdrehub-config/Cargo.toml → src/libraries/libshconfig/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "sdrehub_config"
+name = "libshconfig"
 version.workspace = true
 edition.workspace = true
 authors.workspace = true

diff --git a/...sdrehub-config/src/acars_router_source.rs → ...es/libshconfig/src/acars_router_source.rs b/...sdrehub-config/src/acars_router_source.rs → ...es/libshconfig/src/acars_router_source.rs
diff --git a/src/libraries/sdrehub-config/src/address.rs → src/libraries/libshconfig/src/address.rs b/src/libraries/sdrehub-config/src/address.rs → src/libraries/libshconfig/src/address.rs
diff --git a/...braries/sdrehub-config/src/adsb_source.rs → src/libraries/libshconfig/src/adsb_source.rs b/...braries/sdrehub-config/src/adsb_source.rs → src/libraries/libshconfig/src/adsb_source.rs
diff --git a/src/libraries/sdrehub-config/src/lib.rs → src/libraries/libshconfig/src/lib.rs b/src/libraries/sdrehub-config/src/lib.rs → src/libraries/libshconfig/src/lib.rs
diff --git a/src/libraries/sdrehub-config/src/map.rs → src/libraries/libshconfig/src/map.rs b/src/libraries/sdrehub-config/src/map.rs → src/libraries/libshconfig/src/map.rs
diff --git a/src/libraries/sdrehub-config/src/sdrehub.rs → src/libraries/libshconfig/src/sdrehub.rs b/src/libraries/sdrehub-config/src/sdrehub.rs → src/libraries/libshconfig/src/sdrehub.rs
diff --git a/src/libraries/sdrehub-config/src/source.rs → src/libraries/libshconfig/src/source.rs b/src/libraries/sdrehub-config/src/source.rs → src/libraries/libshconfig/src/source.rs