hackndev · farcaller · Jul 18, 2015 · Jun 26, 2015 · Jun 26, 2015 · Jun 26, 2015
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ autom4te.cache
 Makefile
 /cov
 *.pyc
+/examples/*/*.json
diff --git a/.travis.yml b/.travis.yml
@@ -7,29 +7,12 @@ before_install:
     - wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz && tar xzf master.tar.gz
     - (mkdir kcov-master/build && cd kcov-master/build && cmake .. && make && make install DESTDIR=../tmp)
 script:
-    - ./configure --host=arm-none-eabi
-    - cargo build --target=$TARGET --verbose --features mcu_$PLATFORM
-    - ./support/build-examples.sh
-after_script:
-    - cargo test --lib --verbose
-    - (cd ./ioreg; cargo build --verbose; cargo test --verbose)
-    - (kcov-master/tmp/usr/local/bin/kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo,ioreg/tests target/kcov ioreg/target/debug/test-*)
-    - (cd ./platformtree; cargo build --verbose; cargo test --verbose)
-    - (cd ./macro_platformtree; cargo build --verbose; cargo test --verbose)
-    - (cd ./macro_zinc; cargo test --verbose)
-    - (kcov-master/tmp/usr/local/bin/kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov target/debug/zinc-*)
-
+    - ./support/build-jenkins.sh
 env:
   matrix:
+    - PLATFORM=native
+    - PLATFORM=lpc11xx
     - PLATFORM=lpc17xx
-      TARGET=thumbv7m-none-eabi
-      EXAMPLES="blink blink_pt uart dht22 empty"
     - PLATFORM=k20
-      TARGET=thumbv7em-none-eabi
-      EXAMPLES="blink_k20 blink_k20_isr empty"
     - PLATFORM=stm32f4
-      TARGET=thumbv7em-none-eabi
-      EXAMPLES="blink_stm32f4 empty"
     - PLATFORM=stm32l1
-      TARGET=thumbv7m-none-eabi
-      EXAMPLES="blink_stm32l1 bluenrg_stm32l1 usart_stm32l1 empty"
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,16 +9,23 @@ name = "zinc"
 crate-type = ["lib"]
 
 [features]
+test = ["volatile_cell/replayer"]
+
+cpu_cortex-m0 = []
 cpu_cortex-m3 = []
 cpu_cortex-m4 = []
 
+mcu_lpc11xx = ["cpu_cortex-m0"]
 mcu_lpc17xx = ["cpu_cortex-m3"]
 mcu_stm32f4 = ["cpu_cortex-m4"]
 mcu_stm32l1 = ["cpu_cortex-m3"]
 mcu_k20 = ["cpu_cortex-m4"]
 mcu_tiva_c = ["cpu_cortex-m4"]
 multitasking = ["cpu_cortex-m4"]
 
+[target.thumbv6-none-eabi.dependencies.core]
+git = "https://github.com/hackndev/rust-libcore"
+
 [target.thumbv7m-none-eabi.dependencies.core]
 git = "https://github.com/hackndev/rust-libcore"
 
@@ -32,9 +39,12 @@ path = "./ioreg"
 path = "./volatile_cell"
 
 [dependencies.rlibc]
-git = "https://github.com/mcoffin/rlibc"
+git = "https://github.com/hackndev/rlibc"
 branch = "zinc"
 
+[dev-dependencies]
+expectest = "*"
+
 [dev-dependencies.platformtree]
 path = "./platformtree"
 
@@ -43,63 +53,3 @@ path = "./macro_platformtree"
 
 [dev-dependencies.macro_zinc]
 path = "./macro_zinc"
-
-[[example]]
-name = "nothing"
-path = "examples/nothing.rs"
-
-[[example]]
-name = "blink"
-path = "examples/blink.rs"
-
-[[example]]
-name = "blink_k20"
-path = "examples/blink_k20.rs"
-
-[[example]]
-name = "blink_k20_isr"
-path = "examples/blink_k20_isr.rs"
-
-[[example]]
-name = "blink_pt"
-path = "examples/blink_pt.rs"
-
-[[example]]
-name = "blink_stm32f4"
-path = "examples/blink_stm32f4.rs"
-
-[[example]]
-name = "blink_stm32l1"
-path = "examples/blink_stm32l1.rs"
-
-[[example]]
-name = "blink_tiva_c"
-path = "examples/blink_tiva_c.rs"
-
-[[example]]
-name = "bluenrg_stm32l1"
-path = "examples/bluenrg_stm32l1.rs"
-
-[[example]]
-name = "dht22"
-path = "examples/dht22.rs"
-
-[[example]]
-name = "empty"
-path = "examples/empty.rs"
-
-[[example]]
-name = "lcd_tiva_c"
-path = "examples/lcd_tiva_c.rs"
-
-[[example]]
-name = "uart"
-path = "examples/uart.rs"
-
-[[example]]
-name = "uart_tiva_c"
-path = "examples/uart_tiva_c.rs"
-
-[[example]]
-name = "usart_stm32l1"
-path = "examples/usart_stm32l1.rs"
diff --git a/build.rs b/build.rs
@@ -15,12 +15,17 @@ fn get_platform() -> Option<String> {
 }
 
 fn copy_linker_scripts<P: AsRef<Path>, Q: AsRef<Path>>(target: P, out_path: Q) -> io::Result<()> {
+  let path_prefix = if env::var("CARGO_MANIFEST_DIR").unwrap().find("/examples/").is_none() {
+    Path::new(".")
+  } else {
+    Path::new("./../..")
+  };
   // Try copying the linker scripts
   let target_dir = Path::new("src/hal").join(target);
   let out_dir: &Path = out_path.as_ref();
-  try!(fs::copy("src/hal/layout_common.ld", out_dir.join("layout_common.ld")));
-  try!(fs::copy(target_dir.join("iomem.ld"), out_dir.join("iomem.ld")));
-  try!(fs::copy(target_dir.join("layout.ld"), out_dir.join("layout.ld")));
+  try!(fs::copy(path_prefix.join("src/hal/layout_common.ld"), out_dir.join("layout_common.ld")));
+  try!(fs::copy(path_prefix.join(target_dir.join("iomem.ld")), out_dir.join("iomem.ld")));
+  try!(fs::copy(path_prefix.join(target_dir.join("layout.ld")), out_dir.join("layout.ld")));
 
   Ok(())
 }

diff --git a/configure b/configure
@@ -2146,6 +2146,9 @@ CC=$GCC
 
 
 case $PLATFORM in
+lpc11xx)
+  platform_target=thumbv6-none-eabi
+  ;;
 lpc17xx | stm32l1)
 	platform_target=thumbv7m-none-eabi
 	;;

diff --git a/configure.ac b/configure.ac
@@ -13,6 +13,9 @@ AC_SUBST(CC, $GCC)
 AC_ARG_VAR(PLATFORM, [Platform for which to build])
 
 case $PLATFORM in
+lpc11xx)
+  platform_target=thumbv6-none-eabi
+  ;;
 lpc17xx | stm32l1)
 	platform_target=thumbv7m-none-eabi
 	;;

diff --git a/examples/blink_k20/Cargo.toml b/examples/blink_k20/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "blink"
+version = "0.0.1"
+
+[features]
+default = ["mcu_k20"]
+mcu_k20 = ["zinc/mcu_k20"]
+
+[dependencies]
+zinc = { path =  "../.." }
+macro_zinc = { path = "../../macro_zinc" }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/blink_k20.rs → examples/blink_k20/src/main.rs b/examples/blink_k20.rs → examples/blink_k20/src/main.rs
@@ -6,9 +6,10 @@ extern crate core;
 extern crate zinc;
 
 use core::option::Option::Some;
+
+use zinc::hal::cortex_m4::systick;
 use zinc::hal::k20::{pin, watchdog};
 use zinc::hal::pin::Gpio;
-use zinc::hal::cortex_m4::systick;
 
 /// Wait the given number of SysTick ticks
 pub fn wait(ticks: u32) {

diff --git a/examples/blink_k20_isr/Cargo.toml b/examples/blink_k20_isr/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "blink_k20_isr"
+version = "0.0.1"
+
+[features]
+default = ["mcu_k20"]
+mcu_k20 = ["zinc/mcu_k20"]
+
+[dependencies]
+zinc = { path =  "../.." }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/blink_k20_isr.rs → examples/blink_k20_isr/src/main.rs b/examples/blink_k20_isr.rs → examples/blink_k20_isr/src/main.rs
diff --git a/examples/blink_lpc17xx/Cargo.toml b/examples/blink_lpc17xx/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "blink"
+version = "0.0.1"
+
+[features]
+default = ["mcu_lpc17xx"]
+mcu_lpc17xx = ["zinc/mcu_lpc17xx"]
+
+[dependencies]
+zinc = { path =  "../.." }
+macro_zinc = { path = "../../macro_zinc" }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/blink.rs → examples/blink_lpc17xx/src/main.rs b/examples/blink.rs → examples/blink_lpc17xx/src/main.rs
@@ -5,11 +5,12 @@
 extern crate core;
 extern crate zinc;
 
-use zinc::hal::timer::Timer;
+use core::option::Option::Some;
+
 use zinc::hal::lpc17xx::{pin, timer};
-use zinc::hal::pin::GpioDirection;
 use zinc::hal::pin::Gpio;
-use core::option::Option::Some;
+use zinc::hal::pin::GpioDirection;
+use zinc::hal::timer::Timer;
 
 #[zinc_main]
 pub fn main() {

diff --git a/examples/blink_pt/Cargo.toml b/examples/blink_pt/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "blink"
+version = "0.0.1"
+
+[features]
+default = ["mcu_lpc17xx"]
+mcu_lpc17xx = ["zinc/mcu_lpc17xx"]
+
+[dependencies]
+zinc = { path =  "../.." }
+macro_platformtree = { path = "../../macro_platformtree" }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/blink_pt.rs → examples/blink_pt/src/main.rs b/examples/blink_pt.rs → examples/blink_pt/src/main.rs
diff --git a/examples/blink_stm32f4/Cargo.toml b/examples/blink_stm32f4/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "blink_stm32f4"
+version = "0.0.1"
+
+[features]
+default = ["mcu_stm32f4"]
+mcu_stm32f4 = ["zinc/mcu_stm32f4"]
+
+[dependencies]
+zinc = { path =  "../.." }
+macro_zinc = { path = "../../macro_zinc" }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/blink_stm32f4.rs → examples/blink_stm32f4/src/main.rs b/examples/blink_stm32f4.rs → examples/blink_stm32f4/src/main.rs
diff --git a/examples/blink_stm32l1/Cargo.toml b/examples/blink_stm32l1/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "blink_stm32l1"
+version = "0.0.1"
+
+[features]
+default = ["mcu_stm32l1"]
+mcu_stm32l1 = ["zinc/mcu_stm32l1"]
+
+[dependencies]
+zinc = { path =  "../.." }
+macro_zinc = { path = "../../macro_zinc" }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/blink_stm32l1.rs → examples/blink_stm32l1/src/main.rs b/examples/blink_stm32l1.rs → examples/blink_stm32l1/src/main.rs
diff --git a/examples/blink_tiva_c/Cargo.toml b/examples/blink_tiva_c/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "blink_tiva_c"
+version = "0.0.1"
+
+[features]
+default = ["mcu_tiva_c"]
+mcu_tiva_c = ["zinc/mcu_tiva_c"]
+
+[dependencies]
+zinc = { path =  "../.." }
+macro_platformtree = { path = "../../macro_platformtree" }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/blink_tiva_c.rs → examples/blink_tiva_c/src/main.rs b/examples/blink_tiva_c.rs → examples/blink_tiva_c/src/main.rs
diff --git a/examples/bluenrg_stm32l1/Cargo.toml b/examples/bluenrg_stm32l1/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "bluenrg_stm32l1"
+version = "0.0.1"
+
+[features]
+default = ["mcu_stm32l1"]
+mcu_stm32l1 = ["zinc/mcu_stm32l1"]
+
+[dependencies]
+zinc = { path =  "../.." }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/bluenrg_stm32l1.rs → examples/bluenrg_stm32l1/src/main.rs b/examples/bluenrg_stm32l1.rs → examples/bluenrg_stm32l1/src/main.rs
diff --git a/examples/dht22/Cargo.toml b/examples/dht22/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "dht22"
+version = "0.0.1"
+
+[features]
+default = ["mcu_lpc17xx"]
+mcu_lpc17xx = ["zinc/mcu_lpc17xx"]
+
+[dependencies]
+zinc = { path =  "../.." }
+macro_platformtree = { path = "../../macro_platformtree" }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/dht22.rs → examples/dht22/src/main.rs b/examples/dht22.rs → examples/dht22/src/main.rs
diff --git a/examples/empty/Cargo.toml b/examples/empty/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "empty"
+version = "0.0.1"
+
+[features]
+mcu_lpc11xx = ["zinc/mcu_lpc11xx"]
+mcu_lpc17xx = ["zinc/mcu_lpc17xx"]
+mcu_stm32f4 = ["zinc/mcu_stm32f4"]
+mcu_stm32l1 = ["zinc/mcu_stm32l1"]
+mcu_k20 = ["zinc/mcu_k20"]
+mcu_tiva_c = ["zinc/mcu_tiva_c"]
+
+[dependencies]
+zinc = { path =  "../.." }
+macro_zinc = { path = "../../macro_zinc" }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/empty.rs → examples/empty/src/main.rs b/examples/empty.rs → examples/empty/src/main.rs
diff --git a/examples/lcd_tiva_c/Cargo.toml b/examples/lcd_tiva_c/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "lcd_tiva_c"
+version = "0.0.1"
+
+[features]
+default = ["mcu_tiva_c"]
+mcu_tiva_c = ["zinc/mcu_tiva_c"]
+
+[dependencies]
+zinc = { path =  "../.." }
+macro_platformtree = { path = "../../macro_platformtree" }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/lcd_tiva_c.rs → examples/lcd_tiva_c/src/main.rs b/examples/lcd_tiva_c.rs → examples/lcd_tiva_c/src/main.rs
diff --git a/examples/nothing.rs b/examples/nothing.rs
diff --git a/examples/uart/Cargo.toml b/examples/uart/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "uart"
+version = "0.0.1"
+
+[features]
+default = ["mcu_lpc17xx"]
+mcu_lpc17xx = ["zinc/mcu_lpc17xx"]
+
+[dependencies]
+zinc = { path =  "../.." }
+macro_platformtree = { path = "../../macro_platformtree" }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/uart.rs → examples/uart/src/main.rs b/examples/uart.rs → examples/uart/src/main.rs
diff --git a/examples/uart_tiva_c/Cargo.toml b/examples/uart_tiva_c/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "uart_tiva_c"
+version = "0.0.1"
+
+[features]
+default = ["mcu_tiva_c"]
+mcu_tiva_c = ["zinc/mcu_tiva_c"]
+
+[dependencies]
+zinc = { path =  "../.." }
+macro_platformtree = { path = "../../macro_platformtree" }
+core = { git = "https://github.com/hackndev/rust-libcore" }
diff --git a/examples/uart_tiva_c.rs → examples/uart_tiva_c/src/main.rs b/examples/uart_tiva_c.rs → examples/uart_tiva_c/src/main.rs
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,3 +13,4 @@ autom4te.cache @@
     Makefile
     /cov
     *.pyc
+    /examples/*/*.json