aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fischer <florian.fischer@muhq.space>2025-07-30 14:40:46 +0200
committerFlorian Fischer <florian.fischer@muhq.space>2025-07-30 14:40:46 +0200
commit81828460001d74c89d2b8819399fcb20d207c74a (patch)
tree7e0e04bc7993798554b07215f126a7444666a781
parentfabeb1da13bf86eeca2f78f5d4171c78975fcfd9 (diff)
downloadmuhqs-game-81828460001d74c89d2b8819399fcb20d207c74a.tar.gz
muhqs-game-81828460001d74c89d2b8819399fcb20d207c74a.zip
use consistent python version for all scripts
-rw-r--r--html/Makefile23
1 files changed, 12 insertions, 11 deletions
diff --git a/html/Makefile b/html/Makefile
index 78638fcd..e169d949 100644
--- a/html/Makefile
+++ b/html/Makefile
@@ -1,5 +1,6 @@
VERBOSE ?= @
-SHELL := bash
+SHELL := /usr/bin/bash
+PY ?= python3
HTML_TEMPLATE := template.html
PANDOC_FLAGS := -f markdown+tex_math_dollars --embed-resources --standalone --template=$(HTML_TEMPLATE) --metadata-file=pandoc/default-metadata.yml
@@ -82,7 +83,7 @@ js/wasm_exec.js: $(shell go env GOROOT)/lib/wasm/wasm_exec.js
$(BUILDDIR)/%.wasm:
@echo "creating symlink $@"
@if test \( ! \( -d $(@D) \) \) ;then mkdir -p $(@D);fi
- ln -s $(GO_ROOT)/$(*F)/$(*F).wasm $@
+ ln -sfT $(GO_ROOT)/$(*F)/$(*F).wasm $@
$(FILES_TO_COPY_TARGETS): $(BUILDDIR)/%: %
@echo "copying $@"
@@ -112,7 +113,7 @@ define generateCardsListing
$(1)/cards_listing.md: $(CARDS_YAML) $(GENERATE_CARD) $(GENERATE_CARD_LISTING) $(MAKEFILE_LIST)
@echo "building $$@"
@if test \( ! \( -d $$(@D) \) \) ;then mkdir -p $$(@D);fi
- $(VERBOSE) $(GENERATE_CARD_LISTING) --language=$(2) $(CARDS_YML_DIR) > $$@;
+ $(VERBOSE) $(PY) $(GENERATE_CARD_LISTING) --language=$(2) $(CARDS_YML_DIR) > $$@;
$(1)/cards_listing.html: $(1)/cards_listing.md $(HTML_TEMPLATE)
@echo "building $$@"
@@ -126,10 +127,10 @@ $(eval $(call generateCardsListing, $(BUILDDIR)/en,en))
define generateHtml
$(1)/%.html: %.md $(MAKEFILE_LIST) $(HTML_TEMPLATE) $(GENERATE_HOVER_LINKS)
@echo "building $$@"
- @if test \( ! \( -d $$(@D) \) \) ;then mkdir -p $$(@D);fi
+ @if test \( ! \( -d $$(@D) \) \); then mkdir -p $$(@D);fi
$(VERBOSE) if [[ $$$$(cat $$< | wc -l) -gt 80 ]]; \
- then $(GENERATE_HOVER_LINKS) $$< | pandoc --toc $(PANDOC_FLAGS) $(2) -o $$@; \
- else $(GENERATE_HOVER_LINKS) $$< | pandoc $(PANDOC_FLAGS) $(2) -o $$@; fi
+ then $(PY) $(GENERATE_HOVER_LINKS) $$< | pandoc --toc $(PANDOC_FLAGS) $(2) -o $$@; \
+ else $(PY) $(GENERATE_HOVER_LINKS) $$< | pandoc $(PANDOC_FLAGS) $(2) -o $$@; fi
endef
define generateRulesHtml
@@ -137,8 +138,8 @@ $(1)/%.html: %.md $(MAKEFILE_LIST) $(HTML_TEMPLATE) $(GENERATE_HOVER_LINKS) $(PR
@echo "building $$@"
@if test \( ! \( -d $$(@D) \) \); then mkdir -p $$(@D);fi
$(VERBOSE) if [[ $$$$(cat $$< | wc -l) -gt 80 ]]; \
- then $(GENERATE_HOVER_LINKS) $$< | pandoc --toc $(PANDOC_FLAGS) $(2) | $(PREPARE_RULES) > $$@; \
- else $(GENERATE_HOVER_LINKS) $$< | pandoc $(PANDOC_FLAGS) $(2) | $(PREPARE_RULES) > $$@; fi
+ then $(PY) $(GENERATE_HOVER_LINKS) $$< | pandoc --toc $(PANDOC_FLAGS) $(2) | $(PREPARE_RULES) > $$@; \
+ else $(PY) $(GENERATE_HOVER_LINKS) $$< | pandoc $(PANDOC_FLAGS) $(2) | $(PREPARE_RULES) > $$@; fi
endef
$(eval $(call generateHtml, $(BUILDDIR),))
@@ -146,7 +147,7 @@ $(eval $(call generateRulesHtml, $(BUILDDIR)/rules, -N))
$(eval $(call generateHtml, $(BUILDDIR)/blog,))
CARDS = $(notdir $(basename $(wildcard $(BUILDDIR)/cards-data/*/*.yml)))
-GENCARDSDATALIST := echo $(CARDS) | python -c 'import sys; print("".join([f"<option value=\"{card}\"></option>" for card in sys.stdin.read().split()]))'
+GENCARDSDATALIST := echo $(CARDS) | $(PY) -c 'import sys; print("".join([f"<option value=\"{card}\"></option>" for card in sys.stdin.read().split()]))'
CARDSDATALIST := $(shell $(GENCARDSDATALIST))
$(BUILDDIR)/boss/ai-companion.html: boss/ai-companion.html $(MAKEFILE_LIST)
@echo "building $@"
@@ -159,9 +160,9 @@ FEEDITEMS = $(wildcard $(FEEDSRC)/items/*)
$(BUILDDIR)/feed.rss: $(FEEDITEMS) $(GEN_FEED)
@echo "building $$@"
- $(VERBOSE)python3 $(GEN_FEED) $(FEEDITEMS) > $@
+ $(VERBOSE)$(PY) $(GEN_FEED) $(FEEDITEMS) > $@
$(BOSS_SITES_HTML): $(BUILDDIR)/boss/%.html: $(MAKEFILE_LIST) $(GENERATE_BOSS) $(GENERATE_HOVER_LINKS)
@echo "building $@"
@if test \( ! \( -d $(@D) \) \); then mkdir -p $(@D); fi
- $(VERBOSE)$(GENERATE_BOSS) $(*F) $(DATA_ROOT) $(MAPS_ROOT) $(RULES_ROOT) > $@
+ $(VERBOSE)$(PY) $(GENERATE_BOSS) $(*F) $(DATA_ROOT) $(MAPS_ROOT) $(RULES_ROOT) > $@