Merge pull request #285 from mcoffin/new-build

Refactored build system and fixed issues with current nightly

Author: farcaller

.gitignore

@@ -1,3 +1,10 @@
 /build/
 /thirdparty/
 .DS_Store
+Cargo.lock
+target
+.cargo
+*.o
+*.bin
+*.lst
+autom4te.cache

.travis.yml

@@ -1,17 +1,26 @@
 language: rust
+rust: nightly
 before_install:
     - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
     - sudo apt-get update -o Dir::Etc::sourcelist="sources.list.d/terry_guo-gcc-arm-embedded-precise.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
 install:
     - sudo apt-get install gcc-arm-none-eabi
-    - (mkdir -p ./thirdparty/rust)
-    - (cd ./thirdparty/rust; wget -O rust.tar.gz https://github.com/rust-lang/rust/tarball/`rustc --version|awk '{sub(/\\(/, "", $3); print $3}'`; tar -zx --strip-components=1 -f rust.tar.gz)
 script:
-    - rake build_all test
+    - ./configure --host=arm-none-eabi
+    - cargo build --target=$TARGET --verbose --features $PLATFORM
+after_script:
+    - cargo test --lib --verbose
+    - (cd ./platformtree; cargo build --verbose; cargo test --verbose)
+    - (cd ./macro_platformtree; cargo build --verbose; cargo test --verbose)
 env:
   matrix:
     - PLATFORM=lpc17xx
+      TARGET=thumbv7m-none-eabi
+    - PLATFORM=k20
+      TARGET=thumbv7em-none-eabi
     - PLATFORM=stm32f4
+      TARGET=thumbv7em-none-eabi
     - PLATFORM=stm32l1
-    - PLATFORM=k20
+      TARGET=thumbv7m-none-eabi
     - PLATFORM=tiva_c
+      TARGET=thumbv7em-none-eabi

Cargo.toml

@@ -0,0 +1,95 @@
+[package]
+name = "zinc"
+version = "0.1.0"
+authors = ["Zinc Developers <[email protected]>"]
+build = "build.rs"
+
+[lib]
+name = "zinc"
+crate-type = ["lib"]
+
+[features]
+lpc17xx = []
+stm32f4 = []
+stm32l1 = []
+k20 = []
+tiva_c = []
+
+[target.thumbv7m-none-eabi.dependencies.core]
+git = "https://github.com/hackndev/rust-libcore"
+
+[target.thumbv7em-none-eabi.dependencies.core]
+git = "https://github.com/hackndev/rust-libcore"
+
+[dependencies.ioreg]
+path = "./ioreg"
+
+[dependencies.rlibc]
+git = "https://github.com/mcoffin/rlibc"
+branch = "zinc"
+
+[dev-dependencies.platformtree]
+path = "./platformtree"
+
+[dev-dependencies.macro_platformtree]
+path = "./macro_platformtree"
+
+[[example]]
+name = "nothing"
+path = "examples/app_nothing.rs"
+
+[[example]]
+name = "blink"
+path = "examples/app_blink.rs"
+
+[[example]]
+name = "blink_k20"
+path = "examples/app_blink_k20.rs"
+
+[[example]]
+name = "blink_k20_isr"
+path = "examples/app_blink_k20_isr.rs"
+
+[[example]]
+name = "blink_pt"
+path = "examples/app_blink_pt.rs"
+
+[[example]]
+name = "blink_stm32f4"
+path = "examples/app_blink_stm32f4.rs"
+
+[[example]]
+name = "blink_stm32l1"
+path = "examples/app_blink_stm32l1.rs"
+
+[[example]]
+name = "blink_tiva_c"
+path = "examples/app_blink_tiva_c.rs"
+
+[[example]]
+name = "bluenrg_stm32l1"
+path = "examples/app_bluenrg_stm32l1.rs"
+
+[[example]]
+name = "dht22"
+path = "examples/app_dht22.rs"
+
+[[example]]
+name = "empty"
+path = "examples/app_empty.rs"
+
+[[example]]
+name = "lcd_tiva_c"
+path = "examples/app_lcd_tiva_c.rs"
+
+[[example]]
+name = "uart"
+path = "examples/app_uart.rs"
+
+[[example]]
+name = "uart_tiva_c"
+path = "examples/app_uart_tiva_c.rs"
+
+[[example]]
+name = "uart_stm32l1"
+path = "examples/app_uart_stm32l1.rs"

Makefile.in

@@ -0,0 +1,39 @@
+STRIP=@STRIP@
+OBJCOPY=@OBJCOPY@
+OBJDUMP=@OBJDUMP@
+
+CARGO_ROOT=@srcdir@
+
+PLATFORM=@PLATFORM@
+TARGET=@TARGET@
+
+$(if $(value EXAMPLE_NAME),, \
+	$(error EXAMPLE_NAME must be set))
+
+# Output directory
+OUT_DIR=$(CARGO_ROOT)/target/$(TARGET)/release
+EXAMPLE_DIR=$(OUT_DIR)/examples
+
+BIN_FILE=$(EXAMPLE_DIR)/$(EXAMPLE_NAME).bin
+LST_FILE=$(EXAMPLE_DIR)/$(EXAMPLE_NAME).lst
+EXAMPLE_FILE=$(EXAMPLE_DIR)/$(EXAMPLE_NAME)
+
+.PHONY: build clean listing $(EXAMPLE_FILE)
+
+build: $(BIN_FILE)
+
+clean:
+	cargo clean
+
+listing: $(LST_FILE)
+
+# Target is PHONY so cargo can deal with dependencies
+$(EXAMPLE_FILE):
+	cd $(CARGO_ROOT)
+	cargo build --example $(EXAMPLE_NAME) --release --target=$(TARGET) --verbose --features $(PLATFORM)
+
+$(BIN_FILE): $(EXAMPLE_FILE)
+	$(OBJCOPY) -O binary $< $@
+
+$(LST_FILE): $(EXAMPLE_FILE)
+	$(OBJDUMP) -D $< > $@

README.md

@@ -30,12 +30,23 @@ Zinc is distributed under Apache-2.0, see LICENSE for more details.
 
 ## Usage
 
-Get a gcc cross-toolchain for arm and configure `TOOLCHAIN` and `RUNTIME_LIB` in
-Rakefile header as appropriate. `RUNTIME_LIB` should be either libgcc or
-libcompiler-rt ar archive, compiled for appropriate architecture.
+### Environment Setup
 
-To build an application from apps/ use the following rake command:
+Get a gcc cross-toolchain for arm and make sure it is accessible.
+
+### Examples
+
+First, generate a `Makefile` and `.cargo/config` with `configure` so cargo
+can find your toolchain. Your toolchain triple is probably `arm-none-eabi`
+````
+./configure PLATFORM=<platform> --host=<toolchain-triple>
+````
+
+To build an application from examples/ use the following command after having
+run `configure`:
 
 ```
-rake PLATFORM=<platform> build_all  # or build_<appname>
+EXAMPLE_NAME=<example> make build
 ```
+
+Ouput will go to `target/<target-triple>/release/examples`.