djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few tweaks based on review feedback

This commit is contained in:
Scott Shawcroft 2018-11-30 10:58:27 -08:00
parent 9d07e95351
commit 56345ff997
No known key found for this signature in database
GPG Key ID: FD0EDC4B6C53CA59
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/unix/Makefile
View File

@ -245,7 +245,7 @@ coverage:
$(MAKE) \ $(MAKE) \
COPT="-O0" CFLAGS_EXTRA='$(CFLAGS_EXTRA) -DMP_CONFIGFILE="<mpconfigport_coverage.h>" \ COPT="-O0" CFLAGS_EXTRA='$(CFLAGS_EXTRA) -DMP_CONFIGFILE="<mpconfigport_coverage.h>" \
-fprofile-arcs -ftest-coverage \ -fprofile-arcs -ftest-coverage \
-Wformat -Wmissing-declarations -Wmissing-prototypes -Wsign-compare \ -Wdouble-promotion -Wformat -Wmissing-declarations -Wmissing-prototypes -Wsign-compare \
-Wold-style-definition -Wpointer-arith -Wshadow -Wuninitialized -Wunused-parameter \ -Wold-style-definition -Wpointer-arith -Wshadow -Wuninitialized -Wunused-parameter \
-DMICROPY_UNIX_COVERAGE' \ -DMICROPY_UNIX_COVERAGE' \
LDFLAGS_EXTRA='-fprofile-arcs -ftest-coverage' \ LDFLAGS_EXTRA='-fprofile-arcs -ftest-coverage' \

11
tools/build_adafruit_bins.py
View File

@ -44,17 +44,24 @@ for board in build_boards:
exit_status = make_result.returncode exit_status = make_result.returncode
success = "\033[31mfailed\033[0m" success = "\033[31mfailed\033[0m"
other_output = ""
for extension in board_info["extensions"]: for extension in board_info["extensions"]:
temp_filename = "../ports/{port}/build-{board}/firmware.{extension}".format(port=board_info["port"], board=board, extension=extension) temp_filename = "../ports/{port}/build-{board}/firmware.{extension}".format(port=board_info["port"], board=board, extension=extension)
final_filename = "adafruit-circuitpython-{board}-{language}-{version}.{extension}".format(board=board, language=language, version=version, extension=extension) final_filename = "adafruit-circuitpython-{board}-{language}-{version}.{extension}".format(board=board, language=language, version=version, extension=extension)
final_filename = os.path.join(bin_directory, final_filename) final_filename = os.path.join(bin_directory, final_filename)
shutil.copyfile(temp_filename, final_filename) try:
shutil.copyfile(temp_filename, final_filename)
except FileNotFoundError:
other_output = "Cannot find file {}".format(temp_filename)
if exit_status == 0:
exit_status = 1
if travis: if travis:
print('travis_fold:start:adafruit-bins-{}-{}\\r'.format(language, board)) print('travis_fold:start:adafruit-bins-{}-{}\\r'.format(language, board))
print("Build {} for {} took {:.2f}s and {}".format(board, language, build_duration, success)) print("Build {} for {} took {:.2f}s and {}".format(board, language, build_duration, success))
print(len(make_result.stdout))
print(make_result.stdout.decode("utf-8")) print(make_result.stdout.decode("utf-8"))
print(other_output)
# Only upload to Rosie if its a pull request. # Only upload to Rosie if its a pull request.
if travis: if travis:
for rosie in ROSIE_SETUPS: for rosie in ROSIE_SETUPS:

3
tools/build_board_info.py
View File

@ -29,9 +29,12 @@ extension_by_port = {
# Per board overrides # Per board overrides
extension_by_board = { extension_by_board = {
"feather_nrf52832": BIN, "feather_nrf52832": BIN,
"arduino_mkr1300": BIN,
"arduino_zero": BIN, "arduino_zero": BIN,
"feather_m0_adalogger": BIN_UF2, "feather_m0_adalogger": BIN_UF2,
"feather_m0_basic": BIN_UF2, "feather_m0_basic": BIN_UF2,
"feather_m0_rfm69": BIN,
"feather_m0_rfm9x": BIN,
"makerdiary_nrf52840_mdk": HEX "makerdiary_nrf52840_mdk": HEX
} }