2-stage sysroot. zephyr renamed to zephyr-core

Allows all crates built here to be provided in the sysroot by default so
they do not have to be named in the app's Cargo.toml with relative path
dependencies.

Author: tylerwhall

rust/build.sh

@@ -3,21 +3,32 @@
 HOST=$(rustc -vV | grep host: | cut -d ' ' -f 2)
 VERSION="+nightly-2019-05-22"
 CARGO_ARGS="${VERSION} -v build --target=${RUST_TARGET} --release"
-cargo ${CARGO_ARGS} --target-dir=${SYSROOT_BUILD} --manifest-path=./sysroot/Cargo.toml -p std
 
-SYSROOT_LIB="${SYSROOT}/lib/rustlib/${RUST_TARGET}/lib"
-SYSROOT_LIB_HOST="${SYSROOT}/lib/rustlib/${HOST}/lib"
+publish_sysroot() {
+    local SYSROOT=$1
+    local SYSROOT_LIB="${SYSROOT}/lib/rustlib/${RUST_TARGET}/lib"
+    local SYSROOT_LIB_HOST="${SYSROOT}/lib/rustlib/${HOST}/lib"
+    shift
+    rm -rf ${SYSROOT}
+    mkdir -p ${SYSROOT_LIB} ${SYSROOT_LIB_HOST}
 
-copy_dir_if_changed() {
-    mkdir -p $2
-    if ! diff --brief --recursive $1 $2; then
-        rm -r $2
-        cp -a $1 $2
-    fi
+    for src in $@; do
+        cp -a $src/${RUST_TARGET}/release/deps/. ${SYSROOT_LIB}
+        cp -a $src/release/deps/. ${SYSROOT_LIB_HOST}
+    done
 }
 
-copy_dir_if_changed ${SYSROOT_BUILD}/${RUST_TARGET}/release/deps ${SYSROOT_LIB}
-copy_dir_if_changed ${SYSROOT_BUILD}/release/deps ${SYSROOT_LIB_HOST}
+# Build std
+cargo ${CARGO_ARGS} \
+    --target-dir=${SYSROOT_BUILD}-stage1 \
+    --manifest-path=./sysroot-stage1/Cargo.toml -p std
+publish_sysroot ${SYSROOT}-stage1 ${SYSROOT_BUILD}-stage1
+# Build Zephyr crates
+RUSTFLAGS="${RUSTFLAGS} --sysroot ${SYSROOT}-stage1" cargo ${CARGO_ARGS} \
+    --target-dir=${SYSROOT_BUILD}-stage2 \
+    --manifest-path=./sysroot-stage2/Cargo.toml
+
+publish_sysroot ${SYSROOT} ${SYSROOT_BUILD}-stage1 ${SYSROOT_BUILD}-stage2
 
 export RUSTFLAGS="${RUSTFLAGS} --sysroot ${SYSROOT}"
 cargo ${CARGO_ARGS} --target-dir=${APP_BUILD} --manifest-path=${CARGO_MANIFEST}

rust/rust

@@ -0,0 +1,18 @@
+[package]
+authors = ["Tyler Hall <[email protected]>"]
+name = "sysroot"
+version = "0.0.0"
+
+[dependencies.zephyr]
+path = "../zephyr"
+
+[dependencies.zephyr-macros]
+path = "../zephyr-macros"
+
+[dependencies.zephyr-logger]
+path = "../zephyr-logger"
+
+[profile.release]
+lto = true
+panic = "abort"
+debug = true

rust/sysroot/Cargo.lock renamed to rust/sysroot-stage1/Cargo.lock

@@ -0,0 +1,19 @@
+[package]
+name = "zephyr-core"
+description = "Safe bindings to Zephyr kernel API (only using libcore)"
+version = "0.1.0"
+authors = ["Tyler Hall <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+libc = { path = "../libc" }
+
+zephyr-sys = { path = "../zephyr-sys" }
+core = { version = '1.0.0', optional = true, package = 'rustc-std-workspace-core' }
+compiler_builtins = { version = '0.1.2', optional = true }
+derive_more = { version = '0.14.1', default-features = false, features = ['no_std'] }
+
+[features]
+defaults = [ 'rustc-dep-of-std' ]
+rustc-dep-of-std = ['core', 'compiler_builtins/rustc-dep-of-std', 'zephyr-sys/rustc-dep-of-std', 'libc/rustc-dep-of-std']
+have_std = []