From 878d1dc9d087f8ff1cf0326896cdcaad8b9171b9 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 13 Jun 2011 21:54:18 +0200 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 3934a31..be31968 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 3934a31f091732a4746662712c6f766dcc8dd23f +Subproject commit be319683b76c0aed78be4b92b79822c4fd6b294d -- cgit v1.2.3 From fc5b4e9c74ab2c9257a931a6c5478886c3c9b73e Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 15 Jun 2011 16:12:29 +0200 Subject: Sync with HEAD of submodule shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index be31968..243dfd6 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit be319683b76c0aed78be4b92b79822c4fd6b294d +Subproject commit 243dfd68c6d36edbe4856d17ff81b8bdbad058af -- cgit v1.2.3 From 88397c91cb91e0b32abdbfc384a05ed9ea455d76 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 17 Jun 2011 17:13: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 243dfd6..7d624e4 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 243dfd68c6d36edbe4856d17ff81b8bdbad058af +Subproject commit 7d624e40cb0a915d5797997e7d9c2678915b9d79 -- cgit v1.2.3 From 40e0c0bdf22ec40a672f21fecadf98b95c3d7887 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 7 Aug 2011 16:50:33 +0200 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 7d624e4..bb127ef 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 7d624e40cb0a915d5797997e7d9c2678915b9d79 +Subproject commit bb127ef4a5b039bdbd3b83179305ed3202e2b318 -- cgit v1.2.3 From a502a02616ef6f4396766011f70914c1bb586d4a Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 27 Sep 2011 22:38:16 +0200 Subject: Add a bunch of default config stuff. --- config/include.mk | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/config/include.mk b/config/include.mk index 864ebd2..9a57307 100644 --- a/config/include.mk +++ b/config/include.mk @@ -1,11 +1,13 @@ domain = example.com +website = www.$(domain) +srcsite = source.$(domain) gitrepo = site/content plugins = goodstuff \ plugins-off = -admins = +admins = \ IKIWIKI_CONFIG_OPTIONS = \ --wikiname 'SampleWiki' \ @@ -14,6 +16,11 @@ IKIWIKI_CONFIG_OPTIONS = \ $(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 \ @@ -21,9 +28,20 @@ IKIWIKI_CONFIG_OPTIONS += \ # 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;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]' \ + --set git_wrapper='$(CURDIR)/build/git/post-update-ikiwiki' \ + --set git_wrappermode=06755 \ + -- cgit v1.2.3 From 4de59024675694219a37f041c930a661c37162ad Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 6 Oct 2011 17:17: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 bb127ef..ffb94ef 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit bb127ef4a5b039bdbd3b83179305ed3202e2b318 +Subproject commit ffb94efe84c846b205f917263e3ef6e09c059d51 -- cgit v1.2.3 From edc099d6f67a02b29e0e4d5200f47fd5c41043f1 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 6 Oct 2011 19:39:31 +0200 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index ffb94ef..c99d8e0 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit ffb94efe84c846b205f917263e3ef6e09c059d51 +Subproject commit c99d8e067da44220e6a9c8b3154a78be31c15baa -- cgit v1.2.3 From a64361e650268cc425960da8a7a82e328f89674c Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 11 Oct 2011 02:59:07 +0200 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index c99d8e0..1a44582 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit c99d8e067da44220e6a9c8b3154a78be31c15baa +Subproject commit 1a44582e8b3753f9578414bef939ff2b1b2bb04c -- cgit v1.2.3 From e070a660f9c34aee9b2002e6fe03ed1abc1955b9 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 11 Oct 2011 03:15:10 +0200 Subject: Fix modernize diffurl. --- config/include.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/include.mk b/config/include.mk index 9a57307..60c0f68 100644 --- a/config/include.mk +++ b/config/include.mk @@ -41,7 +41,7 @@ IKIWIKI_CONFIG_OPTIONS += \ IKIWIKI_CONFIG_OPTIONS += \ --rcs=git \ --historyurl 'http://$(srcsite)/?p=$(gitrepo).git;a=history;f=[[file]]' \ - --diffurl 'http://$(srcsite)/?p=$(gitrepo).git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];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 bf2ed42c116b0dd3dc346ed46cbaa0e8d62ffbe2 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 11 Oct 2011 03:26:25 +0200 Subject: Fix build cssprojects. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 064425a..8105fc4 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,8 @@ content: submodules mkdir -p '$@' [ -e '$@/index.mdwn' ] || printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn' -build: $(cssprojects) +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 -- cgit v1.2.3 From f52ce3a66f7589796d3f05c3ee89b8331d299550 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 11 Oct 2011 03:34:12 +0200 Subject: Avoid confusing output in build target init. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8105fc4..85f3dda 100644 --- a/Makefile +++ b/Makefile @@ -21,9 +21,10 @@ submodules: git submodule init git submodule update --init --recursive +config: setupfiles = $(wildcard $@/*.setup) config: submodules - mkdir -p '$@' - [ -e '$@/'*.setup ] || ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup '$@/ikiwiki.setup' + $(if $(setupfiles),,mkdir -p '$@') + $(if $(setupfiles),,ikiwiki $(IKIWIKI_OPTIONS) --dumpsetup '$@/ikiwiki.setup') content: submodules mkdir -p '$@' -- cgit v1.2.3 From c3a251cad2b317e8761a8291f3a581f16d8bc2c4 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 14 Oct 2011 03:25:47 +0200 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 1a44582..f528fc4 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 1a44582e8b3753f9578414bef939ff2b1b2bb04c +Subproject commit f528fc43d094c41ecbb73ca13c7eb89e3a7997df -- cgit v1.2.3 From 00c2de6c29e0e815cb874d05baad6ae00bec1f71 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 14 Oct 2011 12:56:25 +0200 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index f528fc4..5482bc9 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit f528fc43d094c41ecbb73ca13c7eb89e3a7997df +Subproject commit 5482bc9af686fbc7b2ba7e24200d9fed0504921a -- cgit v1.2.3 From f812b7cba4fddd9e2b143367f12e72a01ff5b2b2 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Fri, 14 Oct 2011 13:19:54 +0200 Subject: Sync with HEAD of submodule: shared. --- shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared b/shared index 5482bc9..2dd7d54 160000 --- a/shared +++ b/shared @@ -1 +1 @@ -Subproject commit 5482bc9af686fbc7b2ba7e24200d9fed0504921a +Subproject commit 2dd7d546d65aa9c0f4122c45f983c28caf09943f -- cgit v1.2.3 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 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