Skip to content

Commit 33ca4a4

Browse files
facchinmfacchinm
committed
Replace arduino-builder patch with external tool
1 parent ceacc8c commit 33ca4a4

File tree

8 files changed

+1373
-1400
lines changed

8 files changed

+1373
-1400
lines changed

‎boards.txt

+25-25
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ stm32f429.build.extra_flags=
1111
stm32f429.build.architecture=cortex-m4
1212
stm32f429.build.board=DISCO_F429ZI
1313
stm32f429.build.ldscript=linker_script.ld
14-
stm32f429.compiler.mbed.defines=@{build.variant.path}/defines.txt
15-
stm32f429.compiler.mbed.ldflags=@{build.variant.path}/ldflags.txt
16-
stm32f429.compiler.mbed.cflags=@{build.variant.path}/cflags.txt
17-
stm32f429.compiler.mbed.cxxflags=@{build.variant.path}/cxxflags.txt
18-
stm32f429.compiler.mbed.includes=${build.variant.path}/includes.txt
14+
stm32f429.compiler.mbed.defines={build.variant.path}/defines.txt
15+
stm32f429.compiler.mbed.ldflags={build.variant.path}/ldflags.txt
16+
stm32f429.compiler.mbed.cflags={build.variant.path}/cflags.txt
17+
stm32f429.compiler.mbed.cxxflags={build.variant.path}/cxxflags.txt
18+
stm32f429.compiler.mbed.includes={build.variant.path}/includes.txt
1919
stm32f429.compiler.mbed.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
2020
stm32f429.compiler.mbed={build.variant.path}/libs/libmbed.a
2121
stm32f429.vid.0=0x8087
@@ -43,11 +43,11 @@ odinw2.build.extra_flags=
4343
odinw2.build.architecture=cortex-m4
4444
odinw2.build.board=MBED_CONNECT_ODIN
4545
odinw2.build.ldscript=linker_script.ld
46-
odinw2.compiler.mbed.defines=@{build.variant.path}/defines.txt
47-
odinw2.compiler.mbed.ldflags=@{build.variant.path}/ldflags.txt
48-
odinw2.compiler.mbed.cflags=@{build.variant.path}/cflags.txt
49-
odinw2.compiler.mbed.cxxflags=@{build.variant.path}/cxxflags.txt
50-
odinw2.compiler.mbed.includes=${build.variant.path}/includes.txt
46+
odinw2.compiler.mbed.defines={build.variant.path}/defines.txt
47+
odinw2.compiler.mbed.ldflags={build.variant.path}/ldflags.txt
48+
odinw2.compiler.mbed.cflags={build.variant.path}/cflags.txt
49+
odinw2.compiler.mbed.cxxflags={build.variant.path}/cxxflags.txt
50+
odinw2.compiler.mbed.includes={build.variant.path}/includes.txt
5151
odinw2.compiler.mbed.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
5252
odinw2.compiler.mbed={build.variant.path}/libs/libmbed.a
5353
odinw2.vid.0=0x8087
@@ -75,11 +75,11 @@ nucleo_h7.build.extra_flags=
7575
nucleo_h7.build.architecture=cortex-m7
7676
nucleo_h7.build.board=NUCLEO_H743ZI
7777
nucleo_h7.build.ldscript=linker_script.ld
78-
nucleo_h7.compiler.mbed.defines=@{build.variant.path}/defines.txt
79-
nucleo_h7.compiler.mbed.ldflags=@{build.variant.path}/ldflags.txt
80-
nucleo_h7.compiler.mbed.cflags=@{build.variant.path}/cflags.txt
81-
nucleo_h7.compiler.mbed.cxxflags=@{build.variant.path}/cxxflags.txt
82-
nucleo_h7.compiler.mbed.includes=${build.variant.path}/includes.txt
78+
nucleo_h7.compiler.mbed.defines={build.variant.path}/defines.txt
79+
nucleo_h7.compiler.mbed.ldflags={build.variant.path}/ldflags.txt
80+
nucleo_h7.compiler.mbed.cflags={build.variant.path}/cflags.txt
81+
nucleo_h7.compiler.mbed.cxxflags={build.variant.path}/cxxflags.txt
82+
nucleo_h7.compiler.mbed.includes={build.variant.path}/includes.txt
8383
nucleo_h7.compiler.mbed.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
8484
nucleo_h7.compiler.mbed={build.variant.path}/libs/libmbed.a
8585
nucleo_h7.vid.0=0x0483
@@ -107,11 +107,11 @@ envie_m4.build.extra_flags=
107107
envie_m4.build.architecture=cortex-m4
108108
envie_m4.build.board=ENVIE_M4
109109
envie_m4.build.ldscript=linker_script.ld
110-
envie_m4.compiler.mbed.defines=@{build.variant.path}/defines.txt
111-
envie_m4.compiler.mbed.ldflags=@{build.variant.path}/ldflags.txt
112-
envie_m4.compiler.mbed.cflags=@{build.variant.path}/cflags.txt
113-
envie_m4.compiler.mbed.cxxflags=@{build.variant.path}/cxxflags.txt
114-
envie_m4.compiler.mbed.includes=${build.variant.path}/includes.txt
110+
envie_m4.compiler.mbed.defines={build.variant.path}/defines.txt
111+
envie_m4.compiler.mbed.ldflags={build.variant.path}/ldflags.txt
112+
envie_m4.compiler.mbed.cflags={build.variant.path}/cflags.txt
113+
envie_m4.compiler.mbed.cxxflags={build.variant.path}/cxxflags.txt
114+
envie_m4.compiler.mbed.includes={build.variant.path}/includes.txt
115115
envie_m4.compiler.mbed.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
116116
envie_m4.compiler.mbed={build.variant.path}/libs/libmbed.a
117117
envie_m4.vid.0=0x0483
@@ -140,11 +140,11 @@ nrf52840.build.architecture=cortex-m4
140140
nrf52840.build.board=NRF52840_DK
141141
nrf52840.build.ldscript=linker_script.ld
142142
nrf52840.build.zip.pattern="{tools.nrfutil.cmd}" dfu genpkg --dev-type 0x0052 --sd-req {build.sd_fwid} --application "{build.path}/{build.project_name}.hex" "{build.path}/{build.project_name}.zip"
143-
nrf52840.compiler.mbed.defines=@{build.variant.path}/defines.txt
144-
nrf52840.compiler.mbed.ldflags=@{build.variant.path}/ldflags.txt
145-
nrf52840.compiler.mbed.cflags=@{build.variant.path}/cflags.txt
146-
nrf52840.compiler.mbed.cxxflags=@{build.variant.path}/cxxflags.txt
147-
nrf52840.compiler.mbed.includes=${build.variant.path}/includes.txt
143+
nrf52840.compiler.mbed.defines={build.variant.path}/defines.txt
144+
nrf52840.compiler.mbed.ldflags={build.variant.path}/ldflags.txt
145+
nrf52840.compiler.mbed.cflags={build.variant.path}/cflags.txt
146+
nrf52840.compiler.mbed.cxxflags={build.variant.path}/cxxflags.txt
147+
nrf52840.compiler.mbed.includes={build.variant.path}/includes.txt
148148
nrf52840.compiler.mbed.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
149149
nrf52840.compiler.mbed={build.variant.path}/libs/libmbed.a {build.variant.path}/libs/libcc_310_core.a {build.variant.path}/libs/libcc_310_ext.a {build.variant.path}/libs/libcc_310_trng.a
150150
nrf52840.vid.0=0x0483

