From 15660e2c4288f0b8cdedcd670639cbf7e31e99eb Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Sat, 22 Dec 2018 09:31:00 +0800
Subject: [PATCH] Usermode - Initial work on using xargo, not quite working
because it can't handle libstd changing
---
.gitignore | 2 ++
Usermode/Xargo.toml | 6 ++++++
Usermode/filebrowser/Cargo.toml | 9 +++++++++
Usermode/liballoc_system/Cargo.toml | 10 ++++++++++
Usermode/libasync/Cargo.toml | 10 ++++++++++
Usermode/libbyteorder/Cargo.toml | 8 ++++++++
Usermode/libmacros/Cargo.toml | 6 ++++++
Usermode/libstd/Cargo.toml | 11 +++++++++++
Usermode/libstd_io/Cargo.toml | 10 ++++++++++
Usermode/libstd_rt/Cargo.toml | 12 ++++++++++++
Usermode/libstd_sync/Cargo.toml | 11 +++++++++++
Usermode/libsyscalls/Cargo.toml | 6 ++++++
Usermode/libvec_ring/Cargo.toml | 10 ++++++++++
Usermode/libwtk/Cargo.toml | 14 ++++++++++++++
Usermode/loader/Cargo.toml | 17 +++++++++++++++++
15 files changed, 142 insertions(+)
create mode 100644 Usermode/Xargo.toml
create mode 100644 Usermode/filebrowser/Cargo.toml
create mode 100644 Usermode/liballoc_system/Cargo.toml
create mode 100644 Usermode/libasync/Cargo.toml
create mode 100644 Usermode/libbyteorder/Cargo.toml
create mode 100644 Usermode/libmacros/Cargo.toml
create mode 100644 Usermode/libstd/Cargo.toml
create mode 100644 Usermode/libstd_io/Cargo.toml
create mode 100644 Usermode/libstd_rt/Cargo.toml
create mode 100644 Usermode/libstd_sync/Cargo.toml
create mode 100644 Usermode/libsyscalls/Cargo.toml
create mode 100644 Usermode/libvec_ring/Cargo.toml
create mode 100644 Usermode/libwtk/Cargo.toml
create mode 100644 Usermode/loader/Cargo.toml
diff --git a/.gitignore b/.gitignore
index 04583fcf..aa73dbf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
*.tar.gz
*.pyc
+Cargo.lock
/gitstats
/libcore
@@ -18,6 +19,7 @@
/acpica/acpica-*
/externals/crates.io/*
/Screenshots
+/rustc-nightly-src
Graphics/*.rs
Graphics/*.r8
diff --git a/Usermode/Xargo.toml b/Usermode/Xargo.toml
new file mode 100644
index 00000000..a8ecde9e
--- /dev/null
+++ b/Usermode/Xargo.toml
@@ -0,0 +1,6 @@
+[dependencies.alloc]
+stage = 0
+
+#[dependencies.std]
+#path = "libstd"
+#stage = 2
diff --git a/Usermode/filebrowser/Cargo.toml b/Usermode/filebrowser/Cargo.toml
new file mode 100644
index 00000000..dfef6ed7
--- /dev/null
+++ b/Usermode/filebrowser/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "filebrowser"
+version = "0.0.1"
+
+[dependencies]
+wtk = { path = "../libwtk" }
+vec_ring = { path = "../libvec_ring" }
+syscalls = { path = "../libsyscalls" }
+loader = { path = "../loader" }
diff --git a/Usermode/liballoc_system/Cargo.toml b/Usermode/liballoc_system/Cargo.toml
new file mode 100644
index 00000000..f7c2b9e6
--- /dev/null
+++ b/Usermode/liballoc_system/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "alloc_system"
+version = "0.0.1"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+syscalls = { path = "../libsyscalls" }
+std_sync = { path = "../libstd_sync" }
diff --git a/Usermode/libasync/Cargo.toml b/Usermode/libasync/Cargo.toml
new file mode 100644
index 00000000..90b6096c
--- /dev/null
+++ b/Usermode/libasync/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "async"
+version = "0.0.1"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+std = { path = "../libstd" }
+syscalls = { path = "../libsyscalls" }
diff --git a/Usermode/libbyteorder/Cargo.toml b/Usermode/libbyteorder/Cargo.toml
new file mode 100644
index 00000000..78949bc2
--- /dev/null
+++ b/Usermode/libbyteorder/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "byteorder"
+version = "0.0.1"
+
+[dependencies]
+std = { path = "../libstd" }
+
+
diff --git a/Usermode/libmacros/Cargo.toml b/Usermode/libmacros/Cargo.toml
new file mode 100644
index 00000000..47dc8084
--- /dev/null
+++ b/Usermode/libmacros/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+crate-type = "lib"
+name = "macros"
+version = "0.0.1"
+
+
diff --git a/Usermode/libstd/Cargo.toml b/Usermode/libstd/Cargo.toml
new file mode 100644
index 00000000..b23003ff
--- /dev/null
+++ b/Usermode/libstd/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "std"
+version = "0.0.1"
+
+[dependencies]
+std_io = { path = "../libstd_io" }
+std_rt = { path = "../libstd_rt" }
+std_sync = { path = "../libstd_sync" }
+syscalls = { path = "../libsyscalls" }
+macros = { path = "../libmacros" }
+alloc_system = { path = "../liballoc_system" }
diff --git a/Usermode/libstd_io/Cargo.toml b/Usermode/libstd_io/Cargo.toml
new file mode 100644
index 00000000..fd0b1091
--- /dev/null
+++ b/Usermode/libstd_io/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "std_io"
+version = "0.0.1"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+syscalls = { path = "../libsyscalls" }
+macros = { path = "../libmacros" }
diff --git a/Usermode/libstd_rt/Cargo.toml b/Usermode/libstd_rt/Cargo.toml
new file mode 100644
index 00000000..8f1df4be
--- /dev/null
+++ b/Usermode/libstd_rt/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+crate-type = "lib"
+name = "std_rt"
+version = "0.0.1"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+syscalls = { path = "../libsyscalls" }
+macros = { path = "../libmacros" }
+
diff --git a/Usermode/libstd_sync/Cargo.toml b/Usermode/libstd_sync/Cargo.toml
new file mode 100644
index 00000000..1b7b4efd
--- /dev/null
+++ b/Usermode/libstd_sync/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "std_sync"
+version = "0.0.1"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+syscalls = { path = "../libsyscalls" }
+
+
diff --git a/Usermode/libsyscalls/Cargo.toml b/Usermode/libsyscalls/Cargo.toml
new file mode 100644
index 00000000..1633ada4
--- /dev/null
+++ b/Usermode/libsyscalls/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "syscalls"
+version = "0.0.1"
+
+[lib]
+path = "lib.rs"
diff --git a/Usermode/libvec_ring/Cargo.toml b/Usermode/libvec_ring/Cargo.toml
new file mode 100644
index 00000000..13978813
--- /dev/null
+++ b/Usermode/libvec_ring/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "vec_ring"
+version = "0.0.1"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+
+std = { path = "../libstd" }
diff --git a/Usermode/libwtk/Cargo.toml b/Usermode/libwtk/Cargo.toml
new file mode 100644
index 00000000..f86ce3e5
--- /dev/null
+++ b/Usermode/libwtk/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "wtk"
+version = "0.0.1"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+syscalls = { path = "../libsyscalls" }
+macros = { path = "../libmacros" }
+async = { path = "../libasync" }
+byteorder = { path = "../libbyteorder" }
+
+std = { path = "../libstd" }
diff --git a/Usermode/loader/Cargo.toml b/Usermode/loader/Cargo.toml
new file mode 100644
index 00000000..1abf89e3
--- /dev/null
+++ b/Usermode/loader/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "loader"
+version = "0.0.1"
+
+[[bin]]
+name = "loader"
+path = "src/main.rs"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+std = { path = "../libstd" }
+std_rt = { path = "../libstd_rt" }
+syscalls = { path = "../libsyscalls" }
+byteorder = { path = "../libbyteorder" }
+cmdline_words_parser = { path = "../../externals/crates.io/cmdline_words_parser" }
--
GitLab