diff --git a/Makefile b/Makefile index 475d156..c8bba28 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,6 @@ preview: tup graph: tup graph . | dot -Tpng > graph.png -deploy: +deploy: tup rsync --checksum -ave 'ssh -p 4242' \ build/* fab@ffreling.com:public_html/ffreling.com/public/ diff --git a/Tupfile b/Tupfile index 600b55e..4ec31aa 100644 --- a/Tupfile +++ b/Tupfile @@ -1,11 +1,3 @@ -: foreach *.md | templates/footer.html |> \ - pandoc --from markdown --to html \ - --template=templates/pandoc.html \ - --css css/default.css \ - --include-in-header=templates/header.html \ - --include-before-body=templates/nav.html \ - --include-after-body=templates/footer.html \ - %f --output=%o \ - |> %B.html - +include_rules +: foreach *.md |> !pandoc |> : favicon.png |> !tup_preserve |> diff --git a/Tuprules.tup b/Tuprules.tup new file mode 100644 index 0000000..a8f16db --- /dev/null +++ b/Tuprules.tup @@ -0,0 +1,9 @@ +&root = . +!pandoc = | &(root)/templates/footer.html |> pandoc --from markdown --to html \ + --template=&(root)/templates/pandoc.html \ + --css &(root)/css/default.css \ + --include-in-header=&(root)/templates/header.html \ + --include-before-body=&(root)/templates/nav.html \ + --include-after-body=&(root)/templates/footer.html \ + %f --output=%o \ + |> %B.html diff --git a/projects/dawnchaos/Tupfile b/projects/dawnchaos/Tupfile index b8b175d..1afc377 100644 --- a/projects/dawnchaos/Tupfile +++ b/projects/dawnchaos/Tupfile @@ -1,9 +1,2 @@ -: foreach *.md | ../../templates/footer.html |> \ - pandoc --from markdown --to html \ - --template=../../templates/pandoc.html \ - --css ../../css/default.css \ - --include-in-header=../../templates/header.html \ - --include-before-body=../../templates/nav.html \ - --include-after-body=../../templates/footer.html \ - %f --output=%o \ - |> %B.html +include_rules +: foreach *.md |> !pandoc |> diff --git a/projects/maestro/Tupfile b/projects/maestro/Tupfile index b8b175d..1afc377 100644 --- a/projects/maestro/Tupfile +++ b/projects/maestro/Tupfile @@ -1,9 +1,2 @@ -: foreach *.md | ../../templates/footer.html |> \ - pandoc --from markdown --to html \ - --template=../../templates/pandoc.html \ - --css ../../css/default.css \ - --include-in-header=../../templates/header.html \ - --include-before-body=../../templates/nav.html \ - --include-after-body=../../templates/footer.html \ - %f --output=%o \ - |> %B.html +include_rules +: foreach *.md |> !pandoc |> diff --git a/projects/oboy/Tupfile b/projects/oboy/Tupfile index b8b175d..1afc377 100644 --- a/projects/oboy/Tupfile +++ b/projects/oboy/Tupfile @@ -1,9 +1,2 @@ -: foreach *.md | ../../templates/footer.html |> \ - pandoc --from markdown --to html \ - --template=../../templates/pandoc.html \ - --css ../../css/default.css \ - --include-in-header=../../templates/header.html \ - --include-before-body=../../templates/nav.html \ - --include-after-body=../../templates/footer.html \ - %f --output=%o \ - |> %B.html +include_rules +: foreach *.md |> !pandoc |> diff --git a/projects/trailr/Tupfile b/projects/trailr/Tupfile index b8b175d..1afc377 100644 --- a/projects/trailr/Tupfile +++ b/projects/trailr/Tupfile @@ -1,9 +1,2 @@ -: foreach *.md | ../../templates/footer.html |> \ - pandoc --from markdown --to html \ - --template=../../templates/pandoc.html \ - --css ../../css/default.css \ - --include-in-header=../../templates/header.html \ - --include-before-body=../../templates/nav.html \ - --include-after-body=../../templates/footer.html \ - %f --output=%o \ - |> %B.html +include_rules +: foreach *.md |> !pandoc |> diff --git a/projects/whereiscar/Tupfile b/projects/whereiscar/Tupfile index b8b175d..1afc377 100644 --- a/projects/whereiscar/Tupfile +++ b/projects/whereiscar/Tupfile @@ -1,9 +1,2 @@ -: foreach *.md | ../../templates/footer.html |> \ - pandoc --from markdown --to html \ - --template=../../templates/pandoc.html \ - --css ../../css/default.css \ - --include-in-header=../../templates/header.html \ - --include-before-body=../../templates/nav.html \ - --include-after-body=../../templates/footer.html \ - %f --output=%o \ - |> %B.html +include_rules +: foreach *.md |> !pandoc |>