diff --git a/Cargo.lock b/Cargo.lock index d329b0c9ef..3ecbfa7830 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6,17 +6,6 @@ dependencies = [ "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "arpainet" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "errno 0.1.0", - "netinet 0.1.0", - "platform 0.1.0", - "sys_socket 0.1.0", -] - [[package]] name = "atty" version = "0.2.10" @@ -79,28 +68,7 @@ source = "git+https://github.com/rust-lang-nursery/compiler-builtins.git#5d370bb name = "crt0" version = "0.1.0" dependencies = [ - "platform 0.1.0", - "stdio 0.1.0", -] - -[[package]] -name = "ctype" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "dirent" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "errno 0.1.0", - "fcntl 0.1.0", - "platform 0.1.0", - "stdio 0.1.0", - "unistd 0.1.0", + "relibc 0.1.0", ] [[package]] @@ -108,47 +76,6 @@ name = "dtoa" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "errno" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "fcntl" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "fenv" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "float" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "fenv 0.1.0", - "platform 0.1.0", -] - -[[package]] -name = "fnmatch" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - [[package]] name = "fuchsia-zircon" version = "0.3.3" @@ -163,34 +90,6 @@ name = "fuchsia-zircon-sys" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "grp" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "in_h" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", - "sys_socket 0.1.0", -] - -[[package]] -name = "inttypes" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "ctype 0.1.0", - "errno 0.1.0", - "platform 0.1.0", - "stdlib 0.1.0", -] - [[package]] name = "itoa" version = "0.4.2" @@ -198,10 +97,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lazy_static" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "spin 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -209,14 +109,6 @@ name = "libc" version = "0.2.42" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "locale" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - [[package]] name = "log" version = "0.3.9" @@ -233,23 +125,6 @@ dependencies = [ "cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "netinet" -version = "0.1.0" -dependencies = [ - "in_h 0.1.0", -] - -[[package]] -name = "platform" -version = "0.1.0" -dependencies = [ - "ralloc 1.0.0", - "redox_syscall 0.1.40 (git+https://gitlab.redox-os.org/redox-os/syscall.git?branch=relibc)", - "sc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "spin 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "proc-macro2" version = "0.2.3" @@ -258,16 +133,6 @@ dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "pwd" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "errno 0.1.0", - "fcntl 0.1.0", - "platform 0.1.0", -] - [[package]] name = "quote" version = "0.3.15" @@ -301,7 +166,7 @@ dependencies = [ [[package]] name = "rand" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -334,46 +199,15 @@ dependencies = [ name = "relibc" version = "0.1.0" dependencies = [ - "arpainet 0.1.0", "cc 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", "compiler_builtins 0.1.0 (git+https://github.com/rust-lang-nursery/compiler-builtins.git)", - "ctype 0.1.0", - "dirent 0.1.0", - "errno 0.1.0", - "fcntl 0.1.0", - "fenv 0.1.0", - "float 0.1.0", - "fnmatch 0.1.0", - "grp 0.1.0", - "inttypes 0.1.0", - "locale 0.1.0", - "netinet 0.1.0", - "platform 0.1.0", - "pwd 0.1.0", - "semaphore 0.1.0", - "setjmp 0.1.0", - "signal 0.1.0", - "stdio 0.1.0", - "stdlib 0.1.0", - "string 0.1.0", - "strings 0.1.0", - "sys_ioctl 0.1.0", - "sys_mman 0.1.0", - "sys_resource 0.1.0", - "sys_select 0.1.0", - "sys_socket 0.1.0", - "sys_stat 0.1.0", - "sys_time 0.1.0", - "sys_times 0.1.0", - "sys_un 0.1.0", - "sys_utsname 0.1.0", - "sys_wait 0.1.0", - "termios 0.1.0", - "time 0.1.0", - "unistd 0.1.0", - "utime 0.1.0", - "wchar 0.1.0", - "wctype 0.1.0", + "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ralloc 1.0.0", + "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.40 (git+https://gitlab.redox-os.org/redox-os/syscall.git?branch=relibc)", + "sc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "spin 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)", + "va_list 0.1.0", ] [[package]] @@ -389,14 +223,6 @@ name = "sc" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "semaphore" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - [[package]] name = "serde" version = "1.0.70" @@ -434,22 +260,9 @@ dependencies = [ "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "setjmp" -version = "0.1.0" - -[[package]] -name = "signal" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "errno 0.1.0", - "platform 0.1.0", -] - [[package]] name = "spin" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -470,53 +283,6 @@ dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "stdio" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "errno 0.1.0", - "fcntl 0.1.0", - "lazy_static 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "platform 0.1.0", - "string 0.1.0", - "va_list 0.1.0", -] - -[[package]] -name = "stdlib" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "ctype 0.1.0", - "errno 0.1.0", - "fcntl 0.1.0", - "platform 0.1.0", - "rand 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", - "string 0.1.0", - "time 0.1.0", - "unistd 0.1.0", - "wchar 0.1.0", -] - -[[package]] -name = "string" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "errno 0.1.0", - "platform 0.1.0", - "signal 0.1.0", -] - -[[package]] -name = "strings" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - [[package]] name = "strsim" version = "0.7.0" @@ -540,98 +306,6 @@ dependencies = [ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "sys_ioctl" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "sys_mman" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "sys_resource" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", - "sys_time 0.1.0", -] - -[[package]] -name = "sys_select" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "sys_socket" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "sys_stat" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "fcntl 0.1.0", - "platform 0.1.0", -] - -[[package]] -name = "sys_time" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "sys_times" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "sys_un" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", - "sys_socket 0.1.0", -] - -[[package]] -name = "sys_utsname" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - -[[package]] -name = "sys_wait" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", - "sys_resource 0.1.0", -] - [[package]] name = "tempdir" version = "0.3.7" @@ -651,14 +325,6 @@ dependencies = [ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "termios" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - [[package]] name = "textwrap" version = "0.10.0" @@ -667,15 +333,6 @@ dependencies = [ "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "time" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "errno 0.1.0", - "platform 0.1.0", -] - [[package]] name = "toml" version = "0.4.6" @@ -704,26 +361,6 @@ name = "unicode-xid" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "unistd" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "errno 0.1.0", - "platform 0.1.0", - "stdio 0.1.0", - "string 0.1.0", - "sys_time 0.1.0", -] - -[[package]] -name = "utime" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] - [[package]] name = "va_list" version = "0.1.0" @@ -744,24 +381,9 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "wchar" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "errno 0.1.0", - "platform 0.1.0", - "stdio 0.1.0", - "time 0.1.0", - "va_list 0.1.0", -] - -[[package]] -name = "wctype" -version = "0.1.0" -dependencies = [ - "cbindgen 0.5.2", - "platform 0.1.0", -] +name = "version_check" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi" @@ -794,14 +416,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" "checksum itoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5adb58558dcd1d786b5f0bd15f3226ee23486e24b7b58304b60f64dc68e62606" -"checksum lazy_static 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fb497c35d362b6a331cfd94956a07fc2c78a4604cdbee844a81170386b996dd3" +"checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7" "checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" "checksum log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "61bd98ae7f7b754bc53dca7d44b604f733c6bba044ea6f41bc8d89272d8161d2" "checksum proc-macro2 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0" "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5" -"checksum rand 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "12397506224b2f93e6664ffc4f664b29be8208e5157d3d90b44f09b5fae470ea" +"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" "checksum rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "edecf0f94da5551fc9b492093e30b041a891657db7940ee221f9d2f66e82eef2" "checksum redox_syscall 0.1.40 (git+https://gitlab.redox-os.org/redox-os/syscall.git?branch=relibc)" = "" "checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1" @@ -812,7 +434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum serde_derive 1.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "652bc323d694dc925829725ec6c890156d8e70ae5202919869cb00fe2eff3788" "checksum serde_derive_internals 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "32f1926285523b2db55df263d2aa4eb69ddcfa7a7eade6430323637866b513ab" "checksum serde_json 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c6908c7b925cd6c590358a4034de93dbddb20c45e1d021931459fd419bf0e2" -"checksum spin 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14db77c5b914df6d6173dda9a3b3f5937bd802934fa5edaf934df06a3491e56f" +"checksum spin 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "37b5646825922b96b5d7d676b5bb3458a54498e96ed7b0ce09dc43a07038fea4" "checksum standalone-quote 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dcedac1d6d98e7e9d1d6e628f5635af9566688ae5f6cea70a3976f495ae8d839" "checksum standalone-syn 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "115808f5187c07c23cb93eee49d542fae54c6e8285d3a24c6ff683fcde9243db" "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" @@ -827,6 +449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +"checksum version_check 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7716c242968ee87e5542f8021178248f267f295a5c4803beae8b8b7fd9bc6051" "checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/Cargo.toml b/Cargo.toml index 41e6711aec..0736e52eeb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,56 +8,33 @@ name = "c" crate-type = ["staticlib"] [workspace] -members = ["src/crt0"] +members = ["src/crt0", "cbindgen"] [build-dependencies] cc = "1.0.17" [dependencies] -arpainet = { path = "src/arpainet" } -ctype = { path = "src/ctype" } -dirent = { path = "src/dirent" } -errno = { path = "src/errno" } -fcntl = { path = "src/fcntl" } -fenv = { path = "src/fenv" } -float = { path = "src/float" } -fnmatch = { path = "src/fnmatch" } -grp = { path = "src/grp" } -inttypes = { path = "src/inttypes" } -locale = { path = "src/locale" } -netinet = { path = "src/netinet" } -platform = { path = "src/platform" } -pwd = { path = "src/pwd" } -semaphore = { path = "src/semaphore" } -setjmp = { path = "src/setjmp" } -signal = { path = "src/signal" } -stdio = { path = "src/stdio" } -stdlib = { path = "src/stdlib" } -string = { path = "src/string" } -strings = { path = "src/strings" } -sys_ioctl = { path = "src/sys_ioctl" } -sys_mman = { path = "src/sys_mman" } -sys_resource = { path = "src/sys_resource" } -sys_select = { path = "src/sys_select" } -sys_socket = { path = "src/sys_socket" } -sys_stat = { path = "src/sys_stat" } -sys_time = { path = "src/sys_time" } -sys_times = { path = "src/sys_times" } -sys_un = { path = "src/sys_un" } -sys_utsname = { path = "src/sys_utsname" } -sys_wait = { path = "src/sys_wait" } -termios = { path = "src/termios" } -time = { path = "src/time" } -unistd = { path = "src/unistd" } -utime = { path = "src/utime" } -wchar = { path = "src/wchar" } -wctype = { path = "src/wctype" } +lazy_static = { version = "*", features = ["nightly", "spin_no_std"] } +rand = { version = "0.5.2", default-features = false } +va_list = { path = "va_list", features = ["no_std"] } [dependencies.compiler_builtins] git = "https://github.com/rust-lang-nursery/compiler-builtins.git" default-features = false features = ["no-lang-items", "mangled-names"] +[dependencies.ralloc] +path = "ralloc" +default-features = false +optional = true + +[target.'cfg(target_os = "linux")'.dependencies] +sc = "0.2" + +[target.'cfg(target_os = "redox")'.dependencies] +redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall.git", branch = "relibc" } +spin = "0.4" + [profile.dev] panic = "abort" diff --git a/Makefile b/Makefile index 25aef80ebe..c30f02b7db 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,11 @@ install: all cp -rv "openlibm/src"/*.h "$(DESTDIR)/include" cp -v "$(BUILD)/openlibm/libopenlibm.a" "$(DESTDIR)/lib/libm.a" +header: + mkdir -p header + ./header.sh + touch header + libc: $(BUILD)/release/libc.a $(BUILD)/release/crt0.o libm: $(BUILD)/openlibm/libopenlibm.a diff --git a/build.rs b/build.rs index 8f61a6d4b2..345db4fc47 100644 --- a/build.rs +++ b/build.rs @@ -1,22 +1,22 @@ extern crate cc; -use std::env; +// use std::env; fn main() { - let crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set"); - - cc::Build::new() - .flag("-nostdinc") - .flag("-nostdlib") - .flag("-I") - .flag(&format!("{}/include", crate_dir)) - .flag("-fno-stack-protector") - .file("src/c/dlmalloc.c") - .file("src/c/fcntl.c") - .file("src/c/stack_chk.c") - .file("src/c/stdio.c") - .file("src/c/unistd.c") - .compile("relibc_c"); + // let crate_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set"); + // + // cc::Build::new() + // .flag("-nostdinc") + // .flag("-nostdlib") + // .flag("-I") + // .flag(&format!("{}/include", crate_dir)) + // .flag("-fno-stack-protector") + // .file("src/c/dlmalloc.c") + // .file("src/c/fcntl.c") + // .file("src/c/stack_chk.c") + // .file("src/c/stdio.c") + // .file("src/c/unistd.c") + // .compile("relibc_c"); println!("cargo:rustc-link-lib=static=relibc_c"); } diff --git a/header.sh b/header.sh new file mode 100755 index 0000000000..2c835809c2 --- /dev/null +++ b/header.sh @@ -0,0 +1,16 @@ +#!/usr/bin/env bash + +set -ex + +header="$(realpath header)" +cbindgen="$(realpath cbindgen)" + +for config in src/header/*/cbindgen.toml +do + dir="$(dirname "$config")" + name="$(basename "$dir")" + pushd "$dir" + cargo run --release --manifest-path "$cbindgen/Cargo.toml" -- \ + -c cbindgen.toml -o "$header/$name.h" mod.rs + popd +done diff --git a/src/arpainet/Cargo.toml b/src/arpainet/Cargo.toml deleted file mode 100644 index 5a01556751..0000000000 --- a/src/arpainet/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "arpainet" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } -errno = { path = "../errno" } -sys_socket = { path = "../sys_socket" } -netinet = { path = "../netinet" } diff --git a/src/arpainet/build.rs b/src/arpainet/build.rs deleted file mode 100644 index ad73b43495..0000000000 --- a/src/arpainet/build.rs +++ /dev/null @@ -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/arpa/inet.h"); -} diff --git a/src/crt0/Cargo.toml b/src/crt0/Cargo.toml index 9133360068..9b6c91a2bf 100644 --- a/src/crt0/Cargo.toml +++ b/src/crt0/Cargo.toml @@ -8,5 +8,4 @@ name = "crt0" crate-type = ["staticlib"] [dependencies] -platform = { path = "../platform" } -stdio = { path = "../stdio" } +relibc = { path = "../.." } diff --git a/src/crt0/src/lib.rs b/src/crt0/src/lib.rs index 02db0186d4..fa788eebbb 100644 --- a/src/crt0/src/lib.rs +++ b/src/crt0/src/lib.rs @@ -9,8 +9,10 @@ #![feature(lang_items)] extern crate alloc; -extern crate platform; -extern crate stdio; +extern crate relibc; + +use relibc::platform; +use relibc::header::stdio; use alloc::Vec; use core::ptr; diff --git a/src/ctype/Cargo.toml b/src/ctype/Cargo.toml deleted file mode 100644 index f8f98d9295..0000000000 --- a/src/ctype/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "ctype" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/ctype/build.rs b/src/ctype/build.rs deleted file mode 100644 index 9b1ee3aecb..0000000000 --- a/src/ctype/build.rs +++ /dev/null @@ -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/ctype.h"); -} diff --git a/src/dirent/Cargo.toml b/src/dirent/Cargo.toml deleted file mode 100644 index fb799207a8..0000000000 --- a/src/dirent/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "dirent" -version = "0.1.0" -authors = ["jD91mZM2 "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -errno = { path = "../errno" } -fcntl = { path = "../fcntl" } -platform = { path = "../platform" } -stdio = { path = "../stdio" } -unistd = { path = "../unistd" } diff --git a/src/dirent/build.rs b/src/dirent/build.rs deleted file mode 100644 index 252c1648cb..0000000000 --- a/src/dirent/build.rs +++ /dev/null @@ -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/dirent.h"); -} diff --git a/src/errno/Cargo.toml b/src/errno/Cargo.toml deleted file mode 100644 index cfaaad8465..0000000000 --- a/src/errno/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "errno" -version = "0.1.0" -authors = ["Alex Lyon "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/errno/build.rs b/src/errno/build.rs deleted file mode 100644 index 5de392d433..0000000000 --- a/src/errno/build.rs +++ /dev/null @@ -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/errno.h"); -} diff --git a/src/fcntl/Cargo.toml b/src/fcntl/Cargo.toml deleted file mode 100644 index c2b0198c38..0000000000 --- a/src/fcntl/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "fcntl" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/fcntl/build.rs b/src/fcntl/build.rs deleted file mode 100644 index fb1647837e..0000000000 --- a/src/fcntl/build.rs +++ /dev/null @@ -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/fcntl.h"); -} diff --git a/src/fenv/Cargo.toml b/src/fenv/Cargo.toml deleted file mode 100644 index ed3b2142f1..0000000000 --- a/src/fenv/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "fenv" -version = "0.1.0" -authors = ["Dan Robertson "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/fenv/build.rs b/src/fenv/build.rs deleted file mode 100644 index a79287ee76..0000000000 --- a/src/fenv/build.rs +++ /dev/null @@ -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/fenv.h"); -} diff --git a/src/float/Cargo.toml b/src/float/Cargo.toml deleted file mode 100644 index 3ae7acb3fe..0000000000 --- a/src/float/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "float" -version = "0.1.0" -authors = ["Dan Robertson "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } -fenv = { path = "../fenv" } diff --git a/src/float/build.rs b/src/float/build.rs deleted file mode 100644 index e9b224fd13..0000000000 --- a/src/float/build.rs +++ /dev/null @@ -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/float.h"); -} diff --git a/src/fnmatch/Cargo.toml b/src/fnmatch/Cargo.toml deleted file mode 100644 index 9d9a891de3..0000000000 --- a/src/fnmatch/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "fnmatch" -version = "0.1.0" -authors = ["jD91mZM2 "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/fnmatch/build.rs b/src/fnmatch/build.rs deleted file mode 100644 index 2b6e70c118..0000000000 --- a/src/fnmatch/build.rs +++ /dev/null @@ -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/fnmatch.h"); -} diff --git a/src/grp/Cargo.toml b/src/grp/Cargo.toml deleted file mode 100644 index d9eb91db9e..0000000000 --- a/src/grp/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "grp" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/grp/build.rs b/src/grp/build.rs deleted file mode 100644 index 196206d6c4..0000000000 --- a/src/grp/build.rs +++ /dev/null @@ -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/grp.h"); -} diff --git a/src/template/cbindgen.toml b/src/header/_template/cbindgen.toml similarity index 100% rename from src/template/cbindgen.toml rename to src/header/_template/cbindgen.toml diff --git a/src/template/src/lib.rs b/src/header/_template/mod.rs similarity index 100% rename from src/template/src/lib.rs rename to src/header/_template/mod.rs diff --git a/src/todo/aio/lib.rs b/src/header/_todo/aio/lib.rs similarity index 100% rename from src/todo/aio/lib.rs rename to src/header/_todo/aio/lib.rs diff --git a/src/todo/oldlib/dns/answer.rs b/src/header/_todo/oldlib/dns/answer.rs similarity index 100% rename from src/todo/oldlib/dns/answer.rs rename to src/header/_todo/oldlib/dns/answer.rs diff --git a/src/todo/oldlib/dns/mod.rs b/src/header/_todo/oldlib/dns/mod.rs similarity index 100% rename from src/todo/oldlib/dns/mod.rs rename to src/header/_todo/oldlib/dns/mod.rs diff --git a/src/todo/oldlib/dns/query.rs b/src/header/_todo/oldlib/dns/query.rs similarity index 100% rename from src/todo/oldlib/dns/query.rs rename to src/header/_todo/oldlib/dns/query.rs diff --git a/src/todo/oldlib/event.rs b/src/header/_todo/oldlib/event.rs similarity index 100% rename from src/todo/oldlib/event.rs rename to src/header/_todo/oldlib/event.rs diff --git a/src/todo/oldlib/file.rs b/src/header/_todo/oldlib/file.rs similarity index 100% rename from src/todo/oldlib/file.rs rename to src/header/_todo/oldlib/file.rs diff --git a/src/todo/oldlib/folder.rs b/src/header/_todo/oldlib/folder.rs similarity index 100% rename from src/todo/oldlib/folder.rs rename to src/header/_todo/oldlib/folder.rs diff --git a/src/todo/oldlib/hostname.rs b/src/header/_todo/oldlib/hostname.rs similarity index 100% rename from src/todo/oldlib/hostname.rs rename to src/header/_todo/oldlib/hostname.rs diff --git a/src/todo/oldlib/lib.rs b/src/header/_todo/oldlib/lib.rs similarity index 100% rename from src/todo/oldlib/lib.rs rename to src/header/_todo/oldlib/lib.rs diff --git a/src/todo/oldlib/macros.rs b/src/header/_todo/oldlib/macros.rs similarity index 100% rename from src/todo/oldlib/macros.rs rename to src/header/_todo/oldlib/macros.rs diff --git a/src/todo/oldlib/mallocnull.rs b/src/header/_todo/oldlib/mallocnull.rs similarity index 100% rename from src/todo/oldlib/mallocnull.rs rename to src/header/_todo/oldlib/mallocnull.rs diff --git a/src/todo/oldlib/netdb.rs b/src/header/_todo/oldlib/netdb.rs similarity index 100% rename from src/todo/oldlib/netdb.rs rename to src/header/_todo/oldlib/netdb.rs diff --git a/src/todo/oldlib/process.rs b/src/header/_todo/oldlib/process.rs similarity index 100% rename from src/todo/oldlib/process.rs rename to src/header/_todo/oldlib/process.rs diff --git a/src/todo/oldlib/rawfile.rs b/src/header/_todo/oldlib/rawfile.rs similarity index 100% rename from src/todo/oldlib/rawfile.rs rename to src/header/_todo/oldlib/rawfile.rs diff --git a/src/todo/oldlib/redox.rs b/src/header/_todo/oldlib/redox.rs similarity index 100% rename from src/todo/oldlib/redox.rs rename to src/header/_todo/oldlib/redox.rs diff --git a/src/todo/oldlib/socket.rs b/src/header/_todo/oldlib/socket.rs similarity index 100% rename from src/todo/oldlib/socket.rs rename to src/header/_todo/oldlib/socket.rs diff --git a/src/todo/oldlib/termios.rs b/src/header/_todo/oldlib/termios.rs similarity index 100% rename from src/todo/oldlib/termios.rs rename to src/header/_todo/oldlib/termios.rs diff --git a/src/todo/oldlib/time.rs b/src/header/_todo/oldlib/time.rs similarity index 100% rename from src/todo/oldlib/time.rs rename to src/header/_todo/oldlib/time.rs diff --git a/src/todo/oldlib/types.rs b/src/header/_todo/oldlib/types.rs similarity index 100% rename from src/todo/oldlib/types.rs rename to src/header/_todo/oldlib/types.rs diff --git a/src/todo/oldlib/unimpl.rs b/src/header/_todo/oldlib/unimpl.rs similarity index 100% rename from src/todo/oldlib/unimpl.rs rename to src/header/_todo/oldlib/unimpl.rs diff --git a/src/todo/oldlib/user.rs b/src/header/_todo/oldlib/user.rs similarity index 100% rename from src/todo/oldlib/user.rs rename to src/header/_todo/oldlib/user.rs diff --git a/src/todo/pthread/lib.rs b/src/header/_todo/pthread/lib.rs similarity index 100% rename from src/todo/pthread/lib.rs rename to src/header/_todo/pthread/lib.rs diff --git a/src/todo/wctype/lib.rs b/src/header/_todo/wctype/lib.rs similarity index 100% rename from src/todo/wctype/lib.rs rename to src/header/_todo/wctype/lib.rs diff --git a/src/arpainet/cbindgen.toml b/src/header/arpa_inet/cbindgen.toml similarity index 79% rename from src/arpainet/cbindgen.toml rename to src/header/arpa_inet/cbindgen.toml index 661140fa0b..4e00706ff5 100644 --- a/src/arpainet/cbindgen.toml +++ b/src/header/arpa_inet/cbindgen.toml @@ -1,5 +1,5 @@ sys_includes = ["stddef.h", "sys/socket.h", "netinet/in.h"] -include_guard = "_ARPAINET_H" +include_guard = "_ARPA_INET_H" language = "C" style = "Tag" diff --git a/src/arpainet/src/lib.rs b/src/header/arpa_inet/mod.rs similarity index 90% rename from src/arpainet/src/lib.rs rename to src/header/arpa_inet/mod.rs index 632cb39667..8c7018127d 100644 --- a/src/arpainet/src/lib.rs +++ b/src/header/arpa_inet/mod.rs @@ -1,20 +1,12 @@ -//! arpainet implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/arpainet.h.html - -#![no_std] -#![feature(alloc)] - -#[macro_use] -extern crate alloc; - -extern crate errno; -extern crate netinet; -extern crate platform; -extern crate sys_socket; +//! arpa/inet implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/arpainet.h.html use core::str::FromStr; use core::{mem, ptr, slice, str}; -use errno::*; -use netinet::in_h::in_addr; + +use header::errno::*; +use header::netinet_in::in_addr; +use header::sys_socket; +use platform; use platform::c_str; use platform::types::*; diff --git a/src/ctype/cbindgen.toml b/src/header/ctype/cbindgen.toml similarity index 100% rename from src/ctype/cbindgen.toml rename to src/header/ctype/cbindgen.toml diff --git a/src/ctype/src/lib.rs b/src/header/ctype/mod.rs similarity index 98% rename from src/ctype/src/lib.rs rename to src/header/ctype/mod.rs index a9f602043f..f1be73a556 100644 --- a/src/ctype/src/lib.rs +++ b/src/header/ctype/mod.rs @@ -1,9 +1,6 @@ //! ctype implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/ctype.h.html -#![no_std] - -extern crate platform; - +use platform; use platform::types::*; #[no_mangle] diff --git a/src/dirent/cbindgen.toml b/src/header/dirent/cbindgen.toml similarity index 100% rename from src/dirent/cbindgen.toml rename to src/header/dirent/cbindgen.toml diff --git a/src/dirent/src/lib.rs b/src/header/dirent/mod.rs similarity index 95% rename from src/dirent/src/lib.rs rename to src/header/dirent/mod.rs index 029081c005..abdb433b06 100644 --- a/src/dirent/src/lib.rs +++ b/src/header/dirent/mod.rs @@ -1,17 +1,9 @@ //! dirent implementation following http://pubs.opengroup.org/onlinepubs/009695399/basedefs/dirent.h.html -#![no_std] -#![feature(alloc)] - -extern crate alloc; -extern crate errno; -extern crate fcntl; -extern crate platform; -extern crate stdio; -extern crate unistd; - use alloc::boxed::Box; use core::{mem, ptr}; + +use header::{errno, fcntl, stdio, unistd}; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/errno/cbindgen.toml b/src/header/errno/cbindgen.toml similarity index 100% rename from src/errno/cbindgen.toml rename to src/header/errno/cbindgen.toml diff --git a/src/errno/src/lib.rs b/src/header/errno/mod.rs similarity index 99% rename from src/errno/src/lib.rs rename to src/header/errno/mod.rs index b961059634..e39fb205e5 100644 --- a/src/errno/src/lib.rs +++ b/src/header/errno/mod.rs @@ -1,9 +1,6 @@ //! errno implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/errno.h.html -#![no_std] - -extern crate platform; - +use platform; use platform::types::*; #[no_mangle] diff --git a/src/fcntl/cbindgen.toml b/src/header/fcntl/cbindgen.toml similarity index 100% rename from src/fcntl/cbindgen.toml rename to src/header/fcntl/cbindgen.toml diff --git a/src/fcntl/src/linux.rs b/src/header/fcntl/linux.rs similarity index 100% rename from src/fcntl/src/linux.rs rename to src/header/fcntl/linux.rs diff --git a/src/fcntl/src/lib.rs b/src/header/fcntl/mod.rs similarity index 96% rename from src/fcntl/src/lib.rs rename to src/header/fcntl/mod.rs index f9c78930e9..4237e905ad 100644 --- a/src/fcntl/src/lib.rs +++ b/src/header/fcntl/mod.rs @@ -1,9 +1,6 @@ //! fcntl implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/fcntl.h.html -#![no_std] - -extern crate platform; - +use platform; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/fcntl/src/redox.rs b/src/header/fcntl/redox.rs similarity index 100% rename from src/fcntl/src/redox.rs rename to src/header/fcntl/redox.rs diff --git a/src/fenv/cbindgen.toml b/src/header/fenv/cbindgen.toml similarity index 100% rename from src/fenv/cbindgen.toml rename to src/header/fenv/cbindgen.toml diff --git a/src/fenv/src/lib.rs b/src/header/fenv/mod.rs similarity index 97% rename from src/fenv/src/lib.rs rename to src/header/fenv/mod.rs index 116293c1c0..f7c837a029 100644 --- a/src/fenv/src/lib.rs +++ b/src/header/fenv/mod.rs @@ -1,10 +1,7 @@ //! fenv.h implementation for Redox, following //! http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/fenv.h.html -#![no_std] - -extern crate platform; - +use platform; use platform::types::*; pub const FE_ALL_EXCEPT: c_int = 0; diff --git a/src/float/cbindgen.toml b/src/header/float/cbindgen.toml similarity index 100% rename from src/float/cbindgen.toml rename to src/header/float/cbindgen.toml diff --git a/src/float/src/lib.rs b/src/header/float/mod.rs similarity index 77% rename from src/float/src/lib.rs rename to src/header/float/mod.rs index 4a355c0b78..6b0c4ea6a9 100644 --- a/src/float/src/lib.rs +++ b/src/header/float/mod.rs @@ -1,12 +1,8 @@ //! float.h implementation for Redox, following //! http://pubs.opengroup.org/onlinepubs/7908799/xsh/float.h.html -#![no_std] - -extern crate fenv; -extern crate platform; - -use fenv::{fegetround, FE_TONEAREST}; +use header::fenv::{fegetround, FE_TONEAREST}; +use platform; use platform::types::*; pub const FLT_RADIX: c_int = 2; diff --git a/src/fnmatch/cbindgen.toml b/src/header/fnmatch/cbindgen.toml similarity index 100% rename from src/fnmatch/cbindgen.toml rename to src/header/fnmatch/cbindgen.toml diff --git a/src/fnmatch/src/lib.rs b/src/header/fnmatch/mod.rs similarity index 98% rename from src/fnmatch/src/lib.rs rename to src/header/fnmatch/mod.rs index ff60a80fd3..7ad988c63c 100644 --- a/src/fnmatch/src/lib.rs +++ b/src/header/fnmatch/mod.rs @@ -1,11 +1,8 @@ //! fnmatch implementation -#![no_std] -#![feature(alloc)] - -extern crate alloc; -extern crate platform; use alloc::vec::Vec; + +use platform; use platform::types::*; pub const FNM_NOMATCH: c_int = 1; diff --git a/src/grp/cbindgen.toml b/src/header/grp/cbindgen.toml similarity index 100% rename from src/grp/cbindgen.toml rename to src/header/grp/cbindgen.toml diff --git a/src/grp/src/lib.rs b/src/header/grp/mod.rs similarity index 97% rename from src/grp/src/lib.rs rename to src/header/grp/mod.rs index 1d93b1dbf4..9040e4a38c 100644 --- a/src/grp/src/lib.rs +++ b/src/header/grp/mod.rs @@ -1,9 +1,6 @@ //! grp implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/grp.h.html -#![no_std] - -extern crate platform; - +use platform; use platform::types::*; #[repr(C)] diff --git a/src/inttypes/cbindgen.toml b/src/header/inttypes/cbindgen.toml similarity index 100% rename from src/inttypes/cbindgen.toml rename to src/header/inttypes/cbindgen.toml diff --git a/src/inttypes/src/lib.rs b/src/header/inttypes/mod.rs similarity index 91% rename from src/inttypes/src/lib.rs rename to src/header/inttypes/mod.rs index c4d1ab545e..a5780290f2 100644 --- a/src/inttypes/src/lib.rs +++ b/src/header/inttypes/mod.rs @@ -1,12 +1,6 @@ -#![no_std] - -#[macro_use] -extern crate stdlib; -extern crate ctype; -extern crate errno; -extern crate platform; - -use errno::*; +use header::{ctype, stdlib}; +use header::errno::*; +use platform; use platform::types::*; #[no_mangle] diff --git a/src/locale/cbindgen.toml b/src/header/locale/cbindgen.toml similarity index 100% rename from src/locale/cbindgen.toml rename to src/header/locale/cbindgen.toml diff --git a/src/locale/src/lib.rs b/src/header/locale/mod.rs similarity index 97% rename from src/locale/src/lib.rs rename to src/header/locale/mod.rs index a9bb89d11a..d90be57da3 100644 --- a/src/locale/src/lib.rs +++ b/src/header/locale/mod.rs @@ -1,11 +1,8 @@ //! locale implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/locale.h.html -#![no_std] -#![feature(alloc)] - -extern crate platform; - use core::ptr; + +use platform; use platform::types::*; const EMPTY_PTR: *const c_char = "\0" as *const _ as *const c_char; diff --git a/src/header/mod.rs b/src/header/mod.rs new file mode 100644 index 0000000000..6f65ca7526 --- /dev/null +++ b/src/header/mod.rs @@ -0,0 +1,38 @@ +pub mod arpa_inet; +pub mod ctype; +pub mod dirent; +pub mod errno; +pub mod fcntl; +pub mod fenv; +pub mod float; +pub mod fnmatch; +pub mod grp; +pub mod inttypes; +pub mod locale; +pub mod netinet_in; +pub mod pwd; +pub mod semaphore; +pub mod sgtty; +pub mod signal; +pub mod stdio; +pub mod stdlib; +pub mod string; +pub mod strings; +pub mod sys_file; +pub mod sys_ioctl; +pub mod sys_mman; +pub mod sys_resource; +pub mod sys_select; +pub mod sys_socket; +pub mod sys_stat; +pub mod sys_time; +pub mod sys_times; +pub mod sys_un; +pub mod sys_utsname; +pub mod sys_wait; +pub mod termios; +pub mod time; +pub mod unistd; +pub mod utime; +pub mod wchar; +pub mod wctype; diff --git a/src/netinet/Cargo.toml b/src/header/netinet_in/Cargo.toml similarity index 100% rename from src/netinet/Cargo.toml rename to src/header/netinet_in/Cargo.toml diff --git a/src/netinet/in/cbindgen.toml b/src/header/netinet_in/cbindgen.toml similarity index 100% rename from src/netinet/in/cbindgen.toml rename to src/header/netinet_in/cbindgen.toml diff --git a/src/netinet/in/src/lib.rs b/src/header/netinet_in/mod.rs similarity index 93% rename from src/netinet/in/src/lib.rs rename to src/header/netinet_in/mod.rs index 2f909a3d75..7872fc99f2 100644 --- a/src/netinet/in/src/lib.rs +++ b/src/header/netinet_in/mod.rs @@ -1,12 +1,8 @@ -#![no_std] - #![allow(non_camel_case_types)] -extern crate platform; -extern crate sys_socket; - +use header::sys_socket::{self, sa_family_t, sockaddr}; +use platform; use platform::types::*; -use sys_socket::{sa_family_t, sockaddr}; pub type in_addr_t = u32; pub type in_port_t = u16; diff --git a/src/pwd/cbindgen.toml b/src/header/pwd/cbindgen.toml similarity index 100% rename from src/pwd/cbindgen.toml rename to src/header/pwd/cbindgen.toml diff --git a/src/pwd/src/lib.rs b/src/header/pwd/mod.rs similarity index 98% rename from src/pwd/src/lib.rs rename to src/header/pwd/mod.rs index db1225092f..f455e40c62 100644 --- a/src/pwd/src/lib.rs +++ b/src/header/pwd/mod.rs @@ -1,15 +1,10 @@ //! pwd implementation for relibc -#![no_std] -#![feature(alloc)] - -extern crate alloc; -extern crate errno; -extern crate fcntl; -extern crate platform; - use alloc::vec::Vec; use core::ptr; + +use header::{errno, fcntl}; +use platform; use platform::{Pal, Sys}; use platform::types::*; use platform::RawFile; diff --git a/src/semaphore/cbindgen.toml b/src/header/semaphore/cbindgen.toml similarity index 100% rename from src/semaphore/cbindgen.toml rename to src/header/semaphore/cbindgen.toml diff --git a/src/semaphore/src/lib.rs b/src/header/semaphore/mod.rs similarity index 97% rename from src/semaphore/src/lib.rs rename to src/header/semaphore/mod.rs index 0204358a37..9d3d64ad6b 100644 --- a/src/semaphore/src/lib.rs +++ b/src/header/semaphore/mod.rs @@ -1,7 +1,4 @@ -#![no_std] - -extern crate platform; - +use platform; use platform::types::*; #[repr(C)] diff --git a/src/setjmp/Cargo.toml b/src/header/setjmp/Cargo.toml similarity index 100% rename from src/setjmp/Cargo.toml rename to src/header/setjmp/Cargo.toml diff --git a/src/setjmp/src/impl/README.md b/src/header/setjmp/src/impl/README.md similarity index 100% rename from src/setjmp/src/impl/README.md rename to src/header/setjmp/src/impl/README.md diff --git a/src/setjmp/src/impl/aarch64/longjmp.s b/src/header/setjmp/src/impl/aarch64/longjmp.s similarity index 100% rename from src/setjmp/src/impl/aarch64/longjmp.s rename to src/header/setjmp/src/impl/aarch64/longjmp.s diff --git a/src/setjmp/src/impl/aarch64/setjmp.s b/src/header/setjmp/src/impl/aarch64/setjmp.s similarity index 100% rename from src/setjmp/src/impl/aarch64/setjmp.s rename to src/header/setjmp/src/impl/aarch64/setjmp.s diff --git a/src/setjmp/src/impl/arm/longjmp.s b/src/header/setjmp/src/impl/arm/longjmp.s similarity index 100% rename from src/setjmp/src/impl/arm/longjmp.s rename to src/header/setjmp/src/impl/arm/longjmp.s diff --git a/src/setjmp/src/impl/arm/setjmp.s b/src/header/setjmp/src/impl/arm/setjmp.s similarity index 100% rename from src/setjmp/src/impl/arm/setjmp.s rename to src/header/setjmp/src/impl/arm/setjmp.s diff --git a/src/setjmp/src/impl/i386/longjmp.s b/src/header/setjmp/src/impl/i386/longjmp.s similarity index 100% rename from src/setjmp/src/impl/i386/longjmp.s rename to src/header/setjmp/src/impl/i386/longjmp.s diff --git a/src/setjmp/src/impl/i386/setjmp.s b/src/header/setjmp/src/impl/i386/setjmp.s similarity index 100% rename from src/setjmp/src/impl/i386/setjmp.s rename to src/header/setjmp/src/impl/i386/setjmp.s diff --git a/src/setjmp/src/impl/m68k/longjmp.s b/src/header/setjmp/src/impl/m68k/longjmp.s similarity index 100% rename from src/setjmp/src/impl/m68k/longjmp.s rename to src/header/setjmp/src/impl/m68k/longjmp.s diff --git a/src/setjmp/src/impl/m68k/setjmp.s b/src/header/setjmp/src/impl/m68k/setjmp.s similarity index 100% rename from src/setjmp/src/impl/m68k/setjmp.s rename to src/header/setjmp/src/impl/m68k/setjmp.s diff --git a/src/setjmp/src/impl/microblaze/longjmp.s b/src/header/setjmp/src/impl/microblaze/longjmp.s similarity index 100% rename from src/setjmp/src/impl/microblaze/longjmp.s rename to src/header/setjmp/src/impl/microblaze/longjmp.s diff --git a/src/setjmp/src/impl/microblaze/setjmp.s b/src/header/setjmp/src/impl/microblaze/setjmp.s similarity index 100% rename from src/setjmp/src/impl/microblaze/setjmp.s rename to src/header/setjmp/src/impl/microblaze/setjmp.s diff --git a/src/setjmp/src/impl/mips/longjmp.S b/src/header/setjmp/src/impl/mips/longjmp.S similarity index 100% rename from src/setjmp/src/impl/mips/longjmp.S rename to src/header/setjmp/src/impl/mips/longjmp.S diff --git a/src/setjmp/src/impl/mips/setjmp.S b/src/header/setjmp/src/impl/mips/setjmp.S similarity index 100% rename from src/setjmp/src/impl/mips/setjmp.S rename to src/header/setjmp/src/impl/mips/setjmp.S diff --git a/src/setjmp/src/impl/mips64/longjmp.S b/src/header/setjmp/src/impl/mips64/longjmp.S similarity index 100% rename from src/setjmp/src/impl/mips64/longjmp.S rename to src/header/setjmp/src/impl/mips64/longjmp.S diff --git a/src/setjmp/src/impl/mips64/setjmp.S b/src/header/setjmp/src/impl/mips64/setjmp.S similarity index 100% rename from src/setjmp/src/impl/mips64/setjmp.S rename to src/header/setjmp/src/impl/mips64/setjmp.S diff --git a/src/setjmp/src/impl/mipsn32/longjmp.S b/src/header/setjmp/src/impl/mipsn32/longjmp.S similarity index 100% rename from src/setjmp/src/impl/mipsn32/longjmp.S rename to src/header/setjmp/src/impl/mipsn32/longjmp.S diff --git a/src/setjmp/src/impl/mipsn32/setjmp.S b/src/header/setjmp/src/impl/mipsn32/setjmp.S similarity index 100% rename from src/setjmp/src/impl/mipsn32/setjmp.S rename to src/header/setjmp/src/impl/mipsn32/setjmp.S diff --git a/src/setjmp/src/impl/or1k/longjmp.s b/src/header/setjmp/src/impl/or1k/longjmp.s similarity index 100% rename from src/setjmp/src/impl/or1k/longjmp.s rename to src/header/setjmp/src/impl/or1k/longjmp.s diff --git a/src/setjmp/src/impl/or1k/setjmp.s b/src/header/setjmp/src/impl/or1k/setjmp.s similarity index 100% rename from src/setjmp/src/impl/or1k/setjmp.s rename to src/header/setjmp/src/impl/or1k/setjmp.s diff --git a/src/setjmp/src/impl/powerpc/longjmp.S b/src/header/setjmp/src/impl/powerpc/longjmp.S similarity index 100% rename from src/setjmp/src/impl/powerpc/longjmp.S rename to src/header/setjmp/src/impl/powerpc/longjmp.S diff --git a/src/setjmp/src/impl/powerpc/setjmp.S b/src/header/setjmp/src/impl/powerpc/setjmp.S similarity index 100% rename from src/setjmp/src/impl/powerpc/setjmp.S rename to src/header/setjmp/src/impl/powerpc/setjmp.S diff --git a/src/setjmp/src/impl/powerpc64/longjmp.s b/src/header/setjmp/src/impl/powerpc64/longjmp.s similarity index 100% rename from src/setjmp/src/impl/powerpc64/longjmp.s rename to src/header/setjmp/src/impl/powerpc64/longjmp.s diff --git a/src/setjmp/src/impl/powerpc64/setjmp.s b/src/header/setjmp/src/impl/powerpc64/setjmp.s similarity index 100% rename from src/setjmp/src/impl/powerpc64/setjmp.s rename to src/header/setjmp/src/impl/powerpc64/setjmp.s diff --git a/src/setjmp/src/impl/s390x/longjmp.s b/src/header/setjmp/src/impl/s390x/longjmp.s similarity index 100% rename from src/setjmp/src/impl/s390x/longjmp.s rename to src/header/setjmp/src/impl/s390x/longjmp.s diff --git a/src/setjmp/src/impl/s390x/setjmp.s b/src/header/setjmp/src/impl/s390x/setjmp.s similarity index 100% rename from src/setjmp/src/impl/s390x/setjmp.s rename to src/header/setjmp/src/impl/s390x/setjmp.s diff --git a/src/setjmp/src/impl/sh/longjmp.S b/src/header/setjmp/src/impl/sh/longjmp.S similarity index 100% rename from src/setjmp/src/impl/sh/longjmp.S rename to src/header/setjmp/src/impl/sh/longjmp.S diff --git a/src/setjmp/src/impl/sh/setjmp.S b/src/header/setjmp/src/impl/sh/setjmp.S similarity index 100% rename from src/setjmp/src/impl/sh/setjmp.S rename to src/header/setjmp/src/impl/sh/setjmp.S diff --git a/src/setjmp/src/impl/x32/longjmp.s b/src/header/setjmp/src/impl/x32/longjmp.s similarity index 100% rename from src/setjmp/src/impl/x32/longjmp.s rename to src/header/setjmp/src/impl/x32/longjmp.s diff --git a/src/setjmp/src/impl/x32/setjmp.s b/src/header/setjmp/src/impl/x32/setjmp.s similarity index 100% rename from src/setjmp/src/impl/x32/setjmp.s rename to src/header/setjmp/src/impl/x32/setjmp.s diff --git a/src/setjmp/src/impl/x86_64/longjmp.s b/src/header/setjmp/src/impl/x86_64/longjmp.s similarity index 100% rename from src/setjmp/src/impl/x86_64/longjmp.s rename to src/header/setjmp/src/impl/x86_64/longjmp.s diff --git a/src/setjmp/src/impl/x86_64/setjmp.s b/src/header/setjmp/src/impl/x86_64/setjmp.s similarity index 100% rename from src/setjmp/src/impl/x86_64/setjmp.s rename to src/header/setjmp/src/impl/x86_64/setjmp.s diff --git a/src/setjmp/src/lib.rs b/src/header/setjmp/src/lib.rs similarity index 100% rename from src/setjmp/src/lib.rs rename to src/header/setjmp/src/lib.rs diff --git a/src/sgtty/cbindgen.toml b/src/header/sgtty/cbindgen.toml similarity index 100% rename from src/sgtty/cbindgen.toml rename to src/header/sgtty/cbindgen.toml diff --git a/src/sgtty/src/lib.rs b/src/header/sgtty/mod.rs similarity index 80% rename from src/sgtty/src/lib.rs rename to src/header/sgtty/mod.rs index eece192334..c8950c506b 100644 --- a/src/sgtty/src/lib.rs +++ b/src/header/sgtty/mod.rs @@ -1,12 +1,10 @@ //! sgtty implementation that won't work on redox because no ioctl -#![no_std] - -extern crate platform; -extern crate sys_ioctl; use core::fmt::Write; + +use platform; use platform::types::*; -use sys_ioctl::*; +use header::sys_ioctl::*; #[no_mangle] pub extern "C" fn gtty(fd: c_int, out: *mut sgttyb) -> c_int { diff --git a/src/signal/cbindgen.toml b/src/header/signal/cbindgen.toml similarity index 100% rename from src/signal/cbindgen.toml rename to src/header/signal/cbindgen.toml diff --git a/src/signal/src/linux.rs b/src/header/signal/linux.rs similarity index 100% rename from src/signal/src/linux.rs rename to src/header/signal/linux.rs diff --git a/src/signal/src/lib.rs b/src/header/signal/mod.rs similarity index 98% rename from src/signal/src/lib.rs rename to src/header/signal/mod.rs index eeff480dfc..c37e81e456 100644 --- a/src/signal/src/lib.rs +++ b/src/header/signal/mod.rs @@ -1,11 +1,5 @@ //! signal implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/signal.h.html -#![no_std] -#![feature(asm, const_fn, core_intrinsics, global_asm)] - -extern crate errno; -extern crate platform; - #[cfg(target_os = "linux")] #[path = "linux.rs"] pub mod sys; @@ -17,6 +11,9 @@ pub mod sys; pub use sys::*; use core::{mem, ptr}; + +use header::errno; +use platform; use platform::{PalSignal, Sys}; use platform::types::*; diff --git a/src/signal/src/redox.rs b/src/header/signal/redox.rs similarity index 100% rename from src/signal/src/redox.rs rename to src/header/signal/redox.rs diff --git a/src/stdio/cbindgen.toml b/src/header/stdio/cbindgen.toml similarity index 100% rename from src/stdio/cbindgen.toml rename to src/header/stdio/cbindgen.toml diff --git a/src/stdio/src/constants.rs b/src/header/stdio/constants.rs similarity index 100% rename from src/stdio/src/constants.rs rename to src/header/stdio/constants.rs diff --git a/src/stdio/src/default.rs b/src/header/stdio/default.rs similarity index 100% rename from src/stdio/src/default.rs rename to src/header/stdio/default.rs diff --git a/src/stdio/src/helpers.rs b/src/header/stdio/helpers.rs similarity index 100% rename from src/stdio/src/helpers.rs rename to src/header/stdio/helpers.rs diff --git a/src/stdio/src/internal.rs b/src/header/stdio/internal.rs similarity index 100% rename from src/stdio/src/internal.rs rename to src/header/stdio/internal.rs diff --git a/src/stdio/src/lib.rs b/src/header/stdio/mod.rs similarity index 98% rename from src/stdio/src/lib.rs rename to src/header/stdio/mod.rs index 8790159170..77b879f5c2 100644 --- a/src/stdio/src/lib.rs +++ b/src/header/stdio/mod.rs @@ -1,31 +1,18 @@ //! stdio implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/stdio.h.html -#![no_std] -// For Vec -#![feature(alloc)] -#![feature(const_fn)] - -#[macro_use] -extern crate alloc; -extern crate errno; -extern crate fcntl; -#[macro_use] -extern crate lazy_static; -extern crate platform; -extern crate string; -extern crate va_list as vl; - +use alloc::vec::Vec; use core::fmt::Write as WriteFmt; use core::fmt::{self, Error}; use core::sync::atomic::{AtomicBool, Ordering}; use core::{ptr, str}; +use va_list::VaList as va_list; -use alloc::vec::Vec; -use errno::STR_ERROR; +use header::errno::{self, STR_ERROR}; +use header::{fcntl, string}; +use platform; use platform::{Pal, Sys}; use platform::types::*; use platform::{c_str, errno, Read, Write}; -use vl::VaList as va_list; mod printf; mod scanf; diff --git a/src/stdio/src/printf.rs b/src/header/stdio/printf.rs similarity index 100% rename from src/stdio/src/printf.rs rename to src/header/stdio/printf.rs diff --git a/src/stdio/src/scanf.rs b/src/header/stdio/scanf.rs similarity index 100% rename from src/stdio/src/scanf.rs rename to src/header/stdio/scanf.rs diff --git a/src/stdlib/cbindgen.toml b/src/header/stdlib/cbindgen.toml similarity index 100% rename from src/stdlib/cbindgen.toml rename to src/header/stdlib/cbindgen.toml diff --git a/src/stdlib/src/lib.rs b/src/header/stdlib/mod.rs similarity index 98% rename from src/stdlib/src/lib.rs rename to src/header/stdlib/mod.rs index e166f4ce8d..c64612d368 100644 --- a/src/stdlib/src/lib.rs +++ b/src/header/stdlib/mod.rs @@ -1,28 +1,17 @@ //! stdlib implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/stdlib.h.html -#![no_std] -#![feature(core_intrinsics)] - -extern crate ctype; -extern crate errno; -extern crate fcntl; -extern crate platform; -extern crate rand; -extern crate string; -extern crate time; -extern crate unistd; -extern crate wchar; - use core::{iter, mem, ptr, slice, str}; use rand::distributions::Alphanumeric; use rand::prng::XorShiftRng; use rand::rngs::JitterRng; use rand::{Rng, SeedableRng}; -use string::*; -use wchar::*; -use errno::*; -use fcntl::*; +use header::{ctype, time, unistd, wchar}; +use header::errno::*; +use header::fcntl::*; +use header::string::*; +use header::wchar::*; +use platform; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/stdlib/src/sort.rs b/src/header/stdlib/sort.rs similarity index 100% rename from src/stdlib/src/sort.rs rename to src/header/stdlib/sort.rs diff --git a/src/string/cbindgen.toml b/src/header/string/cbindgen.toml similarity index 100% rename from src/string/cbindgen.toml rename to src/header/string/cbindgen.toml diff --git a/src/string/src/lib.rs b/src/header/string/mod.rs similarity index 99% rename from src/string/src/lib.rs rename to src/header/string/mod.rs index 7960febbce..6f506f05d3 100644 --- a/src/string/src/lib.rs +++ b/src/header/string/mod.rs @@ -1,15 +1,13 @@ //! string implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/string.h.html -#![no_std] - -extern crate errno; -extern crate platform; -extern crate signal; use core::cmp; use core::mem; use core::ptr; use core::usize; -use errno::*; + +use header::signal; +use header::errno::*; +use platform; use platform::types::*; #[no_mangle] diff --git a/src/strings/cbindgen.toml b/src/header/strings/cbindgen.toml similarity index 100% rename from src/strings/cbindgen.toml rename to src/header/strings/cbindgen.toml diff --git a/src/strings/src/lib.rs b/src/header/strings/mod.rs similarity index 97% rename from src/strings/src/lib.rs rename to src/header/strings/mod.rs index 5737face26..a20501bc49 100644 --- a/src/strings/src/lib.rs +++ b/src/header/strings/mod.rs @@ -1,12 +1,9 @@ //! strings implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/strings.h.html -#![no_std] -#![feature(alloc)] - -extern crate alloc; -extern crate platform; use alloc::Vec; use core::ptr; + +use platform; use platform::types::*; #[no_mangle] diff --git a/src/sys_file/cbindgen.toml b/src/header/sys_file/cbindgen.toml similarity index 100% rename from src/sys_file/cbindgen.toml rename to src/header/sys_file/cbindgen.toml diff --git a/src/sys_file/src/lib.rs b/src/header/sys_file/mod.rs similarity index 91% rename from src/sys_file/src/lib.rs rename to src/header/sys_file/mod.rs index a12bcc2a0b..098dddc1b4 100644 --- a/src/sys_file/src/lib.rs +++ b/src/header/sys_file/mod.rs @@ -1,9 +1,6 @@ //! sys/file.h implementation -#![no_std] - -extern crate platform; - +use platform; use platform::types::*; pub const LOCK_SH: usize = 1; diff --git a/src/sys_ioctl/cbindgen.toml b/src/header/sys_ioctl/cbindgen.toml similarity index 100% rename from src/sys_ioctl/cbindgen.toml rename to src/header/sys_ioctl/cbindgen.toml diff --git a/src/sys_ioctl/src/lib.rs b/src/header/sys_ioctl/mod.rs similarity index 99% rename from src/sys_ioctl/src/lib.rs rename to src/header/sys_ioctl/mod.rs index 6c155363b4..f6c1e44d32 100644 --- a/src/sys_ioctl/src/lib.rs +++ b/src/header/sys_ioctl/mod.rs @@ -1,9 +1,6 @@ //! ioctl implementation for linux -#![no_std] - -extern crate platform; - +use platform; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/sys_mman/cbindgen.toml b/src/header/sys_mman/cbindgen.toml similarity index 100% rename from src/sys_mman/cbindgen.toml rename to src/header/sys_mman/cbindgen.toml diff --git a/src/sys_mman/src/linux.rs b/src/header/sys_mman/linux.rs similarity index 100% rename from src/sys_mman/src/linux.rs rename to src/header/sys_mman/linux.rs diff --git a/src/sys_mman/src/lib.rs b/src/header/sys_mman/mod.rs similarity index 97% rename from src/sys_mman/src/lib.rs rename to src/header/sys_mman/mod.rs index cbe789d043..e346a2f6e4 100644 --- a/src/sys_mman/src/lib.rs +++ b/src/header/sys_mman/mod.rs @@ -1,7 +1,4 @@ -#![no_std] - -extern crate platform; - +use platform; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/sys_mman/src/redox.rs b/src/header/sys_mman/redox.rs similarity index 100% rename from src/sys_mman/src/redox.rs rename to src/header/sys_mman/redox.rs diff --git a/src/sys_resource/cbindgen.toml b/src/header/sys_resource/cbindgen.toml similarity index 100% rename from src/sys_resource/cbindgen.toml rename to src/header/sys_resource/cbindgen.toml diff --git a/src/sys_resource/src/lib.rs b/src/header/sys_resource/mod.rs similarity index 94% rename from src/sys_resource/src/lib.rs rename to src/header/sys_resource/mod.rs index 584dfaa7a8..1b8dae9258 100644 --- a/src/sys_resource/src/lib.rs +++ b/src/header/sys_resource/mod.rs @@ -1,14 +1,10 @@ //! sys/resource.h implementation for Redox, following //! http://pubs.opengroup.org/onlinepubs/7908799/xsh/sysresource.h.html -#![no_std] - -extern crate platform; -extern crate sys_time; - +use header::sys_time::timeval; +use platform; use platform::{Pal, Sys}; use platform::types::*; -use sys_time::timeval; // Exported in bits file const RUSAGE_SELF: c_int = 0; diff --git a/src/sys_select/cbindgen.toml b/src/header/sys_select/cbindgen.toml similarity index 100% rename from src/sys_select/cbindgen.toml rename to src/header/sys_select/cbindgen.toml diff --git a/src/sys_select/src/lib.rs b/src/header/sys_select/mod.rs similarity index 92% rename from src/sys_select/src/lib.rs rename to src/header/sys_select/mod.rs index 0c67e3406b..e1ad11c760 100644 --- a/src/sys_select/src/lib.rs +++ b/src/header/sys_select/mod.rs @@ -1,9 +1,8 @@ //! sys/select.h implementation -#![no_std] - -extern crate platform; use core::mem; + +use platform; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/sys_socket/cbindgen.toml b/src/header/sys_socket/cbindgen.toml similarity index 100% rename from src/sys_socket/cbindgen.toml rename to src/header/sys_socket/cbindgen.toml diff --git a/src/sys_socket/src/constants.rs b/src/header/sys_socket/constants.rs similarity index 100% rename from src/sys_socket/src/constants.rs rename to src/header/sys_socket/constants.rs diff --git a/src/sys_socket/src/lib.rs b/src/header/sys_socket/mod.rs similarity index 98% rename from src/sys_socket/src/lib.rs rename to src/header/sys_socket/mod.rs index 4990133c4e..1d5fe32409 100644 --- a/src/sys_socket/src/lib.rs +++ b/src/header/sys_socket/mod.rs @@ -1,11 +1,8 @@ //! socket implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xns/syssocket.h.html -#![no_std] -#![allow(non_camel_case_types)] - -extern crate platform; - use core::ptr; + +use platform; use platform::{PalSocket, Sys}; use platform::types::*; diff --git a/src/sys_stat/cbindgen.toml b/src/header/sys_stat/cbindgen.toml similarity index 100% rename from src/sys_stat/cbindgen.toml rename to src/header/sys_stat/cbindgen.toml diff --git a/src/sys_stat/src/lib.rs b/src/header/sys_stat/mod.rs similarity index 97% rename from src/sys_stat/src/lib.rs rename to src/header/sys_stat/mod.rs index 81fb68623f..3e393d570f 100644 --- a/src/sys_stat/src/lib.rs +++ b/src/header/sys_stat/mod.rs @@ -1,11 +1,7 @@ //! stat implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/sysstat.h.html -#![no_std] - -extern crate fcntl; -extern crate platform; - -use fcntl::{O_PATH, O_NOFOLLOW}; +use header::fcntl::{O_PATH, O_NOFOLLOW}; +use platform; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/sys_time/cbindgen.toml b/src/header/sys_time/cbindgen.toml similarity index 100% rename from src/sys_time/cbindgen.toml rename to src/header/sys_time/cbindgen.toml diff --git a/src/sys_time/src/lib.rs b/src/header/sys_time/mod.rs similarity index 98% rename from src/sys_time/src/lib.rs rename to src/header/sys_time/mod.rs index dc1dfddb79..163f9c01fb 100644 --- a/src/sys_time/src/lib.rs +++ b/src/header/sys_time/mod.rs @@ -1,9 +1,6 @@ //! sys/time implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/systime.h.html -#![no_std] - -extern crate platform; - +use platform; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/sys_times/cbindgen.toml b/src/header/sys_times/cbindgen.toml similarity index 100% rename from src/sys_times/cbindgen.toml rename to src/header/sys_times/cbindgen.toml diff --git a/src/sys_times/src/lib.rs b/src/header/sys_times/mod.rs similarity index 90% rename from src/sys_times/src/lib.rs rename to src/header/sys_times/mod.rs index 713fa6f18c..57d149da53 100644 --- a/src/sys_times/src/lib.rs +++ b/src/header/sys_times/mod.rs @@ -1,9 +1,6 @@ //! sys/times.h implementation -#![no_std] - -extern crate platform; - +use platform; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/sys_un/cbindgen.toml b/src/header/sys_un/cbindgen.toml similarity index 100% rename from src/sys_un/cbindgen.toml rename to src/header/sys_un/cbindgen.toml diff --git a/src/sys_un/src/lib.rs b/src/header/sys_un/mod.rs similarity index 63% rename from src/sys_un/src/lib.rs rename to src/header/sys_un/mod.rs index 19a75443a4..744e686c1d 100644 --- a/src/sys_un/src/lib.rs +++ b/src/header/sys_un/mod.rs @@ -1,10 +1,8 @@ #![no_std] -extern crate platform; -extern crate sys_socket; - +use header::sys_socket::sa_family_t; +use platform; use platform::types::*; -use sys_socket::sa_family_t; #[repr(C)] pub struct sockaddr_un { diff --git a/src/sys_utsname/cbindgen.toml b/src/header/sys_utsname/cbindgen.toml similarity index 100% rename from src/sys_utsname/cbindgen.toml rename to src/header/sys_utsname/cbindgen.toml diff --git a/src/sys_utsname/src/lib.rs b/src/header/sys_utsname/mod.rs similarity index 86% rename from src/sys_utsname/src/lib.rs rename to src/header/sys_utsname/mod.rs index 0bb394d52f..a20924b598 100644 --- a/src/sys_utsname/src/lib.rs +++ b/src/header/sys_utsname/mod.rs @@ -1,13 +1,10 @@ //! sys/utsname implementation for linux, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/sysutsname.h.html -#![no_std] - #[cfg(target_os = "linux")] mod inner { - extern crate platform; - - use self::platform::{Pal, Sys}; - use self::platform::types::*; + use platform; + use platform::{Pal, Sys}; + use platform::types::*; const UTSLENGTH: usize = 65; diff --git a/src/sys_wait/cbindgen.toml b/src/header/sys_wait/cbindgen.toml similarity index 100% rename from src/sys_wait/cbindgen.toml rename to src/header/sys_wait/cbindgen.toml diff --git a/src/sys_wait/src/lib.rs b/src/header/sys_wait/mod.rs similarity index 92% rename from src/sys_wait/src/lib.rs rename to src/header/sys_wait/mod.rs index f0f4655dd4..8f83468d62 100644 --- a/src/sys_wait/src/lib.rs +++ b/src/header/sys_wait/mod.rs @@ -1,14 +1,10 @@ //! sys/wait.h implementation for Redox, following //! http://pubs.opengroup.org/onlinepubs/7908799/xsh/syswait.h.html -#![no_std] - -extern crate platform; -extern crate sys_resource; - +use header::sys_resource::rusage; +use platform; use platform::{Pal, Sys}; use platform::types::*; -use sys_resource::rusage; pub const WNOHANG: c_int = 1; pub const WUNTRACED: c_int = 2; diff --git a/src/termios/cbindgen.toml b/src/header/termios/cbindgen.toml similarity index 100% rename from src/termios/cbindgen.toml rename to src/header/termios/cbindgen.toml diff --git a/src/termios/src/lib.rs b/src/header/termios/mod.rs similarity index 99% rename from src/termios/src/lib.rs rename to src/header/termios/mod.rs index b0001158d8..fe8988f340 100644 --- a/src/termios/src/lib.rs +++ b/src/header/termios/mod.rs @@ -1,8 +1,6 @@ //! termios implementation, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/termios.h.html -#![no_std] - -extern crate platform; +use platform; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/time/cbindgen.toml b/src/header/time/cbindgen.toml similarity index 100% rename from src/time/cbindgen.toml rename to src/header/time/cbindgen.toml diff --git a/src/time/src/constants.rs b/src/header/time/constants.rs similarity index 100% rename from src/time/src/constants.rs rename to src/header/time/constants.rs diff --git a/src/time/src/helpers.rs b/src/header/time/helpers.rs similarity index 100% rename from src/time/src/helpers.rs rename to src/header/time/helpers.rs diff --git a/src/time/src/linux.rs b/src/header/time/linux.rs similarity index 100% rename from src/time/src/linux.rs rename to src/header/time/linux.rs diff --git a/src/time/src/lib.rs b/src/header/time/mod.rs similarity index 98% rename from src/time/src/lib.rs rename to src/header/time/mod.rs index 75aae5ffd1..09ba1e1617 100644 --- a/src/time/src/lib.rs +++ b/src/header/time/mod.rs @@ -1,23 +1,20 @@ //! time implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/time.h.html -#![no_std] -#![feature(alloc, const_fn)] +use core::mem::transmute; -extern crate alloc; -extern crate errno; -extern crate platform; +use header::errno; +use header::errno::EIO; +use platform; +use platform::{Pal, Sys}; +use platform::types::*; + +use constants::*; +use helpers::*; pub mod constants; mod helpers; mod strftime; -use constants::*; -use core::mem::transmute; -use errno::EIO; -use helpers::*; -use platform::{Pal, Sys}; -use platform::types::*; - #[repr(C)] pub struct timespec { pub tv_sec: time_t, diff --git a/src/time/src/redox.rs b/src/header/time/redox.rs similarity index 100% rename from src/time/src/redox.rs rename to src/header/time/redox.rs diff --git a/src/time/src/strftime.rs b/src/header/time/strftime.rs similarity index 100% rename from src/time/src/strftime.rs rename to src/header/time/strftime.rs diff --git a/src/unistd/src/brk.rs b/src/header/unistd/brk.rs similarity index 100% rename from src/unistd/src/brk.rs rename to src/header/unistd/brk.rs diff --git a/src/unistd/cbindgen.toml b/src/header/unistd/cbindgen.toml similarity index 100% rename from src/unistd/cbindgen.toml rename to src/header/unistd/cbindgen.toml diff --git a/src/unistd/src/getopt.rs b/src/header/unistd/getopt.rs similarity index 100% rename from src/unistd/src/getopt.rs rename to src/header/unistd/getopt.rs diff --git a/src/unistd/src/lib.rs b/src/header/unistd/mod.rs similarity index 98% rename from src/unistd/src/lib.rs rename to src/header/unistd/mod.rs index aef969838c..7765abd7f6 100644 --- a/src/unistd/src/lib.rs +++ b/src/header/unistd/mod.rs @@ -1,15 +1,9 @@ //! unistd implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/unistd.h.html -#![no_std] - -extern crate errno; -extern crate platform; -extern crate stdio; -extern crate string; -extern crate sys_time; - use core::{ptr, slice}; +use header::{errno, stdio, string, sys_time}; +use platform; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/unistd/src/pathconf.rs b/src/header/unistd/pathconf.rs similarity index 100% rename from src/unistd/src/pathconf.rs rename to src/header/unistd/pathconf.rs diff --git a/src/utime/cbindgen.toml b/src/header/utime/cbindgen.toml similarity index 100% rename from src/utime/cbindgen.toml rename to src/header/utime/cbindgen.toml diff --git a/src/utime/src/lib.rs b/src/header/utime/mod.rs similarity index 94% rename from src/utime/src/lib.rs rename to src/header/utime/mod.rs index 16ad0348f7..01dedc0ece 100644 --- a/src/utime/src/lib.rs +++ b/src/header/utime/mod.rs @@ -1,9 +1,6 @@ //! utime implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/utime.h.html -#![no_std] - -extern crate platform; - +use platform; use platform::{Pal, Sys}; use platform::types::*; diff --git a/src/wchar/cbindgen.toml b/src/header/wchar/cbindgen.toml similarity index 100% rename from src/wchar/cbindgen.toml rename to src/header/wchar/cbindgen.toml diff --git a/src/wchar/src/lib.rs b/src/header/wchar/mod.rs similarity index 98% rename from src/wchar/src/lib.rs rename to src/header/wchar/mod.rs index fdeb25becf..bcdbd58cb2 100644 --- a/src/wchar/src/lib.rs +++ b/src/header/wchar/mod.rs @@ -1,19 +1,13 @@ //! wchar implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/wchar.h.html -#![no_std] -#![feature(str_internals)] - -extern crate errno; -extern crate platform; -extern crate stdio; -extern crate time; -extern crate va_list as vl; - use core::ptr; +use va_list::VaList as va_list; + +use header::errno; +use header::stdio::*; +use header::time::*; +use platform; use platform::types::*; -use stdio::*; -use time::*; -use vl::VaList as va_list; mod utf8; diff --git a/src/wchar/src/utf8.rs b/src/header/wchar/utf8.rs similarity index 97% rename from src/wchar/src/utf8.rs rename to src/header/wchar/utf8.rs index d9a23380ff..f3ef32dd66 100644 --- a/src/wchar/src/utf8.rs +++ b/src/header/wchar/utf8.rs @@ -1,13 +1,14 @@ //UTF implementation parts for wchar.h. //Partially ported from the Sortix libc -extern crate errno; -extern crate platform; - use core::{char, slice, str, usize}; -use mbstate_t; + +use header::errno; +use platform; use platform::types::*; +use mbstate_t; + //It's guaranteed that we don't have any nullpointers here pub unsafe fn mbrtowc(pwc: *mut wchar_t, s: *const c_char, n: usize, ps: *mut mbstate_t) -> usize { let mut size = str::utf8_char_width(*s as u8); diff --git a/src/wctype/cbindgen.toml b/src/header/wctype/cbindgen.toml similarity index 100% rename from src/wctype/cbindgen.toml rename to src/header/wctype/cbindgen.toml diff --git a/src/wctype/src/lib.rs b/src/header/wctype/mod.rs similarity index 97% rename from src/wctype/src/lib.rs rename to src/header/wctype/mod.rs index fc6e4b9cb0..80d49c3e66 100644 --- a/src/wctype/src/lib.rs +++ b/src/header/wctype/mod.rs @@ -1,9 +1,6 @@ //! wctype implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/wctype.h.html -#![no_std] - -extern crate platform; - +use platform; use platform::types::*; // #[no_mangle] diff --git a/src/inttypes/Cargo.toml b/src/inttypes/Cargo.toml deleted file mode 100644 index 68a991073e..0000000000 --- a/src/inttypes/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "inttypes" -version = "0.1.0" -authors = ["jD91mZM2 "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -ctype = { path = "../ctype" } -errno = { path = "../errno" } -platform = { path = "../platform" } -stdlib = { path = "../stdlib" } diff --git a/src/inttypes/build.rs b/src/inttypes/build.rs deleted file mode 100644 index 483201ff82..0000000000 --- a/src/inttypes/build.rs +++ /dev/null @@ -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/inttypes.h"); -} diff --git a/src/lib.rs b/src/lib.rs index 37cc9ea0c8..866cc2db26 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,47 +1,33 @@ #![no_std] +#![allow(non_camel_case_types)] +#![feature(alloc)] +#![feature(allocator_api)] +#![feature(const_vec_new)] +#![feature(global_asm)] #![feature(lang_items)] #![feature(linkage)] #![feature(panic_implementation)] +#![feature(thread_local)] -//extern crate compiler_builtins; -extern crate platform; +#[macro_use] +extern crate alloc; +#[macro_use] +extern crate lazy_static; +extern crate rand; +extern crate va_list; -pub extern crate arpainet; -pub extern crate ctype; -pub extern crate dirent; -pub extern crate errno; -pub extern crate fcntl; -pub extern crate fenv; -pub extern crate float; -pub extern crate fnmatch; -pub extern crate grp; -pub extern crate locale; -pub extern crate netinet; -pub extern crate pwd; -pub extern crate semaphore; -pub extern crate setjmp; -pub extern crate signal; -pub extern crate stdio; -pub extern crate stdlib; -pub extern crate string; -pub extern crate strings; -pub extern crate sys_ioctl; -pub extern crate sys_mman; -pub extern crate sys_resource; -pub extern crate sys_select; -pub extern crate sys_socket; -pub extern crate sys_stat; -pub extern crate sys_time; -pub extern crate sys_times; -pub extern crate sys_un; -pub extern crate sys_utsname; -pub extern crate sys_wait; -pub extern crate termios; -pub extern crate time; -pub extern crate unistd; -pub extern crate utime; -pub extern crate wchar; -pub extern crate wctype; +#[cfg(target_os = "linux")] +#[macro_use] +extern crate sc; + +#[cfg(target_os = "redox")] +extern crate syscall; + +#[cfg(target_os = "redox")] +extern crate spin; + +pub mod header; +pub mod platform; use platform::{Pal, Sys}; diff --git a/src/locale/Cargo.toml b/src/locale/Cargo.toml deleted file mode 100644 index 1840ba8f90..0000000000 --- a/src/locale/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "locale" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/locale/build.rs b/src/locale/build.rs deleted file mode 100644 index 60404ed885..0000000000 --- a/src/locale/build.rs +++ /dev/null @@ -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/locale.h"); -} diff --git a/src/netinet/in/Cargo.toml b/src/netinet/in/Cargo.toml deleted file mode 100644 index b6f5356c0b..0000000000 --- a/src/netinet/in/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "in_h" -version = "0.1.0" -authors = ["Dan Robertson "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../../cbindgen" } - -[dependencies] -platform = { path = "../../platform" } -sys_socket = { path = "../../sys_socket" } diff --git a/src/netinet/in/build.rs b/src/netinet/in/build.rs deleted file mode 100644 index f9df3f1a78..0000000000 --- a/src/netinet/in/build.rs +++ /dev/null @@ -1,12 +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"); - fs::create_dir_all("../../../target/include/netinet").expect("failed to create include directory"); - cbindgen::generate(crate_dir) - .expect("failed to generate bindings") - .write_to_file("../../../target/include/netinet/in.h"); -} diff --git a/src/netinet/src/lib.rs b/src/netinet/src/lib.rs deleted file mode 100644 index 86a0d5a081..0000000000 --- a/src/netinet/src/lib.rs +++ /dev/null @@ -1,3 +0,0 @@ -#![no_std] - -pub extern crate in_h; diff --git a/src/platform/Cargo.toml b/src/platform/Cargo.toml deleted file mode 100644 index 7a313fea47..0000000000 --- a/src/platform/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "platform" -version = "0.1.0" -authors = ["Jeremy Soller "] - -[dependencies.ralloc] -path = "../../ralloc" -default-features = false -optional = true - -[target.'cfg(target_os = "linux")'.dependencies] -sc = "0.2" - -[target.'cfg(target_os = "redox")'.dependencies] -redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall.git", branch = "relibc" } -spin = "0.4" diff --git a/src/platform/src/allocator/dlmalloc.rs b/src/platform/allocator/dlmalloc.rs similarity index 100% rename from src/platform/src/allocator/dlmalloc.rs rename to src/platform/allocator/dlmalloc.rs diff --git a/src/platform/src/allocator/ralloc.rs b/src/platform/allocator/ralloc.rs similarity index 100% rename from src/platform/src/allocator/ralloc.rs rename to src/platform/allocator/ralloc.rs diff --git a/src/platform/src/linux/mod.rs b/src/platform/linux/mod.rs similarity index 100% rename from src/platform/src/linux/mod.rs rename to src/platform/linux/mod.rs diff --git a/src/platform/src/linux/signal.rs b/src/platform/linux/signal.rs similarity index 100% rename from src/platform/src/linux/signal.rs rename to src/platform/linux/signal.rs diff --git a/src/platform/src/linux/socket.rs b/src/platform/linux/socket.rs similarity index 100% rename from src/platform/src/linux/socket.rs rename to src/platform/linux/socket.rs diff --git a/src/platform/src/lib.rs b/src/platform/mod.rs similarity index 94% rename from src/platform/src/lib.rs rename to src/platform/mod.rs index bed373141c..918c19f59a 100644 --- a/src/platform/src/lib.rs +++ b/src/platform/mod.rs @@ -1,21 +1,3 @@ -#![no_std] -#![allow(non_camel_case_types)] -#![feature(alloc, allocator_api, const_vec_new)] -#![cfg_attr(target_os = "redox", feature(thread_local))] - -#[cfg_attr(target_os = "redox", macro_use)] -extern crate alloc; - -#[cfg(target_os = "linux")] -#[macro_use] -extern crate sc; - -#[cfg(target_os = "redox")] -extern crate syscall; - -#[cfg(target_os = "redox")] -extern crate spin; - pub use allocator::*; #[cfg(not(feature = "ralloc"))] diff --git a/src/platform/src/pal/mod.rs b/src/platform/pal/mod.rs similarity index 100% rename from src/platform/src/pal/mod.rs rename to src/platform/pal/mod.rs diff --git a/src/platform/src/pal/signal.rs b/src/platform/pal/signal.rs similarity index 100% rename from src/platform/src/pal/signal.rs rename to src/platform/pal/signal.rs diff --git a/src/platform/src/pal/socket.rs b/src/platform/pal/socket.rs similarity index 100% rename from src/platform/src/pal/socket.rs rename to src/platform/pal/socket.rs diff --git a/src/platform/src/rawfile.rs b/src/platform/rawfile.rs similarity index 100% rename from src/platform/src/rawfile.rs rename to src/platform/rawfile.rs diff --git a/src/platform/src/redox/mod.rs b/src/platform/redox/mod.rs similarity index 100% rename from src/platform/src/redox/mod.rs rename to src/platform/redox/mod.rs diff --git a/src/platform/src/redox/signal.rs b/src/platform/redox/signal.rs similarity index 100% rename from src/platform/src/redox/signal.rs rename to src/platform/redox/signal.rs diff --git a/src/platform/src/redox/socket.rs b/src/platform/redox/socket.rs similarity index 100% rename from src/platform/src/redox/socket.rs rename to src/platform/redox/socket.rs diff --git a/src/platform/src/types.rs b/src/platform/types.rs similarity index 100% rename from src/platform/src/types.rs rename to src/platform/types.rs diff --git a/src/pwd/Cargo.toml b/src/pwd/Cargo.toml deleted file mode 100644 index 6273ec82ed..0000000000 --- a/src/pwd/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "pwd" -version = "0.1.0" -authors = ["jD91mZM2 "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -errno = { path = "../errno" } -fcntl = { path = "../fcntl" } -platform = { path = "../platform" } diff --git a/src/pwd/build.rs b/src/pwd/build.rs deleted file mode 100644 index 52d329c6ee..0000000000 --- a/src/pwd/build.rs +++ /dev/null @@ -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/pwd.h"); -} diff --git a/src/semaphore/Cargo.toml b/src/semaphore/Cargo.toml deleted file mode 100644 index a4e0960d99..0000000000 --- a/src/semaphore/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "semaphore" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/semaphore/build.rs b/src/semaphore/build.rs deleted file mode 100644 index a5eba23b85..0000000000 --- a/src/semaphore/build.rs +++ /dev/null @@ -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/semaphore.h"); -} diff --git a/src/sgtty/Cargo.toml b/src/sgtty/Cargo.toml deleted file mode 100644 index d26f1d54ff..0000000000 --- a/src/sgtty/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "sgtty" -version = "0.1.0" -authors = ["jD91mZM2 "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } -sys_ioctl = { path = "../sys_ioctl" } diff --git a/src/sgtty/build.rs b/src/sgtty/build.rs deleted file mode 100644 index 7357fa95fb..0000000000 --- a/src/sgtty/build.rs +++ /dev/null @@ -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/sgtty.h"); -} diff --git a/src/signal/Cargo.toml b/src/signal/Cargo.toml deleted file mode 100644 index c2a3bc9388..0000000000 --- a/src/signal/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "signal" -version = "0.1.0" -authors = ["Dan Robertson "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -errno = { path = "../errno" } -platform = { path = "../platform" } diff --git a/src/signal/build.rs b/src/signal/build.rs deleted file mode 100644 index 011ccd1588..0000000000 --- a/src/signal/build.rs +++ /dev/null @@ -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/signal.h"); -} diff --git a/src/stdio/Cargo.toml b/src/stdio/Cargo.toml deleted file mode 100644 index 9931ddd6fd..0000000000 --- a/src/stdio/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "stdio" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -errno = { path = "../errno"} -fcntl = { path = "../fcntl" } -lazy_static = { version = "*", features = ["nightly", "spin_no_std"] } -platform = { path = "../platform" } -string = { path = "../string" } -va_list = { path = "../../va_list", features = ["no_std"] } diff --git a/src/stdio/build.rs b/src/stdio/build.rs deleted file mode 100644 index 1689fbc565..0000000000 --- a/src/stdio/build.rs +++ /dev/null @@ -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/stdio.h"); -} diff --git a/src/stdlib/Cargo.toml b/src/stdlib/Cargo.toml deleted file mode 100644 index 61b603425d..0000000000 --- a/src/stdlib/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "stdlib" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } -ctype = { path = "../ctype" } -errno = { path = "../errno" } -rand = { version = "0.5.2", default-features = false } -string = { path = "../string" } -time = { path = "../time" } -unistd = { path = "../unistd" } -wchar = { path = "../wchar" } -fcntl = { path = "../fcntl" } diff --git a/src/stdlib/build.rs b/src/stdlib/build.rs deleted file mode 100644 index 44430ddae6..0000000000 --- a/src/stdlib/build.rs +++ /dev/null @@ -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/stdlib.h"); -} diff --git a/src/string/Cargo.toml b/src/string/Cargo.toml deleted file mode 100644 index 69a3f03d74..0000000000 --- a/src/string/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "string" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -errno = { path = "../errno" } -platform = { path = "../platform" } -signal = { path = "../signal" } diff --git a/src/string/build.rs b/src/string/build.rs deleted file mode 100644 index ce8ad27c5e..0000000000 --- a/src/string/build.rs +++ /dev/null @@ -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/string.h"); -} diff --git a/src/strings/Cargo.toml b/src/strings/Cargo.toml deleted file mode 100644 index 24e75867a8..0000000000 --- a/src/strings/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "strings" -version = "0.1.0" -authors = ["jD91mZM2 "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/strings/build.rs b/src/strings/build.rs deleted file mode 100644 index 574237034f..0000000000 --- a/src/strings/build.rs +++ /dev/null @@ -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/strings.h"); -} diff --git a/src/sys_file/Cargo.toml b/src/sys_file/Cargo.toml deleted file mode 100644 index 1853666e93..0000000000 --- a/src/sys_file/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "sys_file" -version = "0.1.0" -authors = ["jD91mZM2 "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/sys_file/build.rs b/src/sys_file/build.rs deleted file mode 100644 index 1009eaeebb..0000000000 --- a/src/sys_file/build.rs +++ /dev/null @@ -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/sys/file.h"); -} diff --git a/src/sys_ioctl/Cargo.toml b/src/sys_ioctl/Cargo.toml deleted file mode 100644 index 6f868b8c34..0000000000 --- a/src/sys_ioctl/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "sys_ioctl" -version = "0.1.0" -authors = ["jD91mZM2 "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/sys_ioctl/build.rs b/src/sys_ioctl/build.rs deleted file mode 100644 index e82221d0b3..0000000000 --- a/src/sys_ioctl/build.rs +++ /dev/null @@ -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/sys/ioctl.h"); -} diff --git a/src/sys_mman/Cargo.toml b/src/sys_mman/Cargo.toml deleted file mode 100644 index 4f7c08b1e4..0000000000 --- a/src/sys_mman/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "sys_mman" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/sys_mman/build.rs b/src/sys_mman/build.rs deleted file mode 100644 index 19d21bd491..0000000000 --- a/src/sys_mman/build.rs +++ /dev/null @@ -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/sys/mman.h"); -} diff --git a/src/sys_resource/Cargo.toml b/src/sys_resource/Cargo.toml deleted file mode 100644 index a1bea8424e..0000000000 --- a/src/sys_resource/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "sys_resource" -version = "0.1.0" -authors = ["Dan Robertson "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } -sys_time = { path = "../sys_time" } diff --git a/src/sys_resource/build.rs b/src/sys_resource/build.rs deleted file mode 100644 index a8c03a627e..0000000000 --- a/src/sys_resource/build.rs +++ /dev/null @@ -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/sys/resource.h"); -} diff --git a/src/sys_select/Cargo.toml b/src/sys_select/Cargo.toml deleted file mode 100644 index 09d7dcae7c..0000000000 --- a/src/sys_select/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "sys_select" -version = "0.1.0" -authors = ["jD91mZM2 "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/sys_select/build.rs b/src/sys_select/build.rs deleted file mode 100644 index 5314b67db9..0000000000 --- a/src/sys_select/build.rs +++ /dev/null @@ -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/sys/select.h"); -} diff --git a/src/sys_socket/Cargo.toml b/src/sys_socket/Cargo.toml deleted file mode 100644 index 0c3cc667e1..0000000000 --- a/src/sys_socket/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "sys_socket" -version = "0.1.0" -authors = ["Dan Robertson "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/sys_socket/build.rs b/src/sys_socket/build.rs deleted file mode 100644 index ad891ecb68..0000000000 --- a/src/sys_socket/build.rs +++ /dev/null @@ -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/sys/socket.h"); -} diff --git a/src/sys_stat/Cargo.toml b/src/sys_stat/Cargo.toml deleted file mode 100644 index 23e1253120..0000000000 --- a/src/sys_stat/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "sys_stat" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -fcntl = { path = "../fcntl" } -platform = { path = "../platform" } diff --git a/src/sys_stat/build.rs b/src/sys_stat/build.rs deleted file mode 100644 index 0d79f3cce8..0000000000 --- a/src/sys_stat/build.rs +++ /dev/null @@ -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/sys/stat.h"); -} diff --git a/src/sys_time/Cargo.toml b/src/sys_time/Cargo.toml deleted file mode 100644 index 20b3ac9c6f..0000000000 --- a/src/sys_time/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "sys_time" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/sys_time/build.rs b/src/sys_time/build.rs deleted file mode 100644 index 9d087ef9c1..0000000000 --- a/src/sys_time/build.rs +++ /dev/null @@ -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/sys/time.h"); -} diff --git a/src/sys_times/Cargo.toml b/src/sys_times/Cargo.toml deleted file mode 100644 index 31f1646396..0000000000 --- a/src/sys_times/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "sys_times" -version = "0.1.0" -authors = ["jD91mZM2 "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/sys_times/build.rs b/src/sys_times/build.rs deleted file mode 100644 index d93c16000a..0000000000 --- a/src/sys_times/build.rs +++ /dev/null @@ -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/sys/times.h"); -} diff --git a/src/sys_un/Cargo.toml b/src/sys_un/Cargo.toml deleted file mode 100644 index be0e821f65..0000000000 --- a/src/sys_un/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "sys_un" -version = "0.1.0" -authors = ["jD91mZM2 "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } -sys_socket = { path = "../sys_socket" } diff --git a/src/sys_un/build.rs b/src/sys_un/build.rs deleted file mode 100644 index fcf990a9ff..0000000000 --- a/src/sys_un/build.rs +++ /dev/null @@ -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/sys/un.h"); -} diff --git a/src/sys_utsname/Cargo.toml b/src/sys_utsname/Cargo.toml deleted file mode 100644 index 69edfcfea9..0000000000 --- a/src/sys_utsname/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "sys_utsname" -version = "0.1.0" -authors = ["jD91mZM2 "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[target.'cfg(target_os = "linux")'.dependencies] -platform = { path = "../platform" } diff --git a/src/sys_utsname/build.rs b/src/sys_utsname/build.rs deleted file mode 100644 index 2f45974eee..0000000000 --- a/src/sys_utsname/build.rs +++ /dev/null @@ -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/sys/utsname.h"); -} diff --git a/src/sys_wait/Cargo.toml b/src/sys_wait/Cargo.toml deleted file mode 100644 index 44250ca7f7..0000000000 --- a/src/sys_wait/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "sys_wait" -version = "0.1.0" -authors = ["Dan Robertson "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } -sys_resource = { path = "../sys_resource" } diff --git a/src/sys_wait/build.rs b/src/sys_wait/build.rs deleted file mode 100644 index 53a786af45..0000000000 --- a/src/sys_wait/build.rs +++ /dev/null @@ -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/sys/wait.h"); -} diff --git a/src/template/Cargo.toml b/src/template/Cargo.toml deleted file mode 100644 index 844bcb55eb..0000000000 --- a/src/template/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "template" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/template/build.rs b/src/template/build.rs deleted file mode 100644 index 35b5d3bd87..0000000000 --- a/src/template/build.rs +++ /dev/null @@ -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/template.h"); -} diff --git a/src/termios/Cargo.toml b/src/termios/Cargo.toml deleted file mode 100644 index 4fa692f2ff..0000000000 --- a/src/termios/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "termios" -version = "0.1.0" -authors = ["jD91mZM2 "] - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/termios/build.rs b/src/termios/build.rs deleted file mode 100644 index da15d4a9b4..0000000000 --- a/src/termios/build.rs +++ /dev/null @@ -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/termios.h"); -} diff --git a/src/time/Cargo.toml b/src/time/Cargo.toml deleted file mode 100644 index 1521354550..0000000000 --- a/src/time/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "time" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } -errno = { path = "../errno" } diff --git a/src/time/build.rs b/src/time/build.rs deleted file mode 100644 index 7bc136af55..0000000000 --- a/src/time/build.rs +++ /dev/null @@ -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/time.h"); -} diff --git a/src/unistd/Cargo.toml b/src/unistd/Cargo.toml deleted file mode 100644 index 138a8209f9..0000000000 --- a/src/unistd/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "unistd" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -errno = { path = "../errno" } -platform = { path = "../platform" } -stdio = { path = "../stdio" } -string = { path = "../string" } -sys_time = { path = "../sys_time" } diff --git a/src/unistd/build.rs b/src/unistd/build.rs deleted file mode 100644 index ca19204932..0000000000 --- a/src/unistd/build.rs +++ /dev/null @@ -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"); -} diff --git a/src/utime/Cargo.toml b/src/utime/Cargo.toml deleted file mode 100644 index 81bcd75cb3..0000000000 --- a/src/utime/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "utime" -version = "0.1.0" -authors = ["Jeremy Soller "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/utime/build.rs b/src/utime/build.rs deleted file mode 100644 index eb7b3b921b..0000000000 --- a/src/utime/build.rs +++ /dev/null @@ -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/utime.h"); -} diff --git a/src/wchar/Cargo.toml b/src/wchar/Cargo.toml deleted file mode 100644 index 97e412f20d..0000000000 --- a/src/wchar/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "wchar" -version = "0.1.0" -authors = ["Stephan Vedder "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[features] -str_internals = [] - -[dependencies] -platform = { path = "../platform" } -stdio = { path = "../stdio" } -errno = { path = "../errno" } -time = { path = "../time" } -va_list = { path = "../../va_list", features = ["no_std"] } \ No newline at end of file diff --git a/src/wchar/build.rs b/src/wchar/build.rs deleted file mode 100644 index 5b64a17833..0000000000 --- a/src/wchar/build.rs +++ /dev/null @@ -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/wchar.h"); -} diff --git a/src/wctype/Cargo.toml b/src/wctype/Cargo.toml deleted file mode 100644 index abb1ba562f..0000000000 --- a/src/wctype/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "wctype" -version = "0.1.0" -authors = ["Dan Robertson "] -build = "build.rs" - -[build-dependencies] -cbindgen = { path = "../../cbindgen" } - -[dependencies] -platform = { path = "../platform" } diff --git a/src/wctype/build.rs b/src/wctype/build.rs deleted file mode 100644 index d0b0702cea..0000000000 --- a/src/wctype/build.rs +++ /dev/null @@ -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/wctype.h"); -}