ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/DAS/setup.py
(Generate patch)

Comparing COMP/DAS/setup.py (file contents):
Revision 1.2 by valya, Sat Feb 6 01:42:54 2010 UTC vs.
Revision 1.7 by valya, Fri Apr 2 14:43:52 2010 UTC

# Line 13 | Line 13 | from distutils.errors import DistutilsPl
13   from distutils.core import Extension
14   from distutils.command.install import INSTALL_SCHEMES
15  
16 + sys.path.append(os.path.join(os.getcwd(), 'src/python'))
17 + from DAS import version as das_version
18 +
19   requirements = []
20   try:
21      import xml.etree.cElementTree
# Line 72 | Line 75 | although they do result in significant s
75   c_ext = Feature(
76      "optional C extension",
77      standard=True,
78 <    ext_modules=[Extension('extensions.das_speed_utils',
78 >    ext_modules=[Extension('DAS.extensions.das_speed_utils',
79                             include_dirs=['extensions'],
80                             sources=['src/python/DAS/extensions/dict_handler.c'])])
81  
# Line 82 | Line 85 | if "--no_ext" in sys.argv:
85   else:
86      features = {"c-ext": c_ext}
87  
88 <
86 < version      = "1.0.0" # need to define it somehow
88 > version      = das_version
89   name         = "DAS"
90   description  = "CMS Data Aggregation System"
91   readme       ="""
# Line 95 | Line 97 | author_email = "vkuznet@gmail.com",
97   scriptfiles  = filter(os.path.isfile, ['etc/das.cfg'])
98   url          = "https://twiki.cern.ch/twiki/bin/viewauth/CMS/DMWMDataAggregationService",
99   keywords     = ["DAS", "Aggregation", "Meta-data"]
100 < package_dir  = {'DAS': 'src/python/DAS',
99 <               'core': 'src/python/DAS/core',
100 <               'extensions': 'src/python/DAS/extensions',
101 <               'services': 'src/python/DAS/services',
102 <               'tools': 'src/python/DAS/tools',
103 <               'utils': 'src/python/DAS/utils',
104 <               'web': 'src/python/DAS/web'}
100 > package_dir  = {'DAS': 'src/python/DAS'}
101   package_data = {
102 <    'src': ['python/DAS/services/maps/*.yml'],
102 >    'src': ['python/DAS/services/maps/*.yml', 'python/DAS/web/css/*.css'],
103   }
104 < #data_files   = [
105 < #    ('src/js', ['src/js/ajax_utils.js', 'src/js/prototype.js', 'src/js/utils.js']),
110 < #    ('css', ['src/css/*.css']),
111 < #    ('templates', ['src/templates/*.tmpl']),
112 < #]
113 < packages     = find_packages('src/python/DAS')
104 > #packages     = find_packages('src/python/DAS')
105 > packages     = find_packages('src/python/')
106   packages    += ['src/css', 'src/js', 'src/templates', 'etc', 'bin', 'test', 'doc']
107   license      = "CMS experiment software"
108   classifiers  = [

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines