Move license text to a plain text file without ReST market

5 files changed, 60 insertions, 61 deletions

diff --git a/doc/license.rst b/doc/license.rst
deleted file mode 100644
index bd33743f2..000000000
--- a/doc/license.rst
+++ /dev/null
@@ -1,56 +0,0 @@
-
-.. _license:
-.. highlight:: none
-
-License
-========================================
-
-Botan (http://botan.randombit.net/) is distributed under these terms::
-
-  Copyright (C) 1999-2013,2014 Jack Lloyd
-                2001 Peter J Jones
-                2004-2007 Justin Karneges
-                2004 Vaclav Ovsik
-                2005 Matthew Gregan
-                2005-2006 Matt Johnston
-                2006 Luca Piccarreta
-                2007 Yves Jerschow
-                2007-2008 FlexSecure GmbH
-                2007-2008 Technische Universitat Darmstadt
-                2007-2008,2010,2014 Falko Strenzke
-                2007-2008 Martin Doering
-                2007 Manuel Hartl
-                2007 Christoph Ludwig
-                2007 Patrick Sona
-                2008 Copyright Projet SECRET, INRIA, Rocquencourt
-                2008 Bhaskar Biswas and Nicolas Sendrier
-                2008 Google Inc.
-                2010 Olivier de Gaalon
-                2012 Vojtech Kral
-                2012-2014 Markus Wanner
-                2013 Joel Low
-                2014 cryptosource GmbH
-                2014 Andrew Moon
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions, and the following disclaimer.
-
-  2. 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.
-
-  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 HOLDER 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/doc/license.txt b/doc/license.txt
new file mode 100644
index 000000000..02dcb0b6f
--- /dev/null
+++ b/doc/license.txt
@@ -0,0 +1,47 @@
+Copyright (C) 1999-2013,2014,2015 Jack Lloyd
+              2001 Peter J Jones
+              2004-2007 Justin Karneges
+              2004 Vaclav Ovsik
+              2005 Matthew Gregan
+              2005-2006 Matt Johnston
+              2006 Luca Piccarreta
+              2007 Yves Jerschow
+              2007-2008 FlexSecure GmbH
+              2007-2008 Technische Universitat Darmstadt
+              2007-2008,2010,2014 Falko Strenzke
+              2007-2008 Martin Doering
+              2007 Manuel Hartl
+              2007 Christoph Ludwig
+              2007 Patrick Sona
+              2008 Copyright Projet SECRET, INRIA, Rocquencourt
+              2008 Bhaskar Biswas and Nicolas Sendrier
+              2008 Google Inc.
+              2010 Olivier de Gaalon
+              2012 Vojtech Kral
+              2012-2014 Markus Wanner
+              2013 Joel Low
+              2014 cryptosource GmbH
+              2014 Andrew Moon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions, and the following disclaimer.
+
+2. 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.
+
+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 HOLDER 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/doc/website/license.rst b/doc/website/license.rst
new file mode 100644
index 000000000..d07a34e9a
--- /dev/null
+++ b/doc/website/license.rst
@@ -0,0 +1,8 @@
+
+.. _license:
+.. highlight:: none
+
+License
+========================================
+
+.. literalinclude:: license.txt
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 75ea3d508..f934dfca4 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -66,9 +66,9 @@ install: $(LIBRARIES) docs
 website:
 	rm -rf $(WEBSITE_SRC_DIR) $(WEBSITE_DIR)
 	mkdir -p $(WEBSITE_SRC_DIR)
-	cp -r %{doc_dir}/*.rst %{doc_dir}/relnotes %{doc_dir}/website/*.rst $(WEBSITE_SRC_DIR)
-	sphinx-build -q -c $(SPHINX_CONFIG) -b html $(WEBSITE_SRC_DIR) $(WEBSITE_DIR)
-	sphinx-build -q -c $(SPHINX_CONFIG) -b html %{doc_dir}/manual $(WEBSITE_DIR)/manual
+	cp -r %{doc_dir}/*.txt %{doc_dir}/*.rst %{doc_dir}/relnotes %{doc_dir}/website/*.rst $(WEBSITE_SRC_DIR)
+	sphinx-build -c $(SPHINX_CONFIG) -b html $(WEBSITE_SRC_DIR) $(WEBSITE_DIR)
+	sphinx-build -c $(SPHINX_CONFIG) -b html %{doc_dir}/manual $(WEBSITE_DIR)/manual
 	rm -rf $(WEBSITE_DIR)/.doctrees
 	rm -rf $(WEBSITE_DIR)/manual/.doctrees
 	rm -f $(WEBSITE_DIR)/.buildinfo
diff --git a/src/scripts/install.py b/src/scripts/install.py
index 70718bd22..8e19ed91c 100755
--- a/src/scripts/install.py
+++ b/src/scripts/install.py
@@ -198,8 +198,8 @@ def main(args = None):
     shutil.rmtree(botan_doc_dir, True)
     shutil.copytree(cfg['doc_output_dir'], botan_doc_dir)
 
-    with open(os.path.join(botan_doc_dir, 'license.txt'), 'w+') as lic:
-        lic.write(license_text('doc/license.rst'))
+    for f in [f for f in os.listdir(cfg['doc_dir']) if f.endswith('.txt')]:
+        shutil.copyfile(os.path.join(cfg['doc_dir'], f), os.path.join(botan_doc_dir, f))
 
     with combine_relnotes.open_for_utf8(os.path.join(botan_doc_dir, 'news.txt'), 'w+') as news:
         news.write(combine_relnotes.combine_relnotes('doc/relnotes', False))