From bd48ecfcb1090b253af41faaff491b912eb61a60 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Fri, 24 Jan 2014 18:35:17 +0000 Subject: [PATCH] Generate the copyright.md file in the same way we generate readme.md Fixing #351 --- bld.cmd | 1 + bld.sh | 1 + licenses/copyright.md | 29 +++++++++++++++++++++++++++++ licenses/copyright.tid | 1 - 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 licenses/copyright.md delete mode 120000 licenses/copyright.tid diff --git a/bld.cmd b/bld.cmd index ba3c906c4..f674a09a2 100644 --- a/bld.cmd +++ b/bld.cmd @@ -38,6 +38,7 @@ node .\tiddlywiki.js ^ --savetiddler $:/favicon.ico %TW5_BUILD_OUTPUT%\favicon.ico ^ --rendertiddler ReadMe .\readme.md text/html ^ --rendertiddler ContributingTemplate .\contributing.md text/html ^ + --rendertiddler $:/core/copyright.txt .\licenses\copyright.md text/plain ^ --rendertiddler $:/editions/tw5.com/download-empty %TW5_BUILD_OUTPUT%\empty.html text/plain ^ --rendertiddler $:/editions/tw5.com/download-empty %TW5_BUILD_OUTPUT%\empty.hta text/plain ^ --savetiddler $:/green_favicon.ico %TW5_BUILD_OUTPUT%/static/favicon.ico ^ diff --git a/bld.sh b/bld.sh index b8426e142..827607f80 100755 --- a/bld.sh +++ b/bld.sh @@ -39,6 +39,7 @@ node ./tiddlywiki.js \ --savetiddler $:/favicon.ico $TW5_BUILD_OUTPUT/favicon.ico \ --rendertiddler ReadMe ./readme.md text/html \ --rendertiddler ContributingTemplate ./contributing.md text/html \ + --rendertiddler $:/core/copyright.txt ./licenses/copyright.md text/plain \ --rendertiddler $:/editions/tw5.com/download-empty $TW5_BUILD_OUTPUT/empty.html text/plain \ --rendertiddler $:/editions/tw5.com/download-empty $TW5_BUILD_OUTPUT/empty.hta text/plain \ --savetiddler $:/green_favicon.ico $TW5_BUILD_OUTPUT/static/favicon.ico \ diff --git a/licenses/copyright.md b/licenses/copyright.md new file mode 100644 index 000000000..ad16c78e5 --- /dev/null +++ b/licenses/copyright.md @@ -0,0 +1,29 @@ +TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com) + +Copyright © Jeremy Ruston 2004-2007 +Copyright © UnaMesa Association 2007-2014 + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +Redistributions in binary form must reproduce the above copyright notice, this +list of conditions and the following disclaimer in the documentation and/or other +materials provided with the distribution. + +Neither the name of the UnaMesa Association nor the names of its contributors may be +used to endorse or promote products derived from this software without specific +prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff --git a/licenses/copyright.tid b/licenses/copyright.tid deleted file mode 120000 index 40c58b5f2..000000000 --- a/licenses/copyright.tid +++ /dev/null @@ -1 +0,0 @@ -../core/copyright.tid \ No newline at end of file