From b3217ccb032045fe4a6f0e1460bf9d3b6a845400 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Sat, 5 Feb 2022 17:44:32 +0100 Subject: [PATCH 1/4] build util dir when testing --- .github/workflows/build-on-pull-request.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml index 7f09ec6af..307cbd048 100644 --- a/.github/workflows/build-on-pull-request.yml +++ b/.github/workflows/build-on-pull-request.yml @@ -23,7 +23,9 @@ jobs: - name: Build the tools. shell: bash - run: make -j2 bin USER_CFLAGS=-Werror + run: | + make -j2 bin USER_CFLAGS=-Werror + make -j2 util - name: Build the platform libraries. shell: bash run: make -j2 lib QUIET=1 From 179f2d05aa4d106a51fa4b88746a133e0236f6eb Mon Sep 17 00:00:00 2001 From: mrdudz Date: Sat, 5 Feb 2022 17:44:46 +0100 Subject: [PATCH 2/4] utils before samples --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6552c60ec..540c214fc 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ all mostlyclean clean install zip: @$(MAKE) -C src --no-print-directory $@ @$(MAKE) -C libsrc --no-print-directory $@ @$(MAKE) -C doc --no-print-directory $@ - @$(MAKE) -C samples --no-print-directory $@ @$(MAKE) -C util --no-print-directory $@ + @$(MAKE) -C samples --no-print-directory $@ avail unavail bin: @$(MAKE) -C src --no-print-directory $@ From 2ea9cf0449287d2d867010834af9715ee93cac3b Mon Sep 17 00:00:00 2001 From: mrdudz Date: Sat, 5 Feb 2022 17:44:54 +0100 Subject: [PATCH 3/4] cleanup --- targettest/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/targettest/Makefile b/targettest/Makefile index 806eda2fd..e430fb356 100644 --- a/targettest/Makefile +++ b/targettest/Makefile @@ -673,6 +673,11 @@ EXELIST_sim6502 = \ EXELIST_sim65c02 = $(EXELIST_sim6502) + +# omitted: arg-test clock clock-test conio cpeek-test cprintf cursor deb dir-test +# div-test em-test exec-test1 exec-test2 fileio-test ft getopt-test heaptest +# joy-test moddiv-test mouse-test mul-test posixio-test rename-test scanf-test +# ser-test seek strdup-test strnlen stroserror-test strqtok-test tinyshell uname-test EXELIST_atari2600 = \ minimal @@ -682,6 +687,9 @@ EXELIST_atari5200 = \ EXELIST_gamate = \ minimal +EXELIST_lynx = \ + minimal + EXELIST_supervision = \ minimal @@ -693,9 +701,6 @@ EXELIST_bbc = \ EXELIST_lunix = \ notavailable -EXELIST_lynx = \ - minimal - # Unlisted targets will try to build everything. # That lets us learn what they cannot build, and what settings # we need to use for programs that can be built and run. From 096c28bb522334eaa3e9ea9f51777a4abf6679f2 Mon Sep 17 00:00:00 2001 From: mrdudz Date: Sat, 5 Feb 2022 17:47:20 +0100 Subject: [PATCH 4/4] remove programs in util dir before making a snapshot. we might later decide to leave them there anyway. --- .github/workflows/snapshot-on-push-master.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/snapshot-on-push-master.yml b/.github/workflows/snapshot-on-push-master.yml index 110edbbf0..c6a6eda8e 100644 --- a/.github/workflows/snapshot-on-push-master.yml +++ b/.github/workflows/snapshot-on-push-master.yml @@ -47,7 +47,9 @@ jobs: - name: Build the tools. shell: bash - run: make -j2 bin USER_CFLAGS=-Werror + run: | + make -j2 bin USER_CFLAGS=-Werror + make -j2 util - name: Build the platform libraries. shell: bash run: make -j2 lib QUIET=1 @@ -60,6 +62,9 @@ jobs: - name: Remove the output from the samples tests. shell: bash run: make -C samples clean + - name: Remove programs in util directory + shell: bash + run: make -j2 util clean - name: Build the document files. shell: bash run: make -j2 doc