Reorganize rust file tree

Place all rust code under samba/rust, similar to
how we organize python code in the samba tree.

Signed-off-by: David Mulder <dmulder@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

himmelblaud/wscript_build

@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_RUST_BINARY('himmelblaud',
-                      source='src/main.rs param/src/lib.rs chelps/src/lib.rs dbg/src/lib.rs ntstatus_gen/src/lib.rs sock/src/lib.rs tdb/src/lib.rs version/src/lib.rs')
-
-bld.RECURSE('nss')
-bld.RECURSE('pam')

rust/Cargo.toml

@@ -0,0 +1,23 @@
+[workspace.package]
+edition = "2021"
+license = "GPL-3.0-or-later"
+homepage = "https://www.samba.org/"
+version = "4.21.0"
+
+[workspace]
+resolver = "2"
+members = [
+  "chelps", "dbg", "himmelblaud", "idmap",
+  "nss", "ntstatus_gen", "pam",
+  "param", "sock", "tdb", "version",
+]
+
+[workspace.dependencies]
+param = { path = "param" }
+dbg = { path = "dbg" }
+chelps = { path = "chelps" }
+sock = { path = "sock" }
+ntstatus_gen = { path = "ntstatus_gen" }
+tdb = { path = "tdb" }
+idmap = { path = "idmap" }
+libc = "0.2.155"

rust/himmelblaud/Cargo.toml

@@ -1,9 +1,3 @@
-[workspace.package]
-edition = "2021"
-license = "GPL-3.0-or-later"
-homepage = "https://www.samba.org/"
-version = "4.21.0"
-
 [package]
 name = "himmelblaud"
 edition.workspace = true
@@ -31,21 +25,4 @@ idmap = { workspace = true }
 libc = { workspace = true }
 
 [build-dependencies]
-version = { path = "version" }
+version = { path = "../version" }
-
-[workspace]
-members = [
-  "chelps", "dbg", "idmap",
-  "nss", "ntstatus_gen", "pam",
-  "param", "sock", "tdb", "version",
-]
-
-[workspace.dependencies]
-param = { path = "param" }
-dbg = { path = "dbg" }
-chelps = { path = "chelps" }
-sock = { path = "sock" }
-ntstatus_gen = { path = "ntstatus_gen" }
-tdb = { path = "tdb" }
-idmap = { path = "idmap" }
-libc = "0.2.155"

rust/himmelblaud/wscript_build

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+import os
+
+bld.SAMBA_RUST_BINARY('himmelblaud',
+                      source='src/main.rs ../param/src/lib.rs ../chelps/src/lib.rs ../dbg/src/lib.rs ../ntstatus_gen/src/lib.rs ../sock/src/lib.rs ../tdb/src/lib.rs ../version/src/lib.rs')

rust/wscript_build

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+
+bld.RECURSE('himmelblaud')
+bld.RECURSE('nss')
+bld.RECURSE('pam')

wscript_build

@@ -155,7 +155,7 @@ bld.RECURSE('dfs_server')
 bld.RECURSE('file_server')
 bld.RECURSE('lib/krb5_wrap')
 bld.RECURSE('packaging')
-bld.RECURSE('himmelblaud')
+bld.RECURSE('rust')
 
 bld.RECURSE('testsuite/headers')