From ef4d98be47543a5f12acd37b864c948569a4ad2b Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 13 Jul 2023 11:34:57 -0600 Subject: [PATCH 1/4] [docs] Update BUILDING.md to use TARGET instead of ARCH (#193) --- docs/BUILDING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/BUILDING.md b/docs/BUILDING.md index 30664fad..c3690b2c 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -4,8 +4,8 @@ You can compile an individual project by running `make ` or `make _docker` to build the project inside a docker container. You can change whether you are compiling for the remarkable or a PC by -adjusting the `ARCH` environment variable. See `src/actions.make` for the list -of architectures, which include (but is not limited to) `dev` and `arm` +adjusting the `TARGET` environment variable. See `src/actions.make` for the list +of targets, which include (but is not limited to) `dev` and `arm` ## Compilation From 534cd3be2bf87b4b1b62ef4416a1ee07167ddc08 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 9 Aug 2023 00:22:00 -0600 Subject: [PATCH 2/4] [build] Don't error on make clean if rmkit.h doesn't exist (#195) --- src/rmkit/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rmkit/Makefile b/src/rmkit/Makefile index 1ecb5db9..3541a1f1 100644 --- a/src/rmkit/Makefile +++ b/src/rmkit/Makefile @@ -12,4 +12,4 @@ APP=rmkit ASSET_DIR=assets/ clean: - rm ${SRC_DIR}/build/${EXE} + rm -f ${SRC_DIR}/build/${EXE} From 7a9873d59f60055b580a0cb0278d17453def614d Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 9 Aug 2023 00:22:38 -0600 Subject: [PATCH 3/4] [simple] Make output more readable (#196) --- src/simple/main.cpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/simple/main.cpy b/src/simple/main.cpy index da32da86..d25cc8e4 100644 --- a/src/simple/main.cpy +++ b/src/simple/main.cpy @@ -350,7 +350,7 @@ def main(): continue if tokens.size() < 5: - cerr << "line " << line_no << ": not enough tokens passed" + cerr << "line " << line_no << ": not enough tokens passed" << endl continue if !handle_widget(line_no, scene, tokens): From 9d52200bd574acda5a91b52ed033ee6ec1a177ab Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 9 Aug 2023 21:53:57 -0600 Subject: [PATCH 4/4] [nao] Fix repo select in nao (#197) --- src/nao/nao.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nao/nao.sh b/src/nao/nao.sh index 0c5fc837..93be6eea 100644 --- a/src/nao/nao.sh +++ b/src/nao/nao.sh @@ -114,8 +114,7 @@ function SET() { function DISPLAY() { use_newline_separator - OUTPUT=`for line in ${SCENE[@]}; do echo $line; done` - RETURN=`echo "$OUTPUT" | ${SIMPLE}` + RETURN=`echo "${SCENE[*]}" | ${SIMPLE}` use_space_separator SAVED_RETURN=${RETURN} }