From 917c4404e560174b6e60be84eb20558c1c6d73c6 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Tue, 24 Jun 2014 10:39:45 +0100 Subject: [PATCH] Update batch files to use build system --- bld.cmd | 17 +++-------------- bld.sh | 17 +++-------------- editions/tw5.com/tiddlywiki.info | 3 ++- 3 files changed, 8 insertions(+), 29 deletions(-) diff --git a/bld.cmd b/bld.cmd index 4ec48e7f2..01f71807f 100644 --- a/bld.cmd +++ b/bld.cmd @@ -35,19 +35,9 @@ node .\tiddlywiki.js ^ .\editions\tw5.com ^ --verbose ^ --output . ^ - --rendertiddler ReadMe .\readme.md text/html ^ - --rendertiddler ContributingTemplate .\contributing.md text/html ^ - --rendertiddler $:/core/copyright.txt .\licenses\copyright.md text/plain ^ + --build readmes ^ --output %TW5_BUILD_OUTPUT% ^ - --rendertiddler $:/core/save/all index.html text/plain ^ - --savetiddler $:/favicon.ico favicon.ico ^ - --rendertiddler $:/editions/tw5.com/download-empty empty.html text/plain ^ - --rendertiddler $:/editions/tw5.com/download-empty empty.hta text/plain ^ - --savetiddler $:/green_favicon.ico %TW5_BUILD_OUTPUT%/static/favicon.ico ^ - --rendertiddler $:/core/templates/static.template.html static.html text/plain ^ - --rendertiddler $:/core/templates/alltiddlers.template.html alltiddlers.html text/plain ^ - --rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html static text/plain ^ - --rendertiddler $:/core/templates/static.template.css static\static.css text/plain ^ + --build favicon empty static index ^ || exit 1 rem encrypted.html: a version of the main file encrypted with the password "password" @@ -56,8 +46,7 @@ node .\tiddlywiki.js ^ .\editions\tw5.com ^ --verbose ^ --output %TW5_BUILD_OUTPUT% ^ - --password password ^ - --rendertiddler $:/core/save/all encrypted.html text/plain ^ + --build encrypted ^ || exit 1 rem tahoelafs.html: empty wiki with plugin for Tahoe-LAFS diff --git a/bld.sh b/bld.sh index e90ca436e..f77eb6345 100755 --- a/bld.sh +++ b/bld.sh @@ -36,19 +36,9 @@ node ./tiddlywiki.js \ ./editions/tw5.com \ --verbose \ --output . \ - --rendertiddler ReadMe ./readme.md text/html \ - --rendertiddler ContributingTemplate ./contributing.md text/html \ - --rendertiddler $:/core/copyright.txt ./licenses/copyright.md text/plain \ + --build readmes \ --output $TW5_BUILD_OUTPUT \ - --rendertiddler $:/core/save/all index.html text/plain \ - --savetiddler $:/favicon.ico favicon.ico \ - --rendertiddler $:/editions/tw5.com/download-empty empty.html text/plain \ - --rendertiddler $:/editions/tw5.com/download-empty empty.hta text/plain \ - --savetiddler $:/green_favicon.ico static/favicon.ico \ - --rendertiddler $:/core/templates/static.template.html static.html text/plain \ - --rendertiddler $:/core/templates/alltiddlers.template.html alltiddlers.html text/plain \ - --rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html static text/plain \ - --rendertiddler $:/core/templates/static.template.css static/static.css text/plain \ + --build favicon empty static index \ || exit 1 # encrypted.html: a version of the main file encrypted with the password "password" @@ -57,8 +47,7 @@ node ./tiddlywiki.js \ ./editions/tw5.com \ --verbose \ --output $TW5_BUILD_OUTPUT \ - --password password \ - --rendertiddler $:/core/save/all encrypted.html text/plain \ + --build encrypted \ || exit 1 # tahoelafs.html: empty wiki with plugin for Tahoe-LAFS diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info index f04dd08fd..0144f233d 100644 --- a/editions/tw5.com/tiddlywiki.info +++ b/editions/tw5.com/tiddlywiki.info @@ -43,7 +43,8 @@ "readmes": [ "--rendertiddler","ReadMe","readme.md","text/html", "--rendertiddler","ContributingTemplate","contributing.md","text/html", - "--rendertiddler","$:/core/copyright.txt","licenses/copyright.md","text/plain", + "--rendertiddler","$:/core/copyright.txt","licenses/copyright.md","text/plain"], + "tw2": [ "--rendertiddler","TiddlyWiki2ReadMe","tw2/readme.md","text/html"], "empty": [ "--rendertiddler","$:/editions/tw5.com/download-empty","empty.html","text/plain",