First pass at integrating Rust files into the build system

configure.ac

@@ -268,6 +268,13 @@ if test "x$enable_man" = "xyes"; then
 	AC_SUBST([DOXYGEN2MAN])
 fi
 
+# For the Rust bindings
+AC_PATH_PROG([CARGO], [cargo], [notfound])
+AS_IF([test "$CARGO" = "notfound"], [AC_MSG_ERROR([cargo is required])])
+
+AC_PATH_PROG([RUSTC], [rustc], [notfound])
+AS_IF([test "$RUSTC" = "notfound"], [AC_MSG_ERROR([rustc is required])])
+
 # checks for libnozzle
 if test "x$enable_libnozzle" = xyes; then
 	if `echo $host_os | grep -q linux`; then
@@ -301,8 +308,12 @@ AC_SUBST([TESTDIR])
 if test "x${enable_debug}" = xyes; then
 	AC_DEFINE_UNQUOTED([DEBUG], [1], [Compiling Debugging code])
 	OPT_CFLAGS="-O0"
+	OPT_RUSTFLAGS="--debug"
+	RUST_TARGET_DIR="debug"
 else
 	OPT_CFLAGS="-O3"
+	OPT_RUSTFLAGS="--release"
+	RUST_TARGET_DIR="release"
 fi
 
 # gdb flags
@@ -350,6 +361,8 @@ UNWANTED_CFLAGS="-Wno-unused-parameter"
 
 AC_SUBST([AM_CFLAGS],["$SANITIZERS_CFLAGS $OPT_CFLAGS $GDB_FLAGS $DEFAULT_CFLAGS $UNWANTED_CFLAGS"])
 LDFLAGS="$SANITIZERS_LDFLAGS $LDFLAGS"
+AC_SUBST([RUSTFLAGS],["$OPT_RUSTFLAGS"])
+AC_SUBST([RUST_TARGET_DIR],["$RUST_TARGET_DIR"])
 
 AX_PROG_DATE
 AS_IF([test "$ax_cv_prog_date_gnu_date:$ax_cv_prog_date_gnu_utc" = yes:yes],
@@ -397,9 +410,13 @@ AC_CONFIG_FILES([
 		libnozzle/Makefile
 		libnozzle/libnozzle.pc
 		libnozzle/tests/Makefile
+		libnozzle/bindings/rust/Makefile
+		libnozzle/bindings/rust/tests/Makefile
 		libknet/Makefile
 		libknet/libknet.pc
 		libknet/tests/Makefile
+		libknet/bindings/rust/Makefile
+		libknet/bindings/rust/tests/Makefile
 		man/Makefile
 		man/Doxyfile-knet
 		man/Doxyfile-nozzle

libknet/Makefile.am

@@ -15,7 +15,7 @@ SYMFILE			= libknet_exported_syms
 
 EXTRA_DIST		= $(SYMFILE)
 
-SUBDIRS			= . tests
+SUBDIRS			= . tests bindings/rust
 
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 libversion		= 2:0:0

libknet/bindings/rust/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "libknet"
+name = "kronosnet"
 version = "0.1.0"
 authors = ["Christine Caulfield <ccaulfie@redhat.com>"]
 edition = "2018"

libknet/bindings/rust/Makefile.am

@@ -0,0 +1,16 @@
+
+
+EXTRA_DIST = Cargo.toml \
+	regenerate-sys.sh \
+	build.rs \
+	src/libknet.rs \
+	src/lib.rs \
+	src/sys/libknet.rs \
+	src/sys/mod.rs
+
+all-local:
+	cargo build $(RUSTFLAGS)
+
+clean-local:
+	-cargo clean
+

libknet/bindings/rust/tests/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-libknet = { path = ".." }
+kronosnet = { path = ".." }
 
 [[bin]]
 name = "knet-test"

libknet/bindings/rust/tests/Makefile.am

@@ -0,0 +1,19 @@
+
+EXTRA_DIST = Cargo.toml \
+		src/bin/knet-test.rs
+
+check_PROGRAMS = \
+	target/$(RUST_TARGET_DIR)/knet-test
+
+noinst_PROGRAMS = $(check_PROGRAMS)
+
+testsuitedir = $(TESTDIR)
+testsuite_PROGRAMS = $(check_PROGRAMS)
+
+TESTS = $(check_PROGRAMS)
+
+target/$(RUST_TARGET_DIR)/knet-test: src/bin/knet-test.rs
+	cargo build $(RUSTFLAGS)
+
+clean-local:
+	cargo clean

libknet/bindings/rust/tests/src/bin/knet-test.rs

@@ -7,7 +7,7 @@
 // Author: Christine Caulfield (ccaulfi@redhat.com)
 //
 
-use libknet::libknet as knet;
+use kronosnet::libknet as knet;
 use std::net::{SocketAddr, IpAddr,Ipv4Addr};
 use std::thread::spawn;
 use std::sync::mpsc::Receiver;

libnozzle/Makefile.am

@@ -16,7 +16,7 @@ EXTRA_DIST		= $(SYMFILE)
 
 if BUILD_LIBNOZZLE
 
-SUBDIRS			= . tests
+SUBDIRS			= . tests bindings/rust bindings/rust/tests
 
 libversion		= 1:0:0
 

libnozzle/bindings/rust/Makefile.am

@@ -0,0 +1,16 @@
+
+
+EXTRA_DIST = Cargo.toml \
+	build.rs \
+	regenerate-sys.sh \
+	src/libnozzle.rs \
+	src/lib.rs \
+	src/sys/libnozzle.rs \
+	src/sys/mod.rs
+
+all-local:
+	cargo build $(RUSTFLAGS)
+
+clean-local:
+	-cargo clean
+

libnozzle/bindings/rust/tests/Makefile.am

@@ -0,0 +1,21 @@
+
+EXTRA_DIST = Cargo.toml \
+		src/bin/nozzle-test.rs \
+		up.d/tap33
+
+check_PROGRAMS = target/$(RUST_TARGET_DIR)/nozzle-test
+
+noinst_PROGRAMS = $(check_PROGRAMS)
+
+testsuitedir = $(TESTDIR)
+testsuite_PROGRAMS = $(check_PROGRAMS)
+
+TESTS = $(check_PROGRAMS)
+
+noinst_SCRIPTS = up.d/tap33
+
+target/$(RUST_TARGET_DIR)/nozzle-test: src/bin/nozzle-test.rs
+	cargo build $(RUSTFLAGS)
+
+clean-local:
+	cargo clean

libnozzle/bindings/rust/tests/src/bin/nozzle-test.rs

@@ -113,9 +113,8 @@ fn main() -> Result<()>
 	}
     }
 
-
     // Wait a little while in case user wants to check with 'ip' command
-    thread::sleep(time::Duration::from_millis(10000));
+    thread::sleep(time::Duration::from_millis(1000));
 
     if let Err(e) = nozzle::set_down(handle){
 	println!("Error from set_down: {}", e);