moved tokipona pages to index dir

This commit is contained in:
/dev/urandom 2022-10-22 12:15:03 +03:00
parent 8f6accb94f
commit d9a4c05887
129 changed files with 6 additions and 65 deletions

View file

@ -10,20 +10,12 @@ THEME=theme
endif endif
THEME_FLAGS=-c style,fencedcode THEME_FLAGS=-c style,fencedcode
DC_THEME_FLAGS=$(THEME_FLAGS),nopants
_PNGS = $(shell find $(PAGEDIR) -name \*.png) _PNGS = $(shell find $(PAGEDIR) -name \*.png)
PNGS = $(patsubst $(PAGEDIR)/%,$(OUTDIR)/%,$(_PNGS)) PNGS = $(patsubst $(PAGEDIR)/%,$(OUTDIR)/%,$(_PNGS))
_PAGES = $(shell find $(PAGEDIR) -name \*.md) _PAGES = $(shell find $(PAGEDIR) -name \*.md)
PAGES_HTML = $(patsubst $(PAGEDIR)/%.md,$(OUTDIR)/%.html,$(_PAGES)) PAGES_HTML = $(patsubst $(PAGEDIR)/%.md,$(OUTDIR)/%.html,$(_PAGES))
PAGES_HTML_DC = $(patsubst $(PAGEDIR)/%.md,$(OUTDIR)/dc/%.html,$(_PAGES))
_BLOG_PAGES = $(shell find $(PAGEDIR)/blog -name \*.md | grep -v $(PAGEDIR)/blog/index\.md$)
_TEXT_PAGES = $(shell find $(PAGEDIR)/text -name \*.txt | grep -v $(PAGEDIR)/text/index\.txt$)
TEXT_PAGES_TXT = $(patsubst $(PAGEDIR)/text/%.txt,$(OUTDIR)/text/%.txt,$(_TEXT_PAGES))
TEXT_PAGES_HTML = $(patsubst $(PAGEDIR)/text/%.txt,$(OUTDIR)/text/%.html,$(_TEXT_PAGES))
_DIRECTORIES = $(shell find $(PAGEDIR)/* -type d) _DIRECTORIES = $(shell find $(PAGEDIR)/* -type d)
DIRECTORIES = $(patsubst $(PAGEDIR)/, $(OUTDIR)/, $(_PAGES)) DIRECTORIES = $(patsubst $(PAGEDIR)/, $(OUTDIR)/, $(_PAGES))
@ -35,54 +27,15 @@ OUT_STATIC = $(patsubst static/%,public/%,$(_STATIC_FILES)) $(patsubst static/%.
.SUFFIXES: .SUFFIXES:
.PHONY: all upload .PHONY: all upload
all: $(OUTDIR)/blog/index.html $(OUTDIR)/dc/blog/index.html $(OUTDIR)/blog/main.rss $(OUTDIR)/text/index.html $(OUTDIR)/dc/text/index.html $(PAGES_HTML) $(PAGES_HTML_DC) $(TEXT_PAGES_TXT) $(TEXT_PAGES_HTML) $(OUT_STATIC) all: $(PAGES_HTML) $(OUT_STATIC)
upload: upload:
./upload.sh ./upload.sh
$(OUTDIR)/dc/blog/index.html: $(_BLOG_PAGES) $(TPLDIR)/blog_header.md $(TPLDIR)/blog_footer.md $(TPLDIR)/dreamcast.tpl blogindex.sh
@mkdir -p $(@D)
./blogindex.sh | $(THEME) $(DC_THEME_FLAGS) -t $(TPLDIR)/dreamcast.tpl -p blog/index.html -o $@
$(OUTDIR)/blog/index.html: $(_BLOG_PAGES) $(TPLDIR)/blog_header.md $(TPLDIR)/blog_footer.md $(TPLDIR)/default.tpl blogindex.sh
@mkdir -p $(@D)
./blogindex.sh | $(THEME) $(THEME_FLAGS) -t $(TPLDIR)/default.tpl -p blog/index.html -o $@
$(OUTDIR)/blog/main.rss: $(_BLOG_PAGES) blogindex.sh
@mkdir -p $(@D)
./blogindex.sh -r > $@
$(OUTDIR)/text/%.txt: $(PAGEDIR)/text/%.txt
@mkdir -p $(@D)
cp $< $@
$(OUTDIR)/dc/text/index.html: $(_TEXT_PAGES)
@mkdir -p $(@D)
./textindex.sh -d | $(THEME) $(DC_THEME_FLAGS) -t $(TPLDIR)/dreamcast.tpl -p text/index.html -o $@
$(OUTDIR)/text/index.html: $(_TEXT_PAGES)
@mkdir -p $(@D)
./textindex.sh | $(THEME) $(THEME_FLAGS) -t $(TPLDIR)/default.tpl -p text/index.html -o $@
$(OUTDIR)/text/%.html: $(PAGEDIR)/text/%.txt $(TPLDIR)/text_style.css
@mkdir -p $(@D)
@cat $(TPLDIR)/text_style.css > tmpfile.md
@echo "<pre>" >> tmpfile.md
@cat $< >> tmpfile.md
@echo "</pre>" >> tmpfile.md
$(THEME) $(THEME_FLAGS) -t $(TPLDIR)/default.tpl -p $(patsubst $(OUTDIR)/%,%,$@) -o $@ tmpfile.md
@rm tmpfile.md
$(OUTDIR)/%.html: $(PAGEDIR)/%.md $(TPLDIR)/default.tpl $(OUTDIR)/%.html: $(PAGEDIR)/%.md $(TPLDIR)/default.tpl
@mkdir -p $(@D) @mkdir -p $(@D)
$(THEME) $(THEME_FLAGS) -t $(TPLDIR)/default.tpl -p $(patsubst $(OUTDIR)/%,%,$@) -o $@ $< $(THEME) $(THEME_FLAGS) -t $(TPLDIR)/default.tpl -p $(patsubst $(OUTDIR)/%,%,$@) -o $@ $<
$(OUTDIR)/dc/%.html: $(PAGEDIR)/%.md $(TPLDIR)/dreamcast.tpl
@mkdir -p $(@D)
$(THEME) $(DC_THEME_FLAGS) -t $(TPLDIR)/dreamcast.tpl -p $(patsubst $(OUTDIR)/%.tmp,%,$@) -o tmpfile.html $<
cat tmpfile.html | ./simplify.sh > $@
@rm tmpfile.html
$(OUTDIR)/%: static/%.h $(OUTDIR)/%: static/%.h
@mkdir -p $(@D) @mkdir -p $(@D)
cpp -E -P -o $@ $< cpp -E -P -o $@ $<
@ -92,4 +45,4 @@ $(OUTDIR)/%: static/%
cp -r $< $@ cp -r $< $@
clean: clean:
rm -rf public/* pages/blog/index.md rm -rf public/*

View file

@ -1,19 +1,7 @@
# rnd's website source code # lipu sona pona source code
This is the source code to rnd's website at <https://cutiehaven.club/>. This is the source code to *lipu sona pona*, an educational course for the
minimalist constructed language *toki pona*.
Included are all the files and scripts used to build it, with the exception of Included are all the files and scripts used to build it.
some files containing other identifying information and copyrighted contents
that might break gitlab's terms of service.
## Building
To compile a local version of the website, just use the `make` command. It will
lack some files, mostly ones that I don't feel are appropriate to add to Git,
but will contain all the most important content.
## Continuous Integration
The `.gitlab-ci.yml` file contains a pipeline used to deploy all the changes to
the actual website. Currently it takes about a minute for any updates to be
reflected.

Some files were not shown because too many files have changed in this diff Show more