From eb2ca66e3a72e4da48208de125b9f3f27e4ecc21 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 4 Aug 2012 19:52:50 +0200 Subject: Sync with HEAD of submodule shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 468ffa7..ccc9976 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 468ffa7e6396295047319a1a93ef2c0fd37bf5ce +Subproject commit ccc9976fb7916bce057165c5cbab7c38a8e91945 -- cgit v1.2.3 From 37060f38e36138d45f3ace1506c31ea1fc226046 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 4 Aug 2012 22:31:28 +0200 Subject: Sync with HEAD of shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index ccc9976..05a2b14 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit ccc9976fb7916bce057165c5cbab7c38a8e91945 +Subproject commit 05a2b14c35b867db164068939e2f0590168f084c -- cgit v1.2.3 From 7f6aafa7d596f19ff2192659cb677125461da57a Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 9 Aug 2012 01:43:39 +0200 Subject: Sync with HEAD of shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 05a2b14..b6c420f 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 05a2b14c35b867db164068939e2f0590168f084c +Subproject commit b6c420f5a817b16a4f7e9f375b44add1554c8ee4 -- cgit v1.2.3 From 4f6d910ef6ae741cea07cd747f2aa90d062998a4 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 9 Oct 2012 03:06:23 +0200 Subject: Sync with HEAD of shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index b6c420f..2209aa4 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit b6c420f5a817b16a4f7e9f375b44add1554c8ee4 +Subproject commit 2209aa4cdc29918897a13023ec1fa88e6090e538 -- cgit v1.2.3 From 37cb4e3d551c95c34593cbe77dfcb4835bc26f37 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 13 Oct 2013 01:37:43 +0200 Subject: Sync with HEAD of shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 2209aa4..cc9f1db 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 2209aa4cdc29918897a13023ec1fa88e6090e538 +Subproject commit cc9f1dbde7ec26fd7298525c772781f75498c5b5 -- cgit v1.2.3 From c31a589f016fe31cb6f11fc298fca3bf9ee233da Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 28 Oct 2013 01:17:10 +0100 Subject: Sync with HEAD of shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index cc9f1db..e1cbaae 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit cc9f1dbde7ec26fd7298525c772781f75498c5b5 +Subproject commit e1cbaae38ae03de58e5359432a56a579940cfb2e -- cgit v1.2.3 From eb34890fbc81d71bbd223a1b64beb90f7078cda2 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 1 Dec 2013 20:21:34 +0100 Subject: Sync with HEAD of shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index e1cbaae..b295a25 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit e1cbaae38ae03de58e5359432a56a579940cfb2e +Subproject commit b295a25f556901bdf5235649ff12e5c96a6aa8bf -- cgit v1.2.3 From 92b6946d6a836969753f0f6b2ba898dc4de2f1c8 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(-) 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 79cb9f347d7cd12e46302fcd5cfd3ebdf8d8deb2 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(-) 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 08a672bd4dbb9971d2af0898117b7db214cc1c57 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 22 Jan 2015 18:05:30 +0100 Subject: Sync with HEAD of shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index b295a25..6f90b38 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit b295a25f556901bdf5235649ff12e5c96a6aa8bf +Subproject commit 6f90b387298830d42e5b7b0c93dfc5cf605a1a14 -- cgit v1.2.3 From f22e9ed51f5c3701383a7851abceee22dcd3da27 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(+) 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 2e5484db72737e303c45f51eebfbd739456de4ac 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(-) 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 0ba0c068dccb5b26041df265e1fad36dbe723551 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(+) 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 ca9c5a381587f8c291860cb7ea03eee5a79df3cd Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 27 Feb 2015 18:22:02 +0100 Subject: Sync with HEAD of shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 6f90b38..ee913a2 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 6f90b387298830d42e5b7b0c93dfc5cf605a1a14 +Subproject commit ee913a2cf511574090f1faffe2e27fe0c28e09d4 -- cgit v1.2.3 From adbe8c1de392302287d1c6116e6f578e44ee9128 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(-) 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 810f2d264898ec59c42a7ec9cf46a777240425e8 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(-) 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 4cd258afd75e0f87a402c26805581ba13ca56bbe Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 14 Mar 2015 16:46:57 +0100 Subject: Update git URL. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 75c24b1..4417863 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ Ikiwiki build environment To quickly start working with content, this should suffice: - git clone git://source.jones.dk/ikiwiki/site + git clone git://source.jones.dk/ikiwiki cd site make init make -- cgit v1.2.3 From 8678cdc4d0478cc4ea86bbb4737f2a8393d8c2ae Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 19 Jan 2017 11:36:44 +0100 Subject: Add initial config seed file. --- config/ikiwiki.setup.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 config/ikiwiki.setup.in diff --git a/config/ikiwiki.setup.in b/config/ikiwiki.setup.in new file mode 100644 index 0000000..ed57570 --- /dev/null +++ b/config/ikiwiki.setup.in @@ -0,0 +1,12 @@ +# IkiWiki::Setup::Yaml - YAML formatted setup file +# +# Seed info for creating ikiwiki setup file. +# +# Passing this to ikiwiki --setup ... --dumpsetup will make ikiwiki +# generate its setup file. +# +# Remember to remove ikiwiki.setup and re-run make init any time you +# edit this file. +# +# name of the wiki +wikiname: Example website -- cgit v1.2.3