Permalink
Browse files

made the install work with or without the WebwareExp package

  • Loading branch information...
1 parent c402f35 commit 4f9d4b674f5e89ff81d8c606bb27ea17518fde83 tavis_rudd committed Mar 2, 2002
Showing with 33 additions and 11 deletions.
  1. +2 −1 SetupConfig.py
  2. +16 −5 setup.py
  3. +15 −5 src/_properties.py
View
@@ -11,6 +11,7 @@
'Cheetah.Tools',
'Cheetah.Utils',
]
+extra_path = 'Webware'
package_dir = {'Cheetah':'src'}
import os
@@ -30,7 +31,7 @@
## Data Files and Scripts
scripts = ['bin/cheetah-compile',
]
-data_files = ['recursive: src *.tmpl *.txt LICENSE README',
+data_files = ['recursive: src *.tmpl *.txt LICENSE README TODO CHANGES',
]
## GET THE DESCRIPTION AND CREATE THE README
View
@@ -1,10 +1,21 @@
#!/usr/bin/env python
-# $Id: setup.py,v 1.10 2001/10/10 06:59:45 tavis_rudd Exp $
+# $Id: setup.py,v 1.11 2002/03/02 20:26:17 tavis_rudd Exp $
-import SetupTools
-import SetupConfig
-configurations = (SetupConfig,)
-SetupTools.run_setup( configurations )
+try: # see if WebwareExp's Setup procedure can be used
+ from src._properties import Version, Description
+ long_description = open('README').read()
+ settings= {'name': 'Cheetah',
+ 'version':Version,
+ 'long_description':long_description,
+ 'description':Description,
+ }
+ from Webware.Setup import SetupManager
+ SetupManager(searchPath=['.'],settings=settings)
+except ImportError:
+ import SetupTools
+ import SetupConfig
+ configurations = (SetupConfig,)
+ SetupTools.run_setup( configurations )
View
@@ -9,16 +9,21 @@
Url = "http://www.CheetahTemplate.org/"
Packages = ['%(PackageName)s',
- '%(PackageName)s.Bin',
'%(PackageName)s.HelpDesk',
'%(PackageName)s.HelpDesk.Docs',
'%(PackageName)s.HelpDesk.Examples',
'%(PackageName)s.Templates',
- '%(PackageName)s.Test',
+ '%(PackageName)s.Tests',
'%(PackageName)s.Tools',
'%(PackageName)s.Utils',
]
-Scripts = ['%(PackageDir)s/Bin/cheetah-compile',
+PackageDir = 'src'
+PackageToDirMap = {'%(PackageName)s':'%(PackageDir)s',
+ '%(PackageName)s.HelpDesk.Docs':'docs',
+ '%(PackageName)s.HelpDesk.Examples':'examples',
+ }
+
+Scripts = ['bin/cheetah-compile',
]
try:
@@ -27,10 +32,15 @@ class ComponentClass(_Component):
def _finalizeSettings(self):
_Component._finalizeSettings(self)
import os
+ import os.path
from distutils.core import Extension
+ ## we only assume the presence of a c compiler on Posix systems, NT people will
+ # have to enable this manually.
if os.name == 'posix':
- extModules=[Extension("%(PackageName)s/_namemapper" % self.settings(),
- ["%(PackageDir)s/_namemapper.c" % self.settings()]
+ extModules=[Extension("%(PackageName)s._namemapper" % self.settings(),
+ [os.path.join("%(PackageDir)s" ,"_namemapper.c")
+ % self.settings()
+ ]
)
]
else:

0 comments on commit 4f9d4b6

Please sign in to comment.