From 3b28f4bf72e1791a34a4ebe23ea66f7cfa89f6af Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 1 Mar 2012 02:12:38 +0100 Subject: Git-ignore .ikiwiki subdirs. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 90e0c3b..7c191a6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /content/ /styling/ /config/ikiwiki*.setup +/.ikiwiki*/ -- cgit v1.2.3 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