From ff3011a50bc444251bf1cdc29c304fc9d9d1a04b Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 16 Feb 2012 19:49:51 +0100 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 2dd7d54..fde696d 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 2dd7d546d65aa9c0f4122c45f983c28caf09943f +Subproject commit fde696d632f8d98e8277f303d76c3b09443e1f94 -- cgit v1.2.3 From 5d4b61649b3c470295b72e2d2a2dcb3c08b9da15 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 23 Feb 2012 18:16:37 +0100 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index fde696d..395a181 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit fde696d632f8d98e8277f303d76c3b09443e1f94 +Subproject commit 395a181654f479fd6bfef70b7f4d9031e5d726d1 -- cgit v1.2.3 From d8c0ceefa83fd295d6acca607ff8ba3c8c99f69d Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 1 Mar 2012 01:39:19 +0100 Subject: Restructure submodules and config targets dependency handling (now use -B to force rebuilding). --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 85f3dda..7f98f02 100644 --- a/Makefile +++ b/Makefile @@ -14,24 +14,24 @@ all: build always-make = $(filter -B,$(MAKEFLAGS)) avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo " --no-rcs") -init: submodules content - $(MAKE) -B config +init: config content -submodules: +shared/.git: git submodule init git submodule update --init --recursive config: setupfiles = $(wildcard $@/*.setup) -config: submodules +config: shared/.git $(if $(setupfiles),,mkdir -p '$@') $(if $(setupfiles),,ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup '$@/ikiwiki.setup') -content: submodules - mkdir -p '$@' - [ -e '$@/index.mdwn' ] || printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn' +content: notempty = $(wildcard $@/*.mdwn) +content: shared/.git + $(if $(notempty),,mkdir -p '$@') + $(if $(notempty),,printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn') 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 submodules content +.PHONY: all build -- cgit v1.2.3 From 192f9b20b08f84deea743af5349054378c58bf6d Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 1 Mar 2012 01:50:03 +0100 Subject: Individual configfile targets. --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7f98f02..ad06556 100644 --- a/Makefile +++ b/Makefile @@ -14,16 +14,17 @@ all: build always-make = $(filter -B,$(MAKEFLAGS)) avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo " --no-rcs") -init: config content +iki_configfiles := $(or $(patsubst %.in,%,$(wildcard config/ikiwiki*.setup.in)),config/ikiwiki.setup) + +init: $(iki_configfiles) content shared/.git: git submodule init git submodule update --init --recursive -config: setupfiles = $(wildcard $@/*.setup) -config: shared/.git - $(if $(setupfiles),,mkdir -p '$@') - $(if $(setupfiles),,ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup '$@/ikiwiki.setup') +$(iki_configfiles): % : %.in shared/.git + $(if $(wildcard config),,mkdir config) + ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup $@ content: notempty = $(wildcard $@/*.mdwn) content: shared/.git -- cgit v1.2.3 From b0bcfa85400922e44184379e8fee74611581957b Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 1 Mar 2012 01:56:54 +0100 Subject: Generate Ikiwiki setup files from defaults, hardcoding (path) options and optional *.in YAML file. --- Makefile | 18 ++++++++++++++---- config/include.mk | 47 ----------------------------------------------- 2 files changed, 14 insertions(+), 51 deletions(-) delete mode 100644 config/include.mk diff --git a/Makefile b/Makefile index ad06556..4e287aa 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,16 @@ +IKIWIKI_DEFAULTS ?= \ + --rcs git \ + --set cgi_wrappermode=00755 \ + --set git_wrappermode=06755 \ + $(IKIWIKI_SHARED_DEFAULTS) + IKIWIKI_OPTIONS ?= \ - --set srcdir='$(CURDIR)/content' \ - --set destdir='$(CURDIR)/build/html' \ - $(IKIWIKI_SHARED_OPTIONS) $(IKIWIKI_CONFIG_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) cssprojects ?= $(wildcard shared/themes/goab styling) @@ -22,9 +31,10 @@ shared/.git: git submodule init git submodule update --init --recursive +$(iki_configfiles): iki_flavor = $(if $(filter config/ikiwiki-%.setup,$@),$(@:config/ikiwiki-%.setup=%)) $(iki_configfiles): % : %.in shared/.git $(if $(wildcard config),,mkdir config) - ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup $@ + ikiwiki $(IKIWIKI_DEFAULTS) $(patsubst %,--setup %,$(wildcard $<)) $(IKIWIKI_OPTIONS) --dumpsetup $@ content: notempty = $(wildcard $@/*.mdwn) content: shared/.git diff --git a/config/include.mk b/config/include.mk deleted file mode 100644 index 60c0f68..0000000 --- a/config/include.mk +++ /dev/null @@ -1,47 +0,0 @@ -domain = example.com -website = www.$(domain) -srcsite = source.$(domain) -gitrepo = site/content - -plugins = goodstuff \ - -plugins-off = - -admins = \ - -IKIWIKI_CONFIG_OPTIONS = \ - --wikiname 'SampleWiki' \ - --adminemail 'webmaster@$(domain)' \ - $(patsubst %,--adminuser '%',$(admins)) \ - $(patsubst %,--plugin %,$(plugins)) \ - $(patsubst %,--disable-plugin %,$(plugins-off)) \ - -# paths -#IKIWIKI_CONFIG_OPTIONS += --set-yaml add_underlays='- $(CURDIR)/styling' -IKIWIKI_CONFIG_OPTIONS += \ - --set wikistatedir='$(CURDIR)/.ikiwiki' \ - -# collaboration/aggregation -IKIWIKI_CONFIG_OPTIONS += \ - --allowrss \ - --allowatom \ - -# styling -IKIWIKI_CONFIG_OPTIONS += \ - --set theme=goab \ - -# CGI -IKIWIKI_CONFIG_OPTIONS += \ - --url 'http://$(website)/' \ - --cgiurl 'http://$(website)/ikiwiki.cgi' \ - --set cgi_wrapper='$(CURDIR)/build/cgi/ikiwiki.cgi' \ - --set cgi_wrappermode=00755 \ - -# VCS -IKIWIKI_CONFIG_OPTIONS += \ - --rcs=git \ - --historyurl 'http://$(srcsite)/?p=$(gitrepo).git;a=history;f=[[file]]' \ - --diffurl 'http://$(srcsite)/?p=$(gitrepo).git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]' \ - --set git_wrapper='$(CURDIR)/build/git/post-update-ikiwiki' \ - --set git_wrappermode=06755 \ - -- cgit v1.2.3 From 7a52d2b79c64bb5cc227cc75dc2ab092e78ddbe4 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 1 Mar 2012 01:57:36 +0100 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 395a181..3ad7126 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 395a181654f479fd6bfef70b7f4d9031e5d726d1 +Subproject commit 3ad71262f915a8ff542abd0a71bcd1bc32c1efa2 -- cgit v1.2.3 From 30ca764d2139a3e4b264f77b57a85117e6a21012 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 1 Mar 2012 02:03:44 +0100 Subject: Git-ignore content, styling and generated setups. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e4b7070..90e0c3b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ */.sass-cache/ /build/ +/content/ +/styling/ +/config/ikiwiki*.setup -- cgit v1.2.3