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.4 by valya, Sun Mar 14 20:18:54 2010 UTC

# Line 12 | Line 12 | from distutils.errors import CCompilerEr
12   from distutils.errors import DistutilsPlatformError, DistutilsExecError
13   from distutils.core import Extension
14   from distutils.command.install import INSTALL_SCHEMES
15 + from subprocess import Popen, PIPE
16  
17   requirements = []
18   try:
# Line 72 | Line 73 | although they do result in significant s
73   c_ext = Feature(
74      "optional C extension",
75      standard=True,
76 <    ext_modules=[Extension('extensions.das_speed_utils',
76 >    ext_modules=[Extension('DAS.extensions.das_speed_utils',
77                             include_dirs=['extensions'],
78                             sources=['src/python/DAS/extensions/dict_handler.c'])])
79  
# Line 82 | Line 83 | if "--no_ext" in sys.argv:
83   else:
84      features = {"c-ext": c_ext}
85  
86 <
87 < version      = "1.0.0" # need to define it somehow
86 > proc1        = Popen(['cvs', 'status', '-v', 'setup.py'], stdout=PIPE)
87 > proc2        = Popen(['grep', 'revision'], stdin=proc1.stdout, stdout=PIPE)
88 > proc3        = Popen(['grep', '-v', 'Repository'], stdin=proc2.stdout, stdout=PIPE)
89 > proc4        = Popen(['grep', '-v', 'Working'], stdin=proc3.stdout, stdout=PIPE)
90 > proc5        = Popen(['head', '-1'], stdin=proc4.stdout, stdout=PIPE)
91 > version      = proc5.communicate()[0].split()[0]
92 > #version      = "1.0.0" # need to define it somehow
93   name         = "DAS"
94   description  = "CMS Data Aggregation System"
95   readme       ="""
# Line 95 | Line 101 | author_email = "vkuznet@gmail.com",
101   scriptfiles  = filter(os.path.isfile, ['etc/das.cfg'])
102   url          = "https://twiki.cern.ch/twiki/bin/viewauth/CMS/DMWMDataAggregationService",
103   keywords     = ["DAS", "Aggregation", "Meta-data"]
104 < 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'}
104 > package_dir  = {'DAS': 'src/python/DAS'}
105   package_data = {
106 <    'src': ['python/DAS/services/maps/*.yml'],
106 >    'src': ['python/DAS/services/maps/*.yml', 'python/DAS/web/css/*.css'],
107   }
108 < #data_files   = [
109 < #    ('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')
108 > #packages     = find_packages('src/python/DAS')
109 > packages     = find_packages('src/python/')
110   packages    += ['src/css', 'src/js', 'src/templates', 'etc', 'bin', 'test', 'doc']
111   license      = "CMS experiment software"
112   classifiers  = [

Diff Legend

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