MatthiasQuintern/bUwUma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fix thumbnail case catchall"

Browse Source 
This reverts commit 1e3732af3d.
This commit is contained in:
matthias@arch 2023-11-23 16:43:57 +01:00
parent 1e3732af3d
commit 961fad97dd
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile
View File

@ -44,14 +44,6 @@ CSS_FILES =
RESOURCE_DIRS = resources RESOURCE_DIRS = resources
RESOURCE_FLS = RESOURCE_FLS =
# FAVICON
# [relative to PROJECT_DIR]
FAVICON = favicon.png
APPLE_ICON_SIZES = 60x60 120x120
WINDOWS_ICON_SIZES = 144x144
ANDROID_ICON_SIZES = 144x144 512x512
FAVICON_ICON_SIZES = 16x16 32x32 64x64
# THUMBNAILS: # THUMBNAILS:
# if set, thumbnails for all resource files having an extension in THUMB_FOR_TYPES will be generated and placed relative to THUMB_OUT_DIR # if set, thumbnails for all resource files having an extension in THUMB_FOR_TYPES will be generated and placed relative to THUMB_OUT_DIR
# [relative to OUT_DIR] # [relative to OUT_DIR]
@ -159,15 +151,6 @@ ML_OUT_DIRS = $(foreach lang, $(LANGS), $(patsubst $(_COMMON_DIR)/%, $(ML_OUT_D
ML_OUT_FLS = $(foreach lang, $(LANGS), $(patsubst $(_COMMON_DIR)/%, $(ML_OUT_DIR)/$(lang)/%, $(_ML_SRC_FLS))) ML_OUT_FLS = $(foreach lang, $(LANGS), $(patsubst $(_COMMON_DIR)/%, $(ML_OUT_DIR)/$(lang)/%, $(_ML_SRC_FLS)))
endif endif
ifdef FAVICON
_FAVICON = $(addprefix $(PROJECT_DIR)/,$(FACIVON))
APPLE_ICONS = $(addsuffix .png,$(addprefix apple-touch-icon-,$(APPLE_ICON_SIZES)))
WINDOWS_ICONS = $(addsuffix .png,$(addprefix mstile-,$(WINDOWS_ICON_SIZES)))
ANDROID_ICONS = $(addsuffix .png,$(addprefix android-chrome-,$(ANDROID_ICON_SIZES)))
FAVICON_ICONS = $(addsuffix .png,$(addprefix favicon-,$(FAVICON_ICON_SIZES)))
FAVICONS = $(addprefix $(OUT_DIR)/,$(APPLE_ICONS) $(WINDOWS_ICONS) $(ANDROID_ICONS) $(FAVICON_ICONS))
endif
ifdef THUMB_OUT_DIR ifdef THUMB_OUT_DIR
# files for which to generate thumbnails # files for which to generate thumbnails
_THUMB_FLS = $(filter $(foreach type, $(THUMB_FOR_TYPES), %.$(type)), $(_RES_FLS)) _THUMB_FLS = $(filter $(foreach type, $(THUMB_FOR_TYPES), %.$(type)), $(_RES_FLS))
@ -206,17 +189,15 @@ FMT_OUT_ML_OTHER="\e[1;34mBuilding\e[0m in lang \e[1;34m%s\e[0m: \e[1;33m%s\e[0m
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .html .md .SUFFIXES: .html .md
.PHONY: default normal multilang resources sitemap favicons thumbnails print start stop clean cleaner .PHONY: default normal multilang resources print start stop clean cleaner
.DEFAULT_GOAL = all .DEFAULT_GOAL = all
# include all the dependency makefiles # include all the dependency makefiles
include $(_DEP_FLS) include $(_DEP_FLS)
all: normal multilang resources thumbnails sitemap favicons all: normal multilang resources thumbnails
normal: $(OUT_FLS) normal: $(_SITEMAP) $(OUT_FLS)
sitemap: $(_SITEMAP)
favicons: $(FAVICONS)
multilang: $(ML_OUT_FLS) multilang: $(ML_OUT_FLS)
resources: $(RES_OUT_FLS) resources: $(RES_OUT_FLS)
thumbnails: $(THUMB_OUT_FLS) thumbnails: $(THUMB_OUT_FLS)
@ -267,13 +248,6 @@ $(foreach out_dir, $(ML_OUT_LANG_DIRS), $(out_dir)/%): $(_COMMON_DIR)/% | $(ML_O
cp $< $@ cp $< $@
endif endif
# FAVICON:
$(FAVICONS): $(_FAVICON) | $(OUT_DIR)
for size in $(APPLE_ICON_SIZES); do \
convert "$<" -size "$$size" "$(FAVICON_DIR)/apple-touch-icon-$$size.png";\
done
# THUMBNAILS # THUMBNAILS
$(OUT_DIR)/$(THUMB_OUT_DIR)/%.jpg: | $(THUMB_OUT_DIRS) $(OUT_DIR)/$(THUMB_OUT_DIR)/%.jpg: | $(THUMB_OUT_DIRS)
@fulltarget="$@"; \ @fulltarget="$@"; \