From e18d877d7fcc303f3ed64032541c9ec949be0fa8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 17 May 2021 17:27:25 +0100 Subject: [PATCH] Makefile: tidy bundle output Signed-off-by: Ian Jackson --- Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5deee264..aa628720 100644 --- a/Makefile +++ b/Makefile @@ -340,17 +340,22 @@ examples/big-bundle.zip: ZIP_INPUTS=. examples/big-bundle/otter.toml: $(LIBRARY_FILES) $(MAKEFILE_DEP) rm -rf examples/big-bundle mkdir examples/big-bundle examples/big-bundle/library - set -e; for l in $(LIBRARIES); do \ + @set -e; echo 'MKDIR for $@'; \ + for l in $(LIBRARIES); do \ mkdir examples/big-bundle/$$l; \ perl -p \ -e 'BEGIN { print "# -- AUTOGENERATED FROM COPY IN OTTER SOURCE --\n" }' \ -e 'next unless m/^\[scraper]/..0; next if m/^\[(?!scraper)/..0; s/^/\#/' \ <$$l.toml >examples/big-bundle/$$l.toml; done - set -e; for e in $(LIBRARY_FILE_INPUTS); do \ - ln $${e#*:} examples/big-bundle/$${e%%.usvg:*}.svg; done - set -ex; cd examples/big-bundle/library/; for x in '' .toml; do \ + @set -e; echo 'LN for $@'; \ + for e in $(LIBRARY_FILE_INPUTS); do \ + ln $${e#*:} examples/big-bundle/$${e%%.usvg:*}.svg; done; + @set -e; echo 'MV for $@'; \ + cd examples/big-bundle/library/; for x in '' .toml; do \ mv wikimedia$$x duped-example$$x; done - echo 'title = "Autogenerated large test bundle"' >$@.tmp + @set -e; echo 'ECHO for $@'; \ + echo 'title = "Autogenerated test bundle - do not distribute"' \ + >$@.tmp mv -f $@.tmp $@ #---------- webdriver tests (wdt) ---------- -- 2.30.2