diff options
-rw-r--r-- | .gitignore | 29 | ||||
-rw-r--r-- | Makefile | 49 | ||||
-rw-r--r-- | deps.mk | 90 | ||||
-rwxr-xr-x | mkdeps.sh | 10 | ||||
-rw-r--r-- | src/base.conf | 2 | ||||
-rw-r--r-- | src/content/about.adoc (renamed from src/about.adoc) | 0 | ||||
-rw-r--r-- | src/content/blog.adoc (renamed from src/blog.adoc) | 0 | ||||
-rw-r--r-- | src/content/blog/1970/01/01/launch.adoc (renamed from src/blog/1970/01/01/launch.adoc) | 0 | ||||
-rw-r--r-- | src/content/blog/2000/01/01/feature-ann.adoc (renamed from src/blog/2000/01/01/feature-ann.adoc) | 0 | ||||
-rw-r--r-- | src/content/img/atom.svg (renamed from src/img/atom.svg) | 0 | ||||
-rw-r--r-- | src/content/img/database-light.svg (renamed from src/img/database-light.svg) | 0 | ||||
-rw-r--r-- | src/content/img/diagram-light.svg (renamed from src/img/diagram-light.svg) | 0 | ||||
-rw-r--r-- | src/content/img/envelope.svg (renamed from src/img/envelope.svg) | 0 | ||||
-rw-r--r-- | src/content/img/favicon.svg (renamed from src/img/favicon.svg) | 0 | ||||
-rw-r--r-- | src/content/img/link.svg (renamed from src/img/link.svg) | 0 | ||||
-rw-r--r-- | src/content/img/lock.svg (renamed from src/img/lock.svg) | 0 | ||||
-rw-r--r-- | src/content/img/logo.svg (renamed from src/img/logo.svg) | 0 | ||||
-rw-r--r-- | src/content/img/shield-light.svg (renamed from src/img/shield-light.svg) | 0 | ||||
-rw-r--r-- | src/content/index.adoc (renamed from src/index.adoc) | 0 | ||||
-rw-r--r-- | src/content/pricing.adoc (renamed from src/pricing.adoc) | 0 | ||||
-rw-r--r-- | src/content/privacy.adoc (renamed from src/privacy.adoc) | 0 | ||||
-rw-r--r-- | src/content/style.css (renamed from src/style.css) | 0 | ||||
-rw-r--r-- | src/content/terms.adoc (renamed from src/terms.adoc) | 0 |
23 files changed, 91 insertions, 89 deletions
@@ -1,15 +1,16 @@ -/src/*/*/*/*/*.htmlbody -/src/*/*/*/*/*.conf -/src/*/*/*/*/*.snippets -/src/*/*/*/*/*.html -/src/*/*/*/*/*.txt -/src/*/*/*/*/*.indexentry -/src/*/*/*/*/*.feedentry -/src/*/*/*/*/*.sortdata -/src/*.htmlbody -/src/*.conf -/src/*.snippets -/src/*.html -/src/*.txt +/src/content/*/*/*/*/*.htmlbody +/src/content/*/*/*/*/*.conf +/src/content/*/*/*/*/*.snippets +/src/content/*/*/*/*/*.html +/src/content/*/*/*/*/*.txt +/src/content/*/*/*/*/*.indexentry +/src/content/*/*/*/*/*.feedentry +/src/content/*/*/*/*/*.sortdata +/src/content/*.htmlbody +/src/content/*.conf +/src/content/*.snippets +/src/content/*.html +/src/content/*.txt +/src/content/*.xml /src/*.sortdata -/src/*.xml +/src/global.conf @@ -62,34 +62,34 @@ articles.feedentry = $(articles.adoc:.adoc=.feedentry) articles.sortdata = $(articles.adoc:.adoc=.sortdata) sources = \ - $(sources.adoc) \ - $(images.svg) \ - src/style.css \ + $(sources.adoc) \ + $(images.svg) \ + src/content/style.css \ contents = \ - $(sources.html) \ - src/atom.xml \ - src/blog.html \ + $(sources.html) \ + src/content/atom.xml \ + src/content/blog.html \ static-contents = \ - $(images.svg) \ - src/style.css \ + $(images.svg) \ + src/content/style.css \ derived-assets = \ - $(contents) \ - $(sources.htmlbody) \ - $(sources.snippets) \ - $(sources.conf) \ - src/global.conf \ - $(articles.indexentry) \ - $(articles.feedentry) \ - $(articles.sortdata) \ + $(contents) \ + $(sources.htmlbody) \ + $(sources.snippets) \ + $(sources.conf) \ + src/global.conf \ + $(articles.indexentry) \ + $(articles.feedentry) \ + $(articles.sortdata) \ side-assets = \ - src/*/*/*/*/*.html.*.txt \ - src/*.html.*.txt \ - src/*.sortdata \ + src/content/*/*/*/*/*.html.*.txt \ + src/content/*.html.*.txt \ + src/*.sortdata \ @@ -105,12 +105,13 @@ $(sources.conf): src/global.conf src/global.conf: src/base.conf mkwb conf src/base.conf > $@ -src/atom.xml src/blog.html: $(articles.sortdata) src/base.conf src/global.conf +src/content/atom.xml src/content/blog.html: $(articles.sortdata) \ + src/base.conf src/global.conf -src/atom.xml: $(articles.feedentry) +src/content/atom.xml: $(articles.feedentry) mkwb feed src/base.conf src/global.conf $(articles.sortdata) > $@ -src/blog.html: $(articles.indexentry) src/blog.htmlbody +src/content/blog.html: $(articles.indexentry) src/content/blog.htmlbody mkwb indexbody $*.conf $(articles.sortdata) | cat $*.htmlbody - > $@-t mkwb html $@-t > $@ rm -f $@-t @@ -149,12 +150,12 @@ install: all '$(DESTDIR)$(SRCDIR)' \ for f in $(contents) $(static-contents) `cat $(sources.snippets)`; do \ - dir='$(DESTDIR)$(DOCDIR)'/"`dirname "$${f#src/}"`"; \ + dir='$(DESTDIR)$(DOCDIR)'/"`dirname "$${f#src/content/}"`"; \ mkdir -p "$$dir"; \ cp -P "$$f" "$$dir"; \ done for f in $(sources); do \ - dir='$(DESTDIR)$(SRCDIR)'/"`dirname "$${f#src/}"`"; \ + dir='$(DESTDIR)$(SRCDIR)'/"`dirname "$${f#src/content/}"`"; \ mkdir -p "$$dir"; \ cp -P "$$f" "$$dir"; \ done @@ -1,51 +1,51 @@ articles.adoc = \ - src/blog/1970/01/01/launch.adoc \ - src/blog/2000/01/01/feature-ann.adoc \ + src/content/blog/1970/01/01/launch.adoc \ + src/content/blog/2000/01/01/feature-ann.adoc \ pages.adoc = \ - src/about.adoc \ - src/blog.adoc \ - src/index.adoc \ - src/pricing.adoc \ - src/privacy.adoc \ - src/terms.adoc \ + src/content/about.adoc \ + src/content/blog.adoc \ + src/content/index.adoc \ + src/content/pricing.adoc \ + src/content/privacy.adoc \ + src/content/terms.adoc \ images.svg = \ - src/img/atom.svg \ - src/img/database-light.svg \ - src/img/diagram-light.svg \ - src/img/envelope.svg \ - src/img/favicon.svg \ - src/img/link.svg \ - src/img/lock.svg \ - src/img/logo.svg \ - src/img/shield-light.svg \ + src/content/img/atom.svg \ + src/content/img/database-light.svg \ + src/content/img/diagram-light.svg \ + src/content/img/envelope.svg \ + src/content/img/favicon.svg \ + src/content/img/link.svg \ + src/content/img/lock.svg \ + src/content/img/logo.svg \ + src/content/img/shield-light.svg \ -src/blog/1970/01/01/launch.htmlbody src/blog/1970/01/01/launch.snippets src/blog/1970/01/01/launch.conf: src/blog/1970/01/01/launch.adoc -src/blog/2000/01/01/feature-ann.htmlbody src/blog/2000/01/01/feature-ann.snippets src/blog/2000/01/01/feature-ann.conf: src/blog/2000/01/01/feature-ann.adoc -src/about.htmlbody src/about.snippets src/about.conf: src/about.adoc -src/blog.htmlbody src/blog.snippets src/blog.conf: src/blog.adoc -src/index.htmlbody src/index.snippets src/index.conf: src/index.adoc -src/pricing.htmlbody src/pricing.snippets src/pricing.conf: src/pricing.adoc -src/privacy.htmlbody src/privacy.snippets src/privacy.conf: src/privacy.adoc -src/terms.htmlbody src/terms.snippets src/terms.conf: src/terms.adoc -src/blog/1970/01/01/launch.snippets: src/blog/1970/01/01/launch.adoc -src/blog/2000/01/01/feature-ann.snippets: src/blog/2000/01/01/feature-ann.adoc -src/about.snippets: src/about.adoc -src/blog.snippets: src/blog.adoc -src/index.snippets: src/index.adoc -src/pricing.snippets: src/pricing.adoc -src/privacy.snippets: src/privacy.adoc -src/terms.snippets: src/terms.adoc -src/blog/1970/01/01/launch.html: src/blog/1970/01/01/launch.conf src/blog/1970/01/01/launch.htmlbody -src/blog/2000/01/01/feature-ann.html: src/blog/2000/01/01/feature-ann.conf src/blog/2000/01/01/feature-ann.htmlbody -src/about.html: src/about.conf src/about.htmlbody -src/blog.html: src/blog.conf src/blog.htmlbody -src/index.html: src/index.conf src/index.htmlbody -src/pricing.html: src/pricing.conf src/pricing.htmlbody -src/privacy.html: src/privacy.conf src/privacy.htmlbody -src/terms.html: src/terms.conf src/terms.htmlbody -src/blog/1970/01/01/launch.feedentry: src/blog/1970/01/01/launch.conf src/blog/1970/01/01/launch.htmlbody -src/blog/2000/01/01/feature-ann.feedentry: src/blog/2000/01/01/feature-ann.conf src/blog/2000/01/01/feature-ann.htmlbody -src/blog/1970/01/01/launch.sortdata: src/blog/1970/01/01/launch.conf -src/blog/2000/01/01/feature-ann.sortdata: src/blog/2000/01/01/feature-ann.conf +src/content/blog/1970/01/01/launch.htmlbody src/content/blog/1970/01/01/launch.snippets src/content/blog/1970/01/01/launch.conf: src/content/blog/1970/01/01/launch.adoc +src/content/blog/2000/01/01/feature-ann.htmlbody src/content/blog/2000/01/01/feature-ann.snippets src/content/blog/2000/01/01/feature-ann.conf: src/content/blog/2000/01/01/feature-ann.adoc +src/content/about.htmlbody src/content/about.snippets src/content/about.conf: src/content/about.adoc +src/content/blog.htmlbody src/content/blog.snippets src/content/blog.conf: src/content/blog.adoc +src/content/index.htmlbody src/content/index.snippets src/content/index.conf: src/content/index.adoc +src/content/pricing.htmlbody src/content/pricing.snippets src/content/pricing.conf: src/content/pricing.adoc +src/content/privacy.htmlbody src/content/privacy.snippets src/content/privacy.conf: src/content/privacy.adoc +src/content/terms.htmlbody src/content/terms.snippets src/content/terms.conf: src/content/terms.adoc +src/content/blog/1970/01/01/launch.snippets: src/content/blog/1970/01/01/launch.adoc +src/content/blog/2000/01/01/feature-ann.snippets: src/content/blog/2000/01/01/feature-ann.adoc +src/content/about.snippets: src/content/about.adoc +src/content/blog.snippets: src/content/blog.adoc +src/content/index.snippets: src/content/index.adoc +src/content/pricing.snippets: src/content/pricing.adoc +src/content/privacy.snippets: src/content/privacy.adoc +src/content/terms.snippets: src/content/terms.adoc +src/content/blog/1970/01/01/launch.html: src/content/blog/1970/01/01/launch.conf src/content/blog/1970/01/01/launch.htmlbody +src/content/blog/2000/01/01/feature-ann.html: src/content/blog/2000/01/01/feature-ann.conf src/content/blog/2000/01/01/feature-ann.htmlbody +src/content/about.html: src/content/about.conf src/content/about.htmlbody +src/content/blog.html: src/content/blog.conf src/content/blog.htmlbody +src/content/index.html: src/content/index.conf src/content/index.htmlbody +src/content/pricing.html: src/content/pricing.conf src/content/pricing.htmlbody +src/content/privacy.html: src/content/privacy.conf src/content/privacy.htmlbody +src/content/terms.html: src/content/terms.conf src/content/terms.htmlbody +src/content/blog/1970/01/01/launch.feedentry: src/content/blog/1970/01/01/launch.conf src/content/blog/1970/01/01/launch.htmlbody +src/content/blog/2000/01/01/feature-ann.feedentry: src/content/blog/2000/01/01/feature-ann.conf src/content/blog/2000/01/01/feature-ann.htmlbody +src/content/blog/1970/01/01/launch.sortdata: src/content/blog/1970/01/01/launch.conf +src/content/blog/2000/01/01/feature-ann.sortdata: src/content/blog/2000/01/01/feature-ann.conf @@ -5,11 +5,11 @@ export LANG=POSIX.UTF-8 articles() { - find src/*/ -type f -name '*.adoc' | sort + find src/content/*/ -type f -name '*.adoc' | sort } pages() { - find src/*.adoc -type f | sort + find src/content/*.adoc -type f | sort } files() { @@ -18,9 +18,9 @@ files() { } -articles | varlist 'articles.adoc' -pages | varlist 'pages.adoc' -find src/img/*.svg | varlist 'images.svg' +articles | varlist 'articles.adoc' +pages | varlist 'pages.adoc' +find src/content/img/*.svg | varlist 'images.svg' files | sed 's/^\(.*\)\.adoc$/\1.htmlbody\t\1.snippets\t\1.conf:\t\1.adoc/' diff --git a/src/base.conf b/src/base.conf index 957a8cb..2ed2403 100644 --- a/src/base.conf +++ b/src/base.conf @@ -1,4 +1,4 @@ -export root_dir=src +export root_dir=src/content export img_dir=img export header_links=src/headers.txt export domain='papo.im' diff --git a/src/about.adoc b/src/content/about.adoc index 8f8dd75..8f8dd75 100644 --- a/src/about.adoc +++ b/src/content/about.adoc diff --git a/src/blog.adoc b/src/content/blog.adoc index 2119a57..2119a57 100644 --- a/src/blog.adoc +++ b/src/content/blog.adoc diff --git a/src/blog/1970/01/01/launch.adoc b/src/content/blog/1970/01/01/launch.adoc index 9a57dfe..9a57dfe 100644 --- a/src/blog/1970/01/01/launch.adoc +++ b/src/content/blog/1970/01/01/launch.adoc diff --git a/src/blog/2000/01/01/feature-ann.adoc b/src/content/blog/2000/01/01/feature-ann.adoc index c7c3cca..c7c3cca 100644 --- a/src/blog/2000/01/01/feature-ann.adoc +++ b/src/content/blog/2000/01/01/feature-ann.adoc diff --git a/src/img/atom.svg b/src/content/img/atom.svg index 37bace2..37bace2 100644 --- a/src/img/atom.svg +++ b/src/content/img/atom.svg diff --git a/src/img/database-light.svg b/src/content/img/database-light.svg index 5843d8f..5843d8f 100644 --- a/src/img/database-light.svg +++ b/src/content/img/database-light.svg diff --git a/src/img/diagram-light.svg b/src/content/img/diagram-light.svg index 3e9275a..3e9275a 100644 --- a/src/img/diagram-light.svg +++ b/src/content/img/diagram-light.svg diff --git a/src/img/envelope.svg b/src/content/img/envelope.svg index c2251f4..c2251f4 100644 --- a/src/img/envelope.svg +++ b/src/content/img/envelope.svg diff --git a/src/img/favicon.svg b/src/content/img/favicon.svg index e97121c..e97121c 100644 --- a/src/img/favicon.svg +++ b/src/content/img/favicon.svg diff --git a/src/img/link.svg b/src/content/img/link.svg index e5c7050..e5c7050 100644 --- a/src/img/link.svg +++ b/src/content/img/link.svg diff --git a/src/img/lock.svg b/src/content/img/lock.svg index 1a4a18e..1a4a18e 100644 --- a/src/img/lock.svg +++ b/src/content/img/lock.svg diff --git a/src/img/logo.svg b/src/content/img/logo.svg index f9f2976..f9f2976 100644 --- a/src/img/logo.svg +++ b/src/content/img/logo.svg diff --git a/src/img/shield-light.svg b/src/content/img/shield-light.svg index 5126931..5126931 100644 --- a/src/img/shield-light.svg +++ b/src/content/img/shield-light.svg diff --git a/src/index.adoc b/src/content/index.adoc index 4065605..4065605 100644 --- a/src/index.adoc +++ b/src/content/index.adoc diff --git a/src/pricing.adoc b/src/content/pricing.adoc index 5318ba6..5318ba6 100644 --- a/src/pricing.adoc +++ b/src/content/pricing.adoc diff --git a/src/privacy.adoc b/src/content/privacy.adoc index a77b26c..a77b26c 100644 --- a/src/privacy.adoc +++ b/src/content/privacy.adoc diff --git a/src/style.css b/src/content/style.css index e403b2c..e403b2c 100644 --- a/src/style.css +++ b/src/content/style.css diff --git a/src/terms.adoc b/src/content/terms.adoc index cecbc54..cecbc54 100644 --- a/src/terms.adoc +++ b/src/content/terms.adoc |