diff options
| -rw-r--r-- | SetupConfig.py | 1 | ||||
| -rw-r--r-- | SetupTools.py | 33 | ||||
| -rw-r--r-- | docs/users_guide_src/Makefile | 2 | ||||
| -rw-r--r-- | src/SettingsManager.py | 10 |
4 files changed, 22 insertions, 24 deletions
diff --git a/SetupConfig.py b/SetupConfig.py index 1d401ed..d28ddc3 100644 --- a/SetupConfig.py +++ b/SetupConfig.py @@ -11,7 +11,6 @@ packages = ['Cheetah', 'Cheetah.Tools', 'Cheetah.Utils', ] - package_dir = {'Cheetah':'src'} import os diff --git a/SetupTools.py b/SetupTools.py index 65afbd3..698a530 100644 --- a/SetupTools.py +++ b/SetupTools.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# $Id: SetupTools.py,v 1.2 2001/10/10 06:59:45 tavis_rudd Exp $ +# $Id: SetupTools.py,v 1.3 2001/11/25 19:53:57 tavis_rudd Exp $ """Some tools for extending and working with distutils CREDITS: This module borrows code and ideas from M.A. Lemburg's excellent setup @@ -8,7 +8,7 @@ tools for the mxBase package. """ __author__ = "Tavis Rudd <tavis@calrudd.com>" -__version__ = "$Revision: 1.2 $"[11:-2] +__version__ = "$Revision: 1.3 $"[11:-2] ################################################## @@ -22,6 +22,7 @@ False = (1==0) from distutils.core import setup from distutils.core import Command +from distutils.command.install import install from distutils.command.install_data import install_data from distutils.command.sdist import sdist @@ -39,23 +40,19 @@ from src.FileUtils import findFiles ################################################## ## CLASSES ## - + class mod_install_data(install_data): - """A copy of M.A Lemburg's modified version of the disutils install_data - command that allows data files to be included directly in the installed - Python package tree. - - Note that it expects that data_files argument to the disutils.setup() - commmand to be a list of strings rather than a list of tuples as is the - default. Each of these string entries can be a real file name or a glob - pattern representing the files to match.""" + """A modified version of the disutils install_data command that allows data + files to be included directly in the installed Python package tree. + """ def finalize_options(self): if self.install_dir is None: installobj = self.distribution.get_command_obj('install') - self.install_dir = installobj.install_platlib + #self.install_dir = installobj.install_platlib + self.install_dir = installobj.install_lib install_data.finalize_options(self) def run (self): @@ -288,15 +285,17 @@ def run_setup(configurations): types.ListType, types.TupleType, types.DictType, + types.IntType, ): del kws[name] # Add setup extensions - cmdclasses = {'install_data': mod_install_data, - 'uninstall':uninstall, - 'contrib':contrib, - 'sdist_docs':sdist_docs, - } + cmdclasses = { + 'install_data': mod_install_data, + 'uninstall':uninstall, + 'contrib':contrib, + 'sdist_docs':sdist_docs, + } kws['cmdclass'] = cmdclasses diff --git a/docs/users_guide_src/Makefile b/docs/users_guide_src/Makefile index 12bbbae..cea229a 100644 --- a/docs/users_guide_src/Makefile +++ b/docs/users_guide_src/Makefile @@ -1,5 +1,5 @@ # You must change PYTHONSRC to the path of your Python source distributon. -PYTHONSRC=/home/iron/nobackup/PYTHON/Python-2.2b1 +PYTHONSRC=/home/tavis/tmp/Python-2.2b1 DOCNAME=users_guide MKHOWTO=$(PYTHONSRC)/Doc/tools/mkhowto MAIN_TEX_FILE= users_guide.tex diff --git a/src/SettingsManager.py b/src/SettingsManager.py index 795af47..821e6ea 100644 --- a/src/SettingsManager.py +++ b/src/SettingsManager.py @@ -1,16 +1,16 @@ #!/usr/bin/env python -# $Id: SettingsManager.py,v 1.13 2001/10/10 06:47:41 tavis_rudd Exp $ +# $Id: SettingsManager.py,v 1.14 2001/11/25 19:54:25 tavis_rudd Exp $ """Provides a mixin/base class for managing application settings Meta-Data ========== Author: Tavis Rudd <tavis@calrudd.com> -Version: $Revision: 1.13 $ +Version: $Revision: 1.14 $ Start Date: 2001/05/30 -Last Revision Date: $Date: 2001/10/10 06:47:41 $ +Last Revision Date: $Date: 2001/11/25 19:54:25 $ """ __author__ = "Tavis Rudd <tavis@calrudd.com>" -__version__ = "$Revision: 1.13 $"[11:-2] +__version__ = "$Revision: 1.14 $"[11:-2] ################################################## @@ -325,7 +325,7 @@ class SettingsManager: def normalizePath(self, path): """A hook for any neccessary path manipulations. - For example, when this is used with Webware servlets all relative paths + For example, when this is used with WebKit servlets all relative paths must be converted so they are relative to the servlet's directory rather than relative to the program's current working dir. |