From 8b6678f17a8826a0ed8851901c52a2f84d5a3e62 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Wed, 25 Apr 2018 21:14:14 -0700 Subject: [PATCH] Add TARGETS file listing DAs to simplify script maintenance --- desk.acc/Makefile | 3 +-- desk.acc/TARGETS | 8 ++++++++ desk.acc/res/mount.sh | 6 +++--- desk.acc/res/package.sh | 3 +-- 4 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 desk.acc/TARGETS diff --git a/desk.acc/Makefile b/desk.acc/Makefile index 1b093cb..ec920a4 100644 --- a/desk.acc/Makefile +++ b/desk.acc/Makefile @@ -7,8 +7,7 @@ OUTDIR = out HEADERS = $(wildcard ../*.inc) $(wildcard ../inc/*.inc) $(wildcard *.inc) -DAS = calculator show.text.file date puzzle sort.directory \ - show.image.file this.apple eyes +DAS = $(shell cat TARGETS) TARGETS = $(patsubst %,$(OUTDIR)/%.built,$(DAS)) diff --git a/desk.acc/TARGETS b/desk.acc/TARGETS new file mode 100644 index 0000000..dbca919 --- /dev/null +++ b/desk.acc/TARGETS @@ -0,0 +1,8 @@ +calculator +show.text.file +date +puzzle +sort.directory +show.image.file +this.apple +eyes diff --git a/desk.acc/res/mount.sh b/desk.acc/res/mount.sh index 63636af..9550bba 100755 --- a/desk.acc/res/mount.sh +++ b/desk.acc/res/mount.sh @@ -26,6 +26,6 @@ function mount { mkdir -p mount echo "Copying files to mount/" -mount 'show.image.file' -mount 'this.apple' -mount 'eyes' +for file in $(cat TARGETS); do + mount "$file" +done diff --git a/desk.acc/res/package.sh b/desk.acc/res/package.sh index 065113f..da06f1d 100755 --- a/desk.acc/res/package.sh +++ b/desk.acc/res/package.sh @@ -7,8 +7,7 @@ set -e CADIUS="${CADIUS:-$HOME/dev/cadius/bin/release/cadius}" -DAS="calculator show.text.file date puzzle sort.directory \ - show.image.file this.apple eyes" +DAS=$(cat TARGETS) PACKDIR="out/package" FINFO="$PACKDIR/_FileInformation.txt"