Skip to content

Commit 06f5eea

Browse files
ppescherppescher
committed
updated build scripts
1 parent f475389 commit 06f5eea

File tree

9 files changed

+36
-25
lines changed

9 files changed

+36
-25
lines changed

‎sam/1.0.5/cores/arduino/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
libsam_sam3a4c_gcc_rel.*
2+
libvariant_geolink_opentracker_gcc_dbg.*

‎sam/1.0.5/system/libsam/build_gcc/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
release_sam3a4c/

‎sam/1.0.5/system/libsam/build_gcc/Makefile‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -127,21 +127,26 @@ libsam_sam3a4c_gcc_rel.a:
127127
.PHONY: clean
128128
clean:
129129
@echo ------------------------------------------------------------------------------------
130-
@echo --- Cleaning sam3s4c release and debug
131-
@$(MAKE) CHIP=__SAM3S4C__ $(SUBMAKE_OPTIONS) -f sam3.mk $@
132-
@$(MAKE) CHIP=__SAM3S4C__ DEBUG=1 $(SUBMAKE_OPTIONS) -f sam3.mk $@
130+
# @echo --- Cleaning sam3s4c release and debug
131+
# @$(MAKE) CHIP=__SAM3S4C__ $(SUBMAKE_OPTIONS) -f sam3.mk $@
132+
# @$(MAKE) CHIP=__SAM3S4C__ DEBUG=1 $(SUBMAKE_OPTIONS) -f sam3.mk $@
133133

134-
@echo --- Cleaning sam3u4e release and debug
135-
@$(MAKE) CHIP=__SAM3U4E__ $(SUBMAKE_OPTIONS) -f sam3.mk $@
136-
@$(MAKE) CHIP=__SAM3U4E__ DEBUG=1 $(SUBMAKE_OPTIONS) -f sam3.mk $@
134+
# @echo --- Cleaning sam3u4e release and debug
135+
# @$(MAKE) CHIP=__SAM3U4E__ $(SUBMAKE_OPTIONS) -f sam3.mk $@
136+
# @$(MAKE) CHIP=__SAM3U4E__ DEBUG=1 $(SUBMAKE_OPTIONS) -f sam3.mk $@
137137

138-
@echo --- Cleaning sam3x8e release and debug
139-
@$(MAKE) CHIP=__SAM3X8E__ $(SUBMAKE_OPTIONS) -f sam3.mk $@
140-
@$(MAKE) CHIP=__SAM3X8E__ DEBUG=1 $(SUBMAKE_OPTIONS) -f sam3.mk $@
138+
# @echo --- Cleaning sam3x8e release and debug
139+
# @$(MAKE) CHIP=__SAM3X8E__ $(SUBMAKE_OPTIONS) -f sam3.mk $@
140+
# @$(MAKE) CHIP=__SAM3X8E__ DEBUG=1 $(SUBMAKE_OPTIONS) -f sam3.mk $@
141141

142-
@echo --- Cleaning sam3x8h release and debug
143-
@$(MAKE) CHIP=__SAM3X8H__ $(SUBMAKE_OPTIONS) -f sam3.mk $@
144-
@$(MAKE) CHIP=__SAM3X8H__ DEBUG=1 $(SUBMAKE_OPTIONS) -f sam3.mk $@
145-
@echo ------------------------------------------------------------------------------------
142+
# @echo --- Cleaning sam3x8h release and debug
143+
# @$(MAKE) CHIP=__SAM3X8H__ $(SUBMAKE_OPTIONS) -f sam3.mk $@
144+
# @$(MAKE) CHIP=__SAM3X8H__ DEBUG=1 $(SUBMAKE_OPTIONS) -f sam3.mk $@
145+
146+
@echo --- Cleaning geolink_opentracker release
147+
@$(MAKE) CHIP=__SAM3A4C__ $(SUBMAKE_OPTIONS) OUTPUT_BIN=../../../variants/geolink_opentracker -f sam3.mk
146148

149+
@echo --- Cleaning sam3a4c release
150+
@$(MAKE) CHIP=__SAM3A4C__ $(SUBMAKE_OPTIONS) -f sam3.mk $@
151+
@echo ------------------------------------------------------------------------------------
147152

‎sam/1.0.5/system/libsam/build_gcc/gcc.mk‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,8 @@ AR = $(CROSS_COMPILE)ar
2424
CC = $(CROSS_COMPILE)gcc
2525
AS = $(CROSS_COMPILE)as
2626
NM = $(CROSS_COMPILE)nm
27-
ifeq ($(OS),Windows_NT)
28-
RM=cs-rm -Rf
29-
#RM=del /s /f
30-
else
27+
3128
RM=rm -Rf
32-
endif
3329

3430
SEP=/
3531

‎sam/1.0.5/system/libsam/build_gcc/sam3.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ create_output:
164164
# @echo -------------------------
165165
# @echo *$(A_SRC)
166166
# @echo -------------------------
167-
168167
-@mkdir $(subst /,$(SEP),$(OUTPUT_BIN)) 1>$(DEV_NUL) 2>&1
169168
-@mkdir $(OUTPUT_PATH) 1>$(DEV_NUL) 2>&1
170169
@echo ------------------------------------------------------------------------------------

‎sam/1.0.5/variants/geolink_opentracker/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Use with MSYS prompt
2-
export ARM_GCC_TOOLCHAIN=$LOCALAPPDATA/Arduino15/packages/arduino/tools/arm-none-eabi-gcc/4.8.3-2014q1
2+
export ARM_GCC_TOOLCHAIN=$LOCALAPPDATA/Arduino15/packages/arduino/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin
33

44
# build libsam
55
cd ../../system/libsam/build_gcc/

‎sam/1.0.5/variants/geolink_opentracker/build_gcc/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
debug_geolink_opentracker/

‎sam/1.0.5/variants/geolink_opentracker/build_gcc/gcc.mk‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,10 @@ CC = $(CROSS_COMPILE)gcc
2525
CXX = $(CROSS_COMPILE)g++
2626
AS = $(CROSS_COMPILE)as
2727
NM = $(CROSS_COMPILE)nm
28-
ifeq ($(OS),Windows_NT)
29-
RM=cs-rm -Rf
30-
else
28+
3129
RM=rm -Rf
32-
endif
3330

34-
SEP=\\
31+
SEP=/
3532

3633
# ---------------------------------------------------------------------------------------
3734
# C Flags

‎sam/1.0.5/variants/geolink_opentracker/clean.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Use with MSYS prompt
2+
export ARM_GCC_TOOLCHAIN=$LOCALAPPDATA/Arduino15/packages/arduino/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin
3+
4+
# build libsam
5+
cd ../../system/libsam/build_gcc/
6+
mingw32-make clean
7+
8+
# test build variant
9+
cd ../../../variants/geolink_opentracker/build_gcc/
10+
mingw32-make clean

0 commit comments

Comments
 (0)