From 539443a49798f3ee1d9d3da660d8f88134822a64 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 10 Mar 2012 02:10:08 +0100 Subject: Restructure (again again) init dependencies. --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4e287aa..dd996fe 100644 --- a/Makefile +++ b/Makefile @@ -25,19 +25,21 @@ avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || iki_configfiles := $(or $(patsubst %.in,%,$(wildcard config/ikiwiki*.setup.in)),config/ikiwiki.setup) -init: $(iki_configfiles) content +init: shared/.git content + $(MAKE) $(iki_configfiles) shared/.git: git submodule init git submodule update --init --recursive +configfiles: $(iki_configfiles) $(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%)) -$(iki_configfiles): % : %.in shared/.git +$(iki_configfiles): % : %.in $(if $(wildcard config),,mkdir config) ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) $(IKIWIKI_OPTIONS) --dumpsetup $@ content: notempty = $(wildcard $@/*.mdwn) -content: shared/.git +content: $(if $(notempty),,mkdir -p '$@') $(if $(notempty),,printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn') @@ -45,4 +47,4 @@ build: $(if $(cssprojects),$(MAKE) $(cssprojects)) $(foreach config,$(shell find config -name '*.setup'),ikiwiki --setup $(config)$(avoid-broken-git)$(if $(always-make), --rebuild);) -.PHONY: all build +.PHONY: all build configfiles -- cgit v1.2.3 From 071348ca9b3d32483948dea8374d95c7abe385ce Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 10 Mar 2012 05:41:32 +0100 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 3ad7126..03bf07f 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 3ad71262f915a8ff542abd0a71bcd1bc32c1efa2 +Subproject commit 03bf07feafc4e6bd5ff4ecacab4b0ca73e5a0f06 -- cgit v1.2.3 From 7d66baaa1d47238457673b41280801a880540a96 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 24 Mar 2012 00:58:53 +0100 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 03bf07f..efcab28 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 03bf07feafc4e6bd5ff4ecacab4b0ca73e5a0f06 +Subproject commit efcab289f951f4c7d7a7f73f4f4476fece6fa4e1 -- cgit v1.2.3 From f2918c62df3a019a5ad3b6a076d8f45a5b48b9c8 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 24 Mar 2012 01:12:47 +0100 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index efcab28..289e0e2 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit efcab289f951f4c7d7a7f73f4f4476fece6fa4e1 +Subproject commit 289e0e2c2ba90e690dc8ce9c1558ca0b9cf679d7 -- cgit v1.2.3 From 3dfb101d32c005d1d5c7c9e41e22031b2b7080ed Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 1 Aug 2012 12:06:36 +0200 Subject: Fix bootstrapping with no initial ikiwiki config. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dd996fe..1fb0d33 100644 --- a/Makefile +++ b/Makefile @@ -32,10 +32,13 @@ shared/.git: git submodule init git submodule update --init --recursive +config/ikiwiki.setup.in: + $(if $(wildcard config),,mkdir config) + $(if $(wildcard config/ikiwiki.setup.in),,touch config/ikiwiki.setup.in) + configfiles: $(iki_configfiles) $(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%)) $(iki_configfiles): % : %.in - $(if $(wildcard config),,mkdir config) ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) $(IKIWIKI_OPTIONS) --dumpsetup $@ content: notempty = $(wildcard $@/*.mdwn) -- cgit v1.2.3 From ff4bc26cc84c8574a75492f211b28053a54fd6bd Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 4 Aug 2012 15:57:34 +0200 Subject: Sync with HEAD of shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 289e0e2..f883dcf 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 289e0e2c2ba90e690dc8ce9c1558ca0b9cf679d7 +Subproject commit f883dcfd58c1b6811d341c22e553ebc7f53b9aa5 -- cgit v1.2.3 From acced10a9ec5c3fb7d09d0dcc719c87af9be27b6 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 4 Aug 2012 18:50:51 +0200 Subject: Sync with HEAD of submodule shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index f883dcf..468ffa7 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit f883dcfd58c1b6811d341c22e553ebc7f53b9aa5 +Subproject commit 468ffa7e6396295047319a1a93ef2c0fd37bf5ce -- cgit v1.2.3 From cc4bcbadbbabb468dd0f78149bc2f227393dd57c Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 4 Aug 2012 19:44:45 +0200 Subject: Drop IKIWIKI_SHARED_OPTIONS (merge into IKIWIKI_SHARED_DEFAULTS. --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 1fb0d33..39dcbf1 100644 --- a/Makefile +++ b/Makefile @@ -2,15 +2,14 @@ IKIWIKI_DEFAULTS ?= \ --rcs git \ --set cgi_wrappermode=00755 \ --set git_wrappermode=06755 \ + --set srcdir='@CURDIR@/content' \ + --set destdir='@CURDIR@/build/html$(iki_flavor:%=-%)' \ + --set cgi_wrapper='@CURDIR@/build/cgi$(iki_flavor:%=-%)/ikiwiki.cgi' \ + --set git_wrapper='@CURDIR@/build/git/post-update-ikiwiki$(iki_flavor:%=-%)' \ + --set wikistatedir='@CURDIR@/.ikiwiki$(iki_flavor:%=-%)' \ $(IKIWIKI_SHARED_DEFAULTS) -IKIWIKI_OPTIONS ?= \ - --set srcdir='$(CURDIR)/content' \ - --set destdir='$(CURDIR)/build/html$(iki_flavor:%=-%)' \ - --set cgi_wrapper='$(CURDIR)/build/cgi$(iki_flavor:%=-%)/ikiwiki.cgi' \ - --set git_wrapper='$(CURDIR)/build/git/post-update-ikiwiki$(iki_flavor:%=-%)' \ - --set wikistatedir='$(CURDIR)/.ikiwiki$(iki_flavor:%=-%)' \ - $(IKIWIKI_SHARED_OPTIONS) +export CURDIR cssprojects ?= $(wildcard shared/themes/goab styling) @@ -39,7 +38,8 @@ 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 $<)) $(IKIWIKI_OPTIONS) --dumpsetup $@ + ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) --dumpsetup $@ + perl -i -pe '$$s=$$ENV{'CURDIR'}; s/\@CURDIR\@/$$s/g' $@ content: notempty = $(wildcard $@/*.mdwn) content: -- cgit v1.2.3 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