notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make install robust to missing thumbnails

Browse source 
Sometimes thumbnails of starters or templates fail to generate
(ImageMagick bug; see
https://sourceforge.net/p/tuxpaint/tuxpaint/ci/9781a4723cbe5bd4d6bd7b5048d830821dda23ef/)

Avoid failing "make install" step when they are missing.
This commit is contained in:
Bill Kendrick 2020-10-15 22:41:17 -07:00
parent f024a95a96
commit b936bbc4ba
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -4,7 +4,7 @@
# Various contributors (see AUTHORS.txt) # Various contributors (see AUTHORS.txt)
# http://www.tuxpaint.org/ # http://www.tuxpaint.org/
# June 14, 2002 - October 14, 2020 # June 14, 2002 - October 15, 2020
# The version number, for release: # The version number, for release:
@ -715,14 +715,14 @@ $(THUMB_STARTERS):
@if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \ @if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \
then \ then \
composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \ composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \
convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ ; \ convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \
rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \ rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \
else \ else \
convert $(CONVERT_OPTS) $(STARTER_NAME) $@ || ( echo "IT FAILED" ; rm -v $@ ) ; \ convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
fi fi
$(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: %
@install -D -m 644 $< $@ @install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
.PHONY: echo-thumb-starters .PHONY: echo-thumb-starters
echo-thumb-starters: echo-thumb-starters:
@ -773,10 +773,10 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv
$(THUMB_TEMPLATES): $(THUMB_TEMPLATES):
@echo -n "." @echo -n "."
@mkdir -p templates/.thumbs @mkdir -p templates/.thumbs
convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ || ( echo "IT FAILED" ; rm -v $@ ) ; \ @convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
$(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: % $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: %
@install -D -m 644 $< $@ @install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
.PHONY: echo-thumb-templates .PHONY: echo-thumb-templates
echo-thumb-templates: echo-thumb-templates: