Merge pull request #293 from mcoffin/fix-289-travis-examples

Fixes #289 
Add examples to travis (and fix example fallout from #285)

Author: mcoffin

.travis.yml

@@ -8,6 +8,7 @@ install:
 script:
     - ./configure --host=arm-none-eabi
     - cargo build --target=$TARGET --verbose --features $PLATFORM
+    - ./ci/build-examples.sh
 after_script:
     - cargo test --lib --verbose
     - (cd ./ioreg; cargo build --verbose; cargo test --verbose)
@@ -17,11 +18,13 @@ env:
   matrix:
     - 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"
     - PLATFORM=stm32f4
       TARGET=thumbv7em-none-eabi
+      EXAMPLES="blink_stm32f4"
     - PLATFORM=stm32l1
       TARGET=thumbv7m-none-eabi
-    - PLATFORM=tiva_c
-      TARGET=thumbv7em-none-eabi
+      EXAMPLES="blink_stm32l1 bluenrg_stm32l1 usart_stm32l1"

Cargo.toml

@@ -91,5 +91,5 @@ name = "uart_tiva_c"
 path = "examples/app_uart_tiva_c.rs"
 
 [[example]]
-name = "uart_stm32l1"
-path = "examples/app_uart_stm32l1.rs"
+name = "usart_stm32l1"
+path = "examples/app_usart_stm32l1.rs"

ci/build-examples.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#
+# Zinc, the bare metal stack for rust.
+# Copyright 2014 Matt Coffin <[email protected]>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+for e in $EXAMPLES; do
+	EXAMPLE_NAME=$e make build
+done

examples/app_blink_stm32l1.rs

@@ -1,16 +1,16 @@
 #![feature(no_std, core, start)]
 #![no_std]
 
-extern crate core;
-extern crate zinc;
-
 #[start]
 fn start(_: isize, _: *const *const u8) -> isize {
   main();
   0
 }
 
-pub unsafe fn main() {
+extern crate core;
+extern crate zinc;
+
+fn main() {
   use core::option::Option;
   use zinc::hal::pin::Gpio;
   use zinc::hal::stm32l1::{init, pin, timer};

examples/app_blink_tiva_c.rs

@@ -1,11 +1,9 @@
-#![feature(plugin, no_std, core)]
-#![crate_type="staticlib"]
+#![feature(plugin, no_std, core, start)]
 #![no_std]
 #![plugin(macro_platformtree)]
 
 extern crate core;
 extern crate zinc;
-#[macro_use] #[no_link] extern crate macro_platformtree;
 
 platformtree!(
   tiva_c@mcu {
@@ -17,8 +15,7 @@ platformtree!(
     }
 
     gpio {
-      f {
-        led1@1 { direction = "out"; }
+      f { led1@1 { direction = "out"; }
         led2@2 { direction = "out"; }
       }
     }
@@ -46,7 +43,7 @@ platformtree!(
   }
 );
 
-pub fn run(args: &pt::run_args) {
+fn run(args: &pt::run_args) {
   use zinc::hal::pin::Gpio;
   use zinc::hal::timer::Timer;
 

examples/app_bluenrg_stm32l1.rs

@@ -46,7 +46,7 @@ fn map_byte(s: u8) -> (&'static str, &'static str) {
   (map_hex(s>>4), map_hex(s&0xF))
 }
 
-pub unsafe fn main() {
+pub fn main() {
   use core::fmt::Write;
   use core::result::Result;
   use zinc::drivers::bluenrg;
@@ -92,7 +92,9 @@ pub unsafe fn main() {
     spi::Role::Master, spi::DataSize::U8, spi::DataFormat::MsbFirst, 1).
     unwrap_or_else(|_| {
       let _ = write!(&mut uart, "SPI failed to initialize");
-      abort()
+      unsafe {
+        abort()
+      }
     });
 
   let bnrg_reset = pin::Pin::new(pin::Port::PortA, 8,

examples/app_dht22.rs

@@ -1,4 +1,4 @@
-#![feature(plugin, no_std, core)]
+#![feature(start, plugin, no_std, core)]
 #![crate_type="staticlib"]
 #![no_std]
 #![plugin(macro_platformtree)]

examples/app_empty.rs

@@ -1,4 +1,4 @@
-#![feature(core, plugin, asm, no_std)]
+#![feature(core, plugin, asm, no_std, start)]
 #![crate_type="staticlib"]
 #![no_std]
 #![plugin(macro_platformtree)]

examples/app_lcd_tiva_c.rs

@@ -1,4 +1,4 @@
-#![feature(plugin, no_std, core)]
+#![feature(plugin, no_std, core, start)]
 #![crate_type="staticlib"]
 #![no_std]
 #![plugin(macro_platformtree)]

examples/app_uart_tiva_c.rs

@@ -1,4 +1,4 @@
-#![feature(plugin, no_std, core)]
+#![feature(plugin, no_std, core, start)]
 #![crate_type="staticlib"]
 #![no_std]
 #![plugin(macro_platformtree)]