Reorganize

Cargo.toml

@@ -13,11 +13,11 @@ members = ["crt0"]
 [dependencies]
 compiler_builtins = { git = "https://github.com/rust-lang-nursery/compiler-builtins.git", default-features = false, features = ["mem"] }
 platform = { path = "platform" }
-fcntl = { path = "fcntl" }
-stdio = { path = "stdio" }
-stdlib = { path = "stdlib" }
-string = { path = "string" }
-unistd = { path = "unistd" }
+fcntl = { path = "src/fcntl" }
+stdio = { path = "src/stdio" }
+stdlib = { path = "src/stdlib" }
+string = { path = "src/string" }
+unistd = { path = "src/unistd" }
 
 [profile.dev]
 panic = "abort"

fcntl/Cargo.toml → src/fcntl/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Jeremy Soller <jackpot51@gmail.com>"]
 build = "build.rs"
 
 [build-dependencies]
-cbindgen = { path = "../cbindgen" }
+cbindgen = { path = "../../cbindgen" }
 
 [dependencies]
-platform = { path = "../platform" }
+platform = { path = "../../platform" }

stdlib/build.rs → src/fcntl/build.rs

@@ -4,8 +4,8 @@ use std::{env, fs};
 
 fn main() {
     let crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set");
-    fs::create_dir_all("../target/include").expect("failed to create include directory");
+    fs::create_dir_all("../../target/include").expect("failed to create include directory");
     cbindgen::generate(crate_dir)
       .expect("failed to generate bindings")
-      .write_to_file("../target/include/stdlib.h");
+      .write_to_file("../../target/include/fcntl.h");
 }

stdio/Cargo.toml → src/stdio/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["Jeremy Soller <jackpot51@gmail.com>"]
 build = "build.rs"
 
 [build-dependencies]
-cbindgen = { path = "../cbindgen" }
+cbindgen = { path = "../../cbindgen" }
 
 [dependencies]
-platform = { path = "../platform" }
+platform = { path = "../../platform" }
 va_list = { version = "0.1", features = ["no_std"] }

fcntl/build.rs → src/stdio/build.rs

@@ -4,8 +4,8 @@ use std::{env, fs};
 
 fn main() {
     let crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set");
-    fs::create_dir_all("../target/include").expect("failed to create include directory");
+    fs::create_dir_all("../../target/include").expect("failed to create include directory");
     cbindgen::generate(crate_dir)
       .expect("failed to generate bindings")
-      .write_to_file("../target/include/fcntl.h");
+      .write_to_file("../../target/include/stdio.h");
 }

stdlib/Cargo.toml → src/stdlib/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["Jeremy Soller <jackpot51@gmail.com>"]
 build = "build.rs"
 
 [build-dependencies]
-cbindgen = { path = "../cbindgen" }
+cbindgen = { path = "../../cbindgen" }
 
 [dependencies]
-platform = { path = "../platform" }
-ralloc = { path = "../ralloc", default-features = false }
+platform = { path = "../../platform" }
+ralloc = { path = "../../ralloc", default-features = false }

string/build.rs → src/stdlib/build.rs

@@ -4,8 +4,8 @@ use std::{env, fs};
 
 fn main() {
     let crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set");
-    fs::create_dir_all("../target/include").expect("failed to create include directory");
+    fs::create_dir_all("../../target/include").expect("failed to create include directory");
     cbindgen::generate(crate_dir)
       .expect("failed to generate bindings")
-      .write_to_file("../target/include/string.h");
+      .write_to_file("../../target/include/stdlib.h");
 }

string/Cargo.toml → src/string/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Jeremy Soller <jackpot51@gmail.com>"]
 build = "build.rs"
 
 [build-dependencies]
-cbindgen = { path = "../cbindgen" }
+cbindgen = { path = "../../cbindgen" }
 
 [dependencies]
-platform = { path = "../platform" }
+platform = { path = "../../platform" }

stdio/build.rs → src/string/build.rs

@@ -4,8 +4,8 @@ use std::{env, fs};
 
 fn main() {
     let crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set");
-    fs::create_dir_all("../target/include").expect("failed to create include directory");
+    fs::create_dir_all("../../target/include").expect("failed to create include directory");
     cbindgen::generate(crate_dir)
       .expect("failed to generate bindings")
-      .write_to_file("../target/include/stdio.h");
+      .write_to_file("../../target/include/string.h");
 }

unistd/Cargo.toml → src/unistd/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Jeremy Soller <jackpot51@gmail.com>"]
 build = "build.rs"
 
 [build-dependencies]
-cbindgen = { path = "../cbindgen" }
+cbindgen = { path = "../../cbindgen" }
 
 [dependencies]
-platform = { path = "../platform" }
+platform = { path = "../../platform" }

src/unistd/build.rs

@@ -0,0 +1,11 @@
+extern crate cbindgen;
+
+use std::{env, fs};
+
+fn main() {
+    let crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set");
+    fs::create_dir_all("../../target/include").expect("failed to create include directory");
+    cbindgen::generate(crate_dir)
+      .expect("failed to generate bindings")
+      .write_to_file("../../target/include/unistd.h");
+}

unistd/build.rs

@@ -1,11 +0,0 @@
-extern crate cbindgen;
-
-use std::{env, fs};
-
-fn main() {
-    let crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set");
-    fs::create_dir_all("../target/include").expect("failed to create include directory");
-    cbindgen::generate(crate_dir)
-      .expect("failed to generate bindings")
-      .write_to_file("../target/include/unistd.h");
-}