From b6bfdab107b985a5ead98311785beaf6223d4781 Mon Sep 17 00:00:00 2001 From: tkl Date: Sun, 21 Aug 2016 12:05:14 +0200 Subject: [PATCH 1/2] path correction in makefile --- .cproject | 17 ++++++++++------- Makefile | 3 --- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.cproject b/.cproject index 67f4bf4..437afc7 100755 --- a/.cproject +++ b/.cproject @@ -146,7 +146,6 @@ make - all true true @@ -154,7 +153,6 @@ make - clean true true @@ -162,6 +160,7 @@ make + distclean true false @@ -217,7 +216,6 @@ make - all true true @@ -249,7 +247,6 @@ make - distclean true true @@ -257,7 +254,7 @@ make - TEST_APP=blinky BOARD=stm32f4-discovery DEBUG=y + BOARD=stm32f4-discovery DEBUG=y deploy true false @@ -287,6 +284,14 @@ false true + + make + BOARD=stm32f4-discovery + deploy + true + false + true + make APP=example_radio_rx BOARD=msp430-ccrf DEBUG=y @@ -313,7 +318,6 @@ make - all true true @@ -321,7 +325,6 @@ make - clean true true diff --git a/Makefile b/Makefile index 2c31dd1..e6ad827 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,6 @@ HEX_FILE = $(EXE_DIR)/$(TEST_APP)$(HEX_EXT) SIZE_FILE = $(SIZE_DIR)/$(TEST_APP)$(SIZE_EXT) MAP_FILE = $(MAP_DIR)/$(TEST_APP)$(MAP_EXT) -OBJ_DIR = release/object/debug -EXE_DIR = release/execute/debug - #include subfolders include source/firmware/firmware.mk ifdef TEST_APP From de4d281b56e10dd96424ed37ba48397acae92545 Mon Sep 17 00:00:00 2001 From: tkl Date: Sun, 21 Aug 2016 10:09:02 +0000 Subject: [PATCH 2/2] Version numbering for v0.1.2 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a51c27..e2d7459 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: SW_KERNEL: "0" SW_MAJOR: "1" - SW_MINOR: "2" + SW_MINOR: "3" before_script: - "echo $CI_BUILD_ID"