Skip to content

Commit f99645e

Browse files
committed
more clean up
1 parent 42734a1 commit f99645e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ GDB := $(CROSS_COMPILE)gdb
4949
NRFUTIL = adafruit-nrfutil
5050
NRFJPROG = nrfjprog
5151

52-
MK := mkdir
52+
MK := mkdir -p
5353
RM := rm -rf
5454

5555
# Verbose mode (V=). 0: default, 1: print out CFLAG, LDFLAG 2: print all compile command
@@ -75,7 +75,7 @@ ifeq ($(filter $(BOARD),$(BOARD_LIST)),)
7575
endif
7676

7777
# Build directory
78-
BUILD = _build-$(BOARD)
78+
BUILD = _build/build-$(BOARD)
7979

8080
# Board specific
8181
-include src/boards/$(BOARD)/board.mk

tools/build_all.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import subprocess
66
import time
77

8-
subprocess.run("rm -rf _build*", shell=True)
9-
subprocess.run("rm -rf bin/*", shell=True)
8+
subprocess.run("rm -rf _build/", shell=True)
9+
subprocess.run("rm -rf bin/", shell=True)
1010

1111
success_count = 0
1212
fail_count = 0
@@ -45,12 +45,12 @@
4545
success = "\033[31mfailed\033[0m "
4646
fail_count += 1
4747

48-
for entry in os.scandir("_build-{}".format(board)):
48+
for entry in os.scandir("_build/build-{}".format(board)):
4949
for extension in ["zip", "hex"]:
5050
if entry.name.endswith(extension) and "nosd" not in entry.name:
5151
shutil.copy(entry.path, bin_directory)
5252

53-
out_file = glob.glob('_build-{}/*.out'.format(board))[0]
53+
out_file = glob.glob('_build/build-{}/*.out'.format(board))[0]
5454
size_output = subprocess.run('size {}'.format(out_file), shell=True, stdout=subprocess.PIPE).stdout.decode("utf-8")
5555
size_list = size_output.split('\n')[1].split('\t')
5656
flash_size = int(size_list[0])

0 commit comments

Comments
 (0)