From: Jason Ish <jason.ish@oisf.net>
Date: Fri, 17 Dec 2021 22:28:56 +0000 (-0600)
Subject: rust: rename to suricata (from suricata_rust)
X-Git-Tag: suricata-7.0.0-beta1~1080
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbd5e6402bfadb9f0013b4de8daf98529780a248;p=thirdparty%2Fsuricata.git

rust: rename to suricata (from suricata_rust)

Rename the Rust lib to simply "suricata" instead of "suricata_rust".
This allows Rust plugin/library code to use it under the name "suricata"
which is what should be expected.

The name was only "suricata_rust" to prevent on-disk conflict with the C
code, so just rename the file on disk, which doesn't affect how the code
is interacted with from an API layer.
---

diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in
index 6febd4c532..0987651203 100644
--- a/rust/Cargo.toml.in
+++ b/rust/Cargo.toml.in
@@ -9,7 +9,7 @@ members = [".", "./derive"]
 [lib]
 crate-type = ["staticlib", "rlib"]
 path = "@e_rustdir@/src/lib.rs"
-name = "suricata_rust"
+name = "suricata"
 
 [profile.release]
 debug = true
diff --git a/rust/Makefile.am b/rust/Makefile.am
index aa2b571789..854377f5de 100644
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -45,8 +45,12 @@ else
 		$(CARGO) build $(RELEASE) $(NIGHTLY_ARGS) \
 			--features "$(RUST_FEATURES)" $(RUST_TARGET)
 endif
-	if test -e $(RUST_SURICATA_LIBDIR)/suricata_rust.lib; then \
-		cp $(RUST_SURICATA_LIBDIR)/suricata_rust.lib \
+	if test -e $(RUST_SURICATA_LIBDIR)/suricata.lib; then \
+		cp -a $(RUST_SURICATA_LIBDIR)/suricata.lib \
+			$(RUST_SURICATA_LIBDIR)/${RUST_SURICATA_LIBNAME}; \
+	fi
+	if test -e $(RUST_SURICATA_LIBDIR)/libsuricata.a; then \
+		cp -a $(RUST_SURICATA_LIBDIR)/libsuricata.a \
 			$(RUST_SURICATA_LIBDIR)/${RUST_SURICATA_LIBNAME}; \
 	fi
 	$(MAKE) gen/rust-bindings.h