From 1a3640ad0af45f0dea69e3c4a8fc20674b82ee83 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 2 Dec 2013 17:52:15 +0100 Subject: Explicitly refresh when not forcing rebuild: ikiwiki man page lie about default. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 39dcbf1..2f20b58 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,6 @@ content: build: $(if $(cssprojects),$(MAKE) $(cssprojects)) - $(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild);) + $(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh);) .PHONY: all build configfiles -- cgit v1.2.3 From ee39e72561552e4a94635aba20c5a0e4abd9aae2 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 2 Dec 2013 18:09:25 +0100 Subject: Fix detect forced build. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2f20b58..1f0366d 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ all: build -include config/include.mk -include shared/themes/include.mk -always-make = $(filter -B,$(MAKEFLAGS)) +always-make = $(findstring B,$(MAKEFLAGS)) avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo " --no-rcs") iki_configfiles := $(or $(patsubst %.in,%,$(wildcard config/ikiwiki*.setup.in)),config/ikiwiki.setup) -- cgit v1.2.3 From 3c57fd5713d08ef2b4b29ff15775f57421bf8498 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 26 Feb 2015 17:47:19 +0100 Subject: Handle optional forms: Copy, set executable and expand build_path. --- .gitignore | 1 + Makefile | 3 +++ 2 files changed, 4 insertions(+) (limited to 'Makefile') diff --git a/.gitignore b/.gitignore index 7c191a6..5f6f3a9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ /build/ /content/ /styling/ +/forms/ /config/ikiwiki*.setup /.ikiwiki*/ diff --git a/Makefile b/Makefile index 1f0366d..acf4f4f 100644 --- a/Makefile +++ b/Makefile @@ -49,5 +49,8 @@ content: build: $(if $(cssprojects),$(MAKE) $(cssprojects)) $(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh);) + $(if $(wildcard forms),cd forms && find * -name '*.cgi' \ + -exec install -DT '{}' ../build/forms/'{}' ';' \ + -exec perl -i -pe "s:'../build':'$(CURDIR)':g" ../build/forms/'{}' ';') .PHONY: all build configfiles -- cgit v1.2.3 From 846039b65b33e6813cc73486ad84431039f3a860 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 26 Feb 2015 18:21:58 +0100 Subject: Fix build_path expansion. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index acf4f4f..b835f64 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,6 @@ build: $(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh);) $(if $(wildcard forms),cd forms && find * -name '*.cgi' \ -exec install -DT '{}' ../build/forms/'{}' ';' \ - -exec perl -i -pe "s:'../build':'$(CURDIR)':g" ../build/forms/'{}' ';') + -exec perl -i -pe "s:'../build':'$(CURDIR)/build':g" ../build/forms/'{}' ';') .PHONY: all build configfiles -- cgit v1.2.3 From 002f117bc41acb578244b907e9be6dc8975f63c3 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 27 Feb 2015 18:07:41 +0100 Subject: Add IKIWIKI_UNDERLAYS for multiple underlays. --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b835f64..cff0333 100644 --- a/Makefile +++ b/Makefile @@ -39,6 +39,9 @@ configfiles: $(iki_configfiles) $(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%)) $(iki_configfiles): % : %.in ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ + ikiwiki $(IKIWIKI_DEFAULTS) \ + $(if $(IKIWIKI_UNDERLAYS),--set-yaml add_underlays="$$(echo $(IKIWIKI_UNDERLAYS) | perl -pe 's/\s+/\n/g;s/^/- /gm')") \ + $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ perl -i -pe '$$s=$$ENV{'CURDIR'}; s/\@CURDIR\@/$$s/g' $@ content: notempty = $(wildcard $@/*.mdwn) -- cgit v1.2.3 From eb62b9a05f2ec7570427f9296ef965d59ab4d795 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 27 Feb 2015 18:26:17 +0100 Subject: Fix generate ikiwiki setup only once. --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cff0333..c0ab3ed 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,6 @@ config/ikiwiki.setup.in: configfiles: $(iki_configfiles) $(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%)) $(iki_configfiles): % : %.in - ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ ikiwiki $(IKIWIKI_DEFAULTS) \ $(if $(IKIWIKI_UNDERLAYS),--set-yaml add_underlays="$$(echo $(IKIWIKI_UNDERLAYS) | perl -pe 's/\s+/\n/g;s/^/- /gm')") \ $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ -- cgit v1.2.3 From d03f86accda76e43f84ba10b80489526d3287474 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 27 Feb 2015 18:33:58 +0100 Subject: Handle IKIWIKI_SHARED_UNDERLAYS (in addition to IKIWIKI_UNDERLAYS). --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c0ab3ed..4217275 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,11 @@ configfiles: $(iki_configfiles) $(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%)) $(iki_configfiles): % : %.in ikiwiki $(IKIWIKI_DEFAULTS) \ - $(if $(IKIWIKI_UNDERLAYS),--set-yaml add_underlays="$$(echo $(IKIWIKI_UNDERLAYS) | perl -pe 's/\s+/\n/g;s/^/- /gm')") \ + $(if $(IKIWIKI_UNDERLAYS)$(IKIWIKI_SHARED_UNDERLAYS),\ + --set-yaml add_underlays="$$(echo $(strip \ + $(IKIWIKI_UNDERLAYS) \ + $(IKIWIKI_SHARED_UNDERLAYS)) \ + | perl -pe 's/\s+/\n/g;s/^/- /gm')") \ $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ perl -i -pe '$$s=$$ENV{'CURDIR'}; s/\@CURDIR\@/$$s/g' $@ -- cgit v1.2.3 From 8f6e11670c485cc3316ead626c0a126f86df5e0c Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 18 Apr 2017 20:55:50 +0200 Subject: Fix fail if ikiwiki fails. --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4217275..b554734 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,7 @@ content: build: $(if $(cssprojects),$(MAKE) $(cssprojects)) + set -e;\ $(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh);) $(if $(wildcard forms),cd forms && find * -name '*.cgi' \ -exec install -DT '{}' ../build/forms/'{}' ';' \ -- cgit v1.2.3 From df80b903ce93295c030f2a185d68686216cbdb3b Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 18 Apr 2017 20:56:40 +0200 Subject: Improve forms handling. --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b554734..1611825 100644 --- a/Makefile +++ b/Makefile @@ -56,8 +56,14 @@ build: $(if $(cssprojects),$(MAKE) $(cssprojects)) set -e;\ $(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh);) - $(if $(wildcard forms),cd forms && find * -name '*.cgi' \ - -exec install -DT '{}' ../build/forms/'{}' ';' \ - -exec perl -i -pe "s:'../build':'$(CURDIR)/build':g" ../build/forms/'{}' ';') + set -e;\ + $(foreach path,$(patsubst forms/%,%,$(wildcard forms/*.cgi forms/*/*.cgi)),\ + install -DT 'forms/$(path)' 'build/forms/$(path)'; \ + perl -i -pe "s:'../build/:'$(CURDIR)/build/:g" 'build/forms/$(path)';\ + $(foreach htmlstempath,$(path:%.cgi=build/html/%),\ + cp -f $(htmlstempath).html $(htmlstempath).tmpl;\ + FORMBUILDER_NOHEADER=1 'build/forms/$(path)' > $(htmlstempath).html~;\ + mv -f $(htmlstempath).html~ $(htmlstempath).html;\ + rm $(htmlstempath).tmpl)) .PHONY: all build configfiles -- cgit v1.2.3 From fabbce549bd3233d392869786d02771ca948f7b1 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 28 Mar 2021 19:34:43 +0200 Subject: fix define sass_includes --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1611825..4f99a5e 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,8 @@ export CURDIR cssprojects ?= $(wildcard shared/themes/goab styling) +sass_includes ?= shared/themes/default /usr/share/sass /usr/share/sass/stylesheets /usr/share/compass/frameworks/normalize-scss/stylesheets + all: build -include shared/include.mk -- cgit v1.2.3 From 0ebe1db1758437b0a1ebd3d8393cc52821db60ff Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 29 Mar 2021 14:24:16 +0200 Subject: fix build forms --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4f99a5e..0046921 100644 --- a/Makefile +++ b/Makefile @@ -61,8 +61,8 @@ build: set -e;\ $(foreach path,$(patsubst forms/%,%,$(wildcard forms/*.cgi forms/*/*.cgi)),\ install -DT 'forms/$(path)' 'build/forms/$(path)'; \ - perl -i -pe "s:'../build/:'$(CURDIR)/build/:g" 'build/forms/$(path)';\ - $(foreach htmlstempath,$(path:%.cgi=build/html/%),\ + perl -i -pe "s:'../build:'$(CURDIR)/build:g" 'build/forms/$(path)';\ + $(foreach htmlstempath,$(path:%.cgi=build/html/%/index),\ cp -f $(htmlstempath).html $(htmlstempath).tmpl;\ FORMBUILDER_NOHEADER=1 'build/forms/$(path)' > $(htmlstempath).html~;\ mv -f $(htmlstempath).html~ $(htmlstempath).html;\ -- cgit v1.2.3 From 54989cc1649701a57d7ca5ad99fe32acdb0e7c3f Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 29 Mar 2021 14:34:59 +0200 Subject: isolate iki projects and forms as distinct build targets --- Makefile | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0046921..17cc5ec 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,8 @@ always-make = $(findstring B,$(MAKEFLAGS)) avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo " --no-rcs") iki_configfiles := $(or $(patsubst %.in,%,$(wildcard config/ikiwiki*.setup.in)),config/ikiwiki.setup) +iki_projects = $(patsubst config/%.setup,build-iki/%,$(iki_configfiles)) +form_projects := $(patsubst forms/%.cgi,build-form/%,$(wildcard forms/*.cgi forms/*/*.cgi)) init: shared/.git content $(MAKE) $(iki_configfiles) @@ -54,18 +56,15 @@ content: $(if $(notempty),,mkdir -p '$@') $(if $(notempty),,printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn') -build: - $(if $(cssprojects),$(MAKE) $(cssprojects)) - set -e;\ - $(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh);) - set -e;\ - $(foreach path,$(patsubst forms/%,%,$(wildcard forms/*.cgi forms/*/*.cgi)),\ - install -DT 'forms/$(path)' 'build/forms/$(path)'; \ - perl -i -pe "s:'../build:'$(CURDIR)/build:g" 'build/forms/$(path)';\ - $(foreach htmlstempath,$(path:%.cgi=build/html/%/index),\ - cp -f $(htmlstempath).html $(htmlstempath).tmpl;\ - FORMBUILDER_NOHEADER=1 'build/forms/$(path)' > $(htmlstempath).html~;\ - mv -f $(htmlstempath).html~ $(htmlstempath).html;\ - rm $(htmlstempath).tmpl)) +build: $(iki_projects) $(form_projects) +$(iki_projects): build-iki/%: config/%.setup $(cssprojects) + ikiwiki --setup $<$(avoid-broken-git)$(if $(always-make), --rebuild, --refresh) +$(form_projects): build-form/%: forms/%.cgi build-iki/ikiwiki + install -DT $< build/$< + perl -i -pe "s:'../build:'$(CURDIR)/build:g" build/$< + cp -f build/html/$*/index.html build/html/$*/index.tmpl + FORMBUILDER_NOHEADER=1 build/$< > build/html/$*/index.html~ + mv -f build/html/$*/index.html~ build/html/$*/index.html + rm build/html/$*/index.tmpl -.PHONY: all build configfiles +.PHONY: all build build-iki/% build-form/% configfiles -- cgit v1.2.3