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.4 by valya, Sun Mar 14 20:18:54 2010 UTC vs.
Revision 1.6 by valya, Fri Apr 2 14:01:29 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
15 >
16 > from DAS import version as das_version
17  
18   requirements = []
19   try:
# Line 83 | Line 84 | if "--no_ext" in sys.argv:
84   else:
85      features = {"c-ext": c_ext}
86  
87 < 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
87 > version      = das_version
88   name         = "DAS"
89   description  = "CMS Data Aggregation System"
90   readme       ="""

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines