From 26ff1f0eeb9a03ef25cded62211e12e6aa0b6ea9 Mon Sep 17 00:00:00 2001 From: richard Date: Fri, 16 Aug 2002 04:25:03 +0000 Subject: [PATCH] cleanup: moved templatebuilder into templates.builder git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@953 57a73879-2fb5-44c3-a270-3262357dd7e2 --- roundup/init.py | 9 ++++++--- .../{templatebuilder.py => templates/builder.py} | 5 ++++- roundup/templates/cpp_template | 16 ---------------- roundup/templates/header_template | 16 ---------------- setup.py | 7 +++++-- 5 files changed, 15 insertions(+), 38 deletions(-) rename roundup/{templatebuilder.py => templates/builder.py} (95%) delete mode 100644 roundup/templates/cpp_template delete mode 100644 roundup/templates/header_template diff --git a/roundup/init.py b/roundup/init.py index 9214fb6..7723aba 100644 --- a/roundup/init.py +++ b/roundup/init.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: init.py,v 1.20 2002-07-14 02:05:53 richard Exp $ +# $Id: init.py,v 1.21 2002-08-16 04:25:03 richard Exp $ __doc__ = """ Init (create) a roundup instance. @@ -87,14 +87,14 @@ def install(instance_home, template, backend): the template. ''' # first, copy the template dir over - import roundup.templatebuilder + from roundup.templates import builder template_dir = os.path.split(__file__)[0] template_name = template template = os.path.join(template_dir, 'templates', template) copytree(template, instance_home) - roundup.templatebuilder.installHtmlBase(template_name, instance_home) + builder.installHtmlBase(template_name, instance_home) # now select database db = '''# WARNING: DO NOT EDIT THIS FILE!!! @@ -114,6 +114,9 @@ def initialise(instance_home, adminpw): # # $Log: not supported by cvs2svn $ +# Revision 1.20 2002/07/14 02:05:53 richard +# . all storage-specific code (ie. backend) is now implemented by the backends +# # Revision 1.19 2002/05/23 01:14:20 richard # . split instance initialisation into two steps, allowing config changes # before the database is initialised. diff --git a/roundup/templatebuilder.py b/roundup/templates/builder.py similarity index 95% rename from roundup/templatebuilder.py rename to roundup/templates/builder.py index 79b1f1b..40e6eec 100644 --- a/roundup/templatebuilder.py +++ b/roundup/templates/builder.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: templatebuilder.py,v 1.14 2002-02-05 09:59:05 grubert Exp $ +# $Id: builder.py,v 1.1 2002-08-16 04:25:03 richard Exp $ import errno, re __doc__ = """ @@ -89,6 +89,9 @@ if __name__ == "__main__": # # $Log: not supported by cvs2svn $ +# Revision 1.14 2002/02/05 09:59:05 grubert +# . makeHtmlBase: re.sub under python 2.2 did not replace '.', string.replace does it. +# # Revision 1.13 2001/11/22 15:46:42 jhermann # Added module docstrings to all modules. # diff --git a/roundup/templates/cpp_template b/roundup/templates/cpp_template deleted file mode 100644 index 6afef5d..0000000 --- a/roundup/templates/cpp_template +++ /dev/null @@ -1,16 +0,0 @@ -/*************************************************************************** - |FILENAME| - description - ------------------- - begin : |DATE| - copyright : (C) |YEAR| by |AUTHOR| - email : |EMAIL| - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ diff --git a/roundup/templates/header_template b/roundup/templates/header_template deleted file mode 100644 index 6afef5d..0000000 --- a/roundup/templates/header_template +++ /dev/null @@ -1,16 +0,0 @@ -/*************************************************************************** - |FILENAME| - description - ------------------- - begin : |DATE| - copyright : (C) |YEAR| by |AUTHOR| - email : |EMAIL| - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ diff --git a/setup.py b/setup.py index e21a2ac..cf3e2e2 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: setup.py,v 1.35 2002-06-17 23:14:44 richard Exp $ +# $Id: setup.py,v 1.36 2002-08-16 04:25:01 richard Exp $ from distutils.core import setup, Extension from distutils.util import get_platform @@ -25,7 +25,7 @@ from distutils.command.build_scripts import build_scripts import sys, os, string from glob import glob -from roundup.templatebuilder import makeHtmlBase +from roundup.templates.builder import makeHtmlBase ############################################################################# @@ -189,6 +189,9 @@ if __name__ == '__main__': # # $Log: not supported by cvs2svn $ +# Revision 1.35 2002/06/17 23:14:44 richard +# . #569415 ] {version} +# # Revision 1.34 2002/05/29 01:16:16 richard # Sorry about this huge checkin! It's fixing a lot of related stuff in one go # though. -- 2.30.2