From ea8c4cc8c43e415c8a983d3dbf12229b6376db39 Mon Sep 17 00:00:00 2001 From: "matthias@arch" Date: Fri, 29 Sep 2023 16:05:51 +0200 Subject: [PATCH] PROJECT_DIR respected, multilang optional --- Makefile | 67 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index f79072d..dc0446f 100644 --- a/Makefile +++ b/Makefile @@ -18,16 +18,17 @@ # change these to fir your project # -# root dir for the project, all other paths relative to PROJECT_DIR (except for OUT_DIR) -PROJECT_DIR = . +# root dir for the project, all other paths relative to PROJECT_DIR (except for OUT_DIR and DEP_DIR) +PROJECT_DIR = src # path where final website will be in, this one is not relative to PROJECT_DIR -OUT_DIR = ../quintern-test +OUT_DIR = build # SOURCE FILES: -# all SRC_FLS and all files in the SRC_DIRS will be built +# all SRC_FLS and all files (recursively) in the SRC_DIRS will be built +# all files in PROJECT_DIR (not recursively) are source files SRC_DIRS = de en script style -SRC_FLS = rss.xml +SRC_FLS = # SOURCE FILES: # all RESOURCE_FLS and all files in the RESOURCE_DIRS will be copied to OUT_DIR @@ -41,7 +42,8 @@ RESOURCE_FLS = # foreach lang in LANGS: # run HTML_PP_CMD with --var lang=lang on file and output to OUT_DIR without the COMMON_DIR prefix, so COMMON_DIR/subdir/file.html -> OUT_DIR/lang/subdir/file.html # all non-html files will handled the same way, but without the preprocessor being run on them. They are simply copied -COMMON_DIR = common +# leave COMMON_DIR empty to disable multi-lang feature +COMMON_DIR = LANGS = de en # PREPROCESSOR @@ -51,7 +53,7 @@ INCLUDE_DIR = include # ADVANCED # the command to run the html preprocessor -HTML_PP_CMD = python3 html_preprocessor.py --exit-on light +HTML_PP_CMD = python3 html-preprocessor --exit-on light DEP_DIR = .dependencies @@ -70,12 +72,14 @@ _RES_DIRS = $(addprefix $(PROJECT_DIR)/, $(RESOURCE_DIRS)) _RES_FLS = $(addprefix $(PROJECT_DIR)/, $(RESOURCE_FLS)) _COMMON_DIR = $(addprefix $(PROJECT_DIR)/, $(COMMON_DIR)) _INCLUDE_DIR = $(addprefix $(PROJECT_DIR)/, $(INCLUDE_DIR)) -_DEP_DIR = $(addprefix $(PROJECT_DIR)/, $(DEP_DIR)) # NORMAL SRC # all SRC_DIRS + all subdirs of each srcdir -_SRC_SUB_DIRS = $(foreach srcdir, $(_SRC_DIRS), $(shell find $(srcdir)/ -type d)) -_SRC_FLS += $(foreach srcdir, $(_SRC_DIRS), $(shell find $(srcdir)/ -type f)) +_SRC_SUB_DIRS = $(foreach srcdir, $(_SRC_DIRS), $(shell find $(srcdir)/ -type d 2>/dev/null)) +# add files in project dir +_SRC_FLS += $(shell find $(PROJECT_DIR)/ -maxdepth 1 -type f) +# add files src dirs, recursively +_SRC_FLS += $(foreach srcdir, $(_SRC_DIRS), $(shell find $(srcdir)/ -type f 2>/dev/null)) # OUT_DIRS = $(OUT_DIR) $(addprefix $(OUT_DIR)/, $(_SRC_SUB_DIRS)) OUT_DIRS = $(OUT_DIR)/ $(patsubst $(PROJECT_DIR)/%, $(OUT_DIR)/%, $(_SRC_SUB_DIRS)) # path of the source files after being processed @@ -83,12 +87,13 @@ OUT_DIRS = $(OUT_DIR)/ $(patsubst $(PROJECT_DIR)/%, $(OUT_DIR)/%, $(_SRC_SUB_D OUT_FLS = $(patsubst $(PROJECT_DIR)/%, $(OUT_DIR)/%, $(_SRC_FLS)) # RESOURCES -_RES_SUB_DIRS = $(foreach srcdir, $(_RES_DIRS), $(shell find $(srcdir)/ -type d)) -_RES_FLS += $(foreach srcdir, $(_RES_DIRS), $(shell find $(srcdir)/ -type f)) +_RES_SUB_DIRS = $(foreach srcdir, $(_RES_DIRS), $(shell find $(srcdir)/ -type d 2>/dev/null)) +_RES_FLS += $(foreach srcdir, $(_RES_DIRS), $(shell find $(srcdir)/ -type f 2>/dev/null)) RES_OUT_DIRS = $(OUT_DIR)/ $(patsubst $(PROJECT_DIR)/%, $(OUT_DIR)/%, $(_RES_SUB_DIRS)) RES_OUT_FLS = $(patsubst $(PROJECT_DIR)/%, $(OUT_DIR)/%, $(_RES_FLS)) # MULTILANG +ifdef COMMON_DIR _ML_SRC_FLS = $(shell find $(_COMMON_DIR)/ -type f) _ML_SRC_SUB_DIRS= $(shell find $(_COMMON_DIR)/ -type d) # will contain one subdir for each lang, each of which contains every file from ML_SRC_FLS @@ -96,11 +101,12 @@ ML_OUT_DIR = $(OUT_DIR) ML_OUT_LANG_DIRS= $(foreach lang, $(LANGS), $(addprefix $(ML_OUT_DIR)/, $(lang))) ML_OUT_DIRS = $(foreach lang, $(LANGS), $(patsubst $(_COMMON_DIR)/%, $(ML_OUT_DIR)/$(lang)/%, $(_ML_SRC_SUB_DIRS))) ML_OUT_FLS = $(foreach lang, $(LANGS), $(patsubst $(_COMMON_DIR)/%, $(ML_OUT_DIR)/$(lang)/%, $(_ML_SRC_FLS))) +endif # needed for creating them -_DEP_DIRS = $(sort $(patsubst $(OUT_DIR)/%, $(_DEP_DIR)/%, $(OUT_DIRS) $(ML_OUT_DIRS))) +_DEP_DIRS = $(sort $(patsubst $(OUT_DIR)/%, $(DEP_DIR)/%, $(OUT_DIRS) $(ML_OUT_DIRS))) # needed for reading -_DEP_FLS = $(shell find $(_DEP_DIR) -type f -name '*.d') +_DEP_FLS = $(shell find $(DEP_DIR) -type f -name '*.d' 2>/dev/null) # PRINTING FMT_VAR_SRC ="Variable '\e[1;34m%s\e[0m': \e[0;33m%s\e[0m\n" @@ -134,43 +140,48 @@ print: @printf $(FMT_VAR_OUT) "OUT_FLS" "$(OUT_FLS)" @printf $(FMT_VAR_SRC) "_RES_FLS" "$(_RES_FLS)" @printf $(FMT_VAR_OUT) "RES_OUT_FLS" "$(RES_OUT_FLS)" +ifdef COMMON_DIR @printf $(FMT_VAR_SRC) "_ML_SRC_FLS" "$(_ML_SRC_FLS)" @printf $(FMT_VAR_OUT) "ML_OUT_FLS" "$(ML_OUT_FLS)" +endif @printf $(FMT_VAR_SRC) "_DEP_FLS" "$(_DEP_FLS)" @# @printf $(FMT_VAR_SRC) "y" "$(y)" -# MULTILANG RULES +# DIRECTORIES $(sort $(ML_OUT_DIRS) $(_DEP_DIRS) $(RES_OUT_DIRS) $(OUT_DIRS)): @printf $(FMT_DIR) "$@" @mkdir -p $@ -# build/ml_tmp/lang/subdir/xyz.html +# MULTILANG RULES +ifdef COMMON_DIR +# $@ is the target to trigger the rule, but all languages have to be built now $(foreach out_dir, $(ML_OUT_LANG_DIRS), $(out_dir)/%.html): $(_COMMON_DIR)/%.html | $(ML_OUT_DIRS) $(_DEP_DIRS) - @#echo "$$@=$@, $$<=$< $$^=$^" - @# \$@=build/ml_tmp/lang/subdir/xyz.html, \$<=common/subdir/xyz.html - @lang=`echo $(patsubst $(ML_OUT_DIR)/%, %, $@) | awk -F "/" '{print $$1}'`; \ - printf $(FMT_OUT_ML_HTML) "$$lang" "$<" "$@"; \ - $(HTML_PP_CMD) --target "$<" --output "$@" --var include_dir=$(_INCLUDE_DIR) --var lang=$$lang --output-deps "$(patsubst $(OUT_DIR)/%, $(_DEP_DIR)/%.d, $@)"; + @RAW_TARGET=`echo $@ $(foreach lang, $(LANGS), | sed 's|$(ML_OUT_DIR)/$(lang)/||')`;\ + for lang in $(LANGS); do \ + target=$(ML_OUT_DIR)/$$lang/$$RAW_TARGET;\ + printf $(FMT_OUT_ML_HTML) "$$lang" "$<" "$$target"; \ + $(HTML_PP_CMD) --input "$<" --output "$$target" --var include_dir=$(_INCLUDE_DIR) --var lang=$$lang --output-deps "`echo $${target}.d | sed 's|$(OUT_DIR)/|$(DEP_DIR)/|'`"; \ + done + # rule for all not html files $(foreach out_dir, $(ML_OUT_LANG_DIRS), $(out_dir)/%): $(_COMMON_DIR)/% | $(ML_OUT_DIRS) @lang=`echo $(patsubst $(ML_OUT_DIR)/%, %, $@) | awk -F "/" '{print $$1}'`; \ printf $(FMT_OUT_ML_OTHER) "$$lang" "$<" "$@" ; \ cp $< $@ +endif # # (NORMAL/RE-)SOURCE RULES # - - -$(OUT_DIR)/%.html: %.html | $(OUT_DIRS) $(_DEP_DIRS) +$(OUT_DIR)/%.html: $(PROJECT_DIR)/%.html | $(OUT_DIRS) $(_DEP_DIRS) @printf $(FMT_OUT_HTML) "$<" "$@"; - $(HTML_PP_CMD) --target "$<" --output "$@" --var include_dir=$(_INCLUDE_DIR) --output-deps "$(_DEP_DIR)/$<.d"; + @$(HTML_PP_CMD) --input "$<" --output "$@" --var include_dir=$(_INCLUDE_DIR) --output-deps "$(subst $(DEP_DIR)/$(PROJECT_DIR), $(DEP_DIR), $(DEP_DIR)/$<.d)"; @# remove comments and empty lines. two separate lines bc the substitution might create new empty lines @#awk -i inplace '{FS="" sub(//,"")}1' $@ @#awk -i inplace '{if (NF != 0) print}' $@ -$(OUT_DIR)/%: % | $(OUT_DIRS) $(RES_OUT_DIRS) +$(OUT_DIR)/%: $(PROJECT_DIR)/% | $(OUT_DIRS) $(RES_OUT_DIRS) @printf $(FMT_OUT_OTHER) "$<" "$@" @cp -r $< $@ @@ -185,8 +196,8 @@ stop: killall nginx clean: - -rm $(OUT_FLS) $(ML_OUT_FLS) - -rm -r $(_DEP_DIR) + -rm $(OUT_FLS) $(ML_OUT_FLS) 2>/dev/null + -rm -r $(DEP_DIR) 2>/dev/null cleaner: -rm -r $(OUT_DIR)