X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=setup.py;h=64176b8785e2f45bdcd5189854319d9019e65fc0;hb=b720a9e098b96974558c3ad1538bec76b60bff90;hp=7c64ffe210a57f2475b7fa46387f3a61cede159a;hpb=e0682d7cfa374ce2f417ddcf0e652f030fb5dcd0;p=roundup.git

diff --git a/setup.py b/setup.py
index 7c64ffe..64176b8 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.34 2002-05-29 01:16:16 richard Exp $
+# $Id: setup.py,v 1.40 2002-10-17 00:22:16 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
 
 
 #############################################################################
@@ -85,11 +85,11 @@ class build_scripts_create(build_scripts):
             try:
                 if sys.platform == "win32":
                     file.write('@echo off\n'
-                        'if NOT "%%_4ver%%" == "" %(python)s -c "from %(package)s.scripts.%(module)s import run; run()" %%$\n'
-                        'if     "%%_4ver%%" == "" %(python)s -c "from %(package)s.scripts.%(module)s import run; run()" %%*\n'
+                        'if NOT "%%_4ver%%" == "" "%(python)s" -O -c "from %(package)s.scripts.%(module)s import run; run()" %%$\n'
+                        'if     "%%_4ver%%" == "" "%(python)s" -O -c "from %(package)s.scripts.%(module)s import run; run()" %%*\n'
                         % script_vars)
                 else:
-                    file.write('#! %(python)s\n'
+                    file.write('#! %(python)s -O\n'
                         'from %(package)s.scripts.%(module)s import run\n'
                         'run()\n'
                         % script_vars)
@@ -140,6 +140,10 @@ if __name__ == '__main__':
         glob(os.path.join('roundup', 'templates', '*'))))
     packagelist = [
         'roundup',
+        'roundup.cgi',
+        'roundup.cgi.PageTemplates',
+        'roundup.cgi.TAL',
+        'roundup.cgi.ZTUtils',
         'roundup.backends',
         'roundup.scripts',
         'roundup.templates'
@@ -167,9 +171,10 @@ if __name__ == '__main__':
         )
 
     # perform the setup action
+    from roundup import __version__
     setup(
         name = "roundup", 
-        version = "0.4.1",
+        version = __version__,
         description = "Roundup issue tracking system.",
         author = "Richard Jones",
         author_email = "richard@users.sourceforge.net",
@@ -185,108 +190,4 @@ if __name__ == '__main__':
         data_files =  installdatafiles
     )
 
-
-#
-# $Log: not supported by cvs2svn $
-# Revision 1.33  2002/04/03 05:53:03  richard
-# Didn't get around to committing these after the last release.
-#
-# Revision 1.32  2002/03/27 23:47:58  jhermann
-# Fix for scripts running under CMD.EXE
-#
-# Revision 1.31  2002/03/22 18:36:00  jhermann
-# chmod +x for scripts
-#
-# Revision 1.30  2002/01/29 20:07:15  jhermann
-# Conversion to generated script stubs
-#
-# Revision 1.29  2002/01/23 06:05:36  richard
-# prep work for release
-#
-# Revision 1.28  2002/01/11 03:24:15  richard
-# minor changes for 0.4.0b2
-#
-# Revision 1.27  2002/01/05 02:09:46  richard
-# make setup abort if tests fail
-#
-# Revision 1.26  2001/12/08 07:06:20  jhermann
-# Install html template files to share/roundup/templates
-#
-# Revision 1.25  2001/11/21 23:42:54  richard
-# Some version number and documentation fixes.
-#
-# Revision 1.24  2001/11/06 22:32:15  jhermann
-# Install roundup.cgi to share/roundup
-#
-# Revision 1.23  2001/10/17 06:04:00  richard
-# Beginnings of an interactive mode for roundup-admin
-#
-# Revision 1.22  2001/10/11 05:01:28  richard
-# Prep for pre-release #2
-#
-# Revision 1.21  2001/10/10 04:18:38  richard
-# Getting ready for a preview release for 0.3.0.
-#
-# Revision 1.20  2001/10/08 21:49:30  richard
-# Minor pre- 0.3.0 changes
-#
-# Revision 1.19  2001/09/10 09:48:35  richard
-# Started changes log for 0.2.9
-#
-# Revision 1.18  2001/08/30 06:01:17  richard
-# Fixed missing import in mailgw :(
-#
-# Revision 1.17  2001/08/08 03:29:35  richard
-# Next release is 0.2.6
-#
-# Revision 1.16  2001/08/07 00:24:42  richard
-# stupid typo
-#
-# Revision 1.15  2001/08/07 00:15:51  richard
-# Added the copyright/license notice to (nearly) all files at request of
-# Bizar Software.
-#
-# Revision 1.14  2001/08/06 23:57:20  richard
-# Am now bundling unittest with the package so that everyone can use the unit
-# tests.
-#
-# Revision 1.13  2001/08/03 07:18:57  richard
-# updated version number for 0.2.6
-#
-# Revision 1.12  2001/08/03 02:51:06  richard
-# detect unit tests
-#
-# Revision 1.11  2001/08/03 01:54:58  richard
-# Started stuff off for the 0.2.5 release
-#
-# Revision 1.10  2001/07/30 07:17:44  richard
-# Just making sure we've got the right version in there for development.
-#
-# Revision 1.9  2001/07/29 23:34:26  richard
-# Added unit tests so they're run whenever we package/install/whatever.
-#
-# Revision 1.8  2001/07/29 09:43:46  richard
-# Make sure that the htmlbase is up-to-date when we build a source dist.
-#
-# Revision 1.7  2001/07/29 08:37:58  richard
-# changes
-#
-# Revision 1.6  2001/07/29 07:01:39  richard
-# Added vim command to all source so that we don't get no steenkin' tabs :)
-#
-# Revision 1.5  2001/07/28 00:39:18  richard
-# changes for the 0.2.1 distribution build.
-#
-# Revision 1.4  2001/07/27 07:20:17  richard
-# Makefile is now obsolete - setup does what it used to do.
-#
-# Revision 1.3  2001/07/27 06:56:25  richard
-# Added scripts to the setup and added the config so the default script
-# install dir is /usr/local/bin.
-#
-# Revision 1.2  2001/07/26 07:14:27  richard
-# Made setup.py executable, added id and log.
-#
-#
-#
 # vim: set filetype=python ts=4 sw=4 et si