‎platform.txt

+8-5
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ compiler.warning_flags.all=-Wall -Wextra
1818

1919
compiler.path={build.compiler_path}
2020
compiler.c.cmd={build.crossprefix}gcc
21-
compiler.c.flags=-c -I. {compiler.warning_flags} -Os -g -nostdlib {compiler.mbed.defines} {compiler.mbed.cflags} -MMD -std=gnu11 -mcpu={build.mcu}
21+
compiler.c.flags=-c -I. {compiler.warning_flags} -Os -g -nostdlib @{compiler.mbed.defines} @{compiler.mbed.cflags} -MMD -std=gnu11 -mcpu={build.mcu}
2222
compiler.c.elf.cmd={build.crossprefix}g++
2323
compiler.c.elf.flags=-Wl,--gc-sections {compiler.warning_flags} -Wl,--as-needed
2424
compiler.S.flags=-c -g -x assembler-with-cpp -Os -mcpu={build.mcu}
2525
compiler.cpp.cmd={build.crossprefix}g++
26-
compiler.cpp.flags=-c -I. {compiler.warning_flags} -g -Os -nostdlib {compiler.mbed.defines} {compiler.mbed.cxxflags} -MMD -std=gnu++11 -mcpu={build.mcu}
26+
compiler.cpp.flags=-c -I. {compiler.warning_flags} -g -Os -nostdlib @{compiler.mbed.defines} @{compiler.mbed.cxxflags} -MMD -std=gnu++11 -mcpu={build.mcu}
2727
compiler.ar.cmd={build.crossprefix}ar
2828
compiler.ar.flags=rcs
2929
compiler.objcopy.cmd=
@@ -65,17 +65,20 @@ build.zip.pattern={recipe.size.pattern}
6565
# Linux compile patterns
6666
# -----------------------
6767

68+
## Prepare include file
69+
recipe.hooks.prebuild.1.pattern="{runtime.tools.expand-property-map.path}" -in "{compiler.mbed.includes}" -out "{build.path}/preprocess/includes.txt"
70+
6871
## Compile c files
69-
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {build.extra_flags} {compiler.c.extra_flags} "-I{build.core.path}/api/deprecated" {includes} {compiler.mbed.includes} -o "{object_file}" "{source_file}"
72+
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {build.extra_flags} {compiler.c.extra_flags} "-I{build.core.path}/api/deprecated" {includes} "@{build.path}/preprocess/includes.txt" -o "{object_file}" "{source_file}"
7073

7174
## Compile c++ files
72-
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {build.extra_flags} {compiler.cpp.extra_flags} "-I{build.core.path}/api/deprecated" {includes} {compiler.mbed.includes} "{source_file}" -o "{object_file}"
75+
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {build.extra_flags} {compiler.cpp.extra_flags} "-I{build.core.path}/api/deprecated" {includes} "@{build.path}/preprocess/includes.txt" "{source_file}" -o "{object_file}"
7376

7477
## Create archives
7578
recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
7679

7780
## Combine gc-sections, archives, and objects
78-
recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} {compiler.mbed.ldflags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nano.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--whole-archive "{build.path}/{archive_file}" {compiler.mbed} -Wl,--no-whole-archive -Wl,--start-group {compiler.mbed.extra_ldflags} {compiler.libraries.ldflags} -Wl,--end-group
81+
recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} @{compiler.mbed.ldflags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nano.specs --specs=nosys.specs {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} -Wl,--whole-archive "{build.path}/{archive_file}" {compiler.mbed} -Wl,--no-whole-archive -Wl,--start-group {compiler.mbed.extra_ldflags} {compiler.libraries.ldflags} -Wl,--end-group
7982

8083
## Create eeprom
8184
recipe.objcopy.eep.pattern=

0 commit comments

Comments
 (0)