[Avida-cvs] [avida3-svn] r41 - in trunk: . support/third-party/scons support/utils
kaben@myxo.css.msu.edu
kaben at myxo.css.msu.edu
Sat Apr 8 16:48:20 PDT 2006
Author: kaben
Date: 2006-04-08 19:48:20 -0400 (Sat, 08 Apr 2006)
New Revision: 41
Modified:
trunk/BuildAvida.sh
trunk/support/third-party/scons/scons.py
trunk/support/third-party/scons/sconsign.py
trunk/support/utils/PysteTool.py
Log:
Updated for recent version of scons.
Modified: trunk/BuildAvida.sh
===================================================================
--- trunk/BuildAvida.sh 2006-01-30 20:15:14 UTC (rev 40)
+++ trunk/BuildAvida.sh 2006-04-08 23:48:20 UTC (rev 41)
@@ -29,6 +29,8 @@
import os
import sys
+import pdb
+
# Unless user has asked for silence or help, print a short help message
# offering more help if needed.
if '-h' not in sys.argv \
@@ -47,7 +49,7 @@
sys.path.append(scons_abs_dir)
# Tell Python where to find the SCons library.
-scons_rel_lib_dir = 'support/third-party/scons/scons-local-0.96.90'
+scons_rel_lib_dir = 'support/third-party/scons/scons-local-0.96.91'
scons_abs_lib_dir = os.path.join(sys.path[0], scons_rel_lib_dir)
os.environ["SCONS_LIB_DIR"] = scons_abs_lib_dir
Modified: trunk/support/third-party/scons/scons.py
===================================================================
--- trunk/support/third-party/scons/scons.py 2006-01-30 20:15:14 UTC (rev 40)
+++ trunk/support/third-party/scons/scons.py 2006-04-08 23:48:20 UTC (rev 41)
@@ -24,15 +24,15 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "/home/scons/scons/branch.0/branch.96/baseline/src/script/scons.py 0.96.90.D001 2005/02/15 20:11:37 knight"
+__revision__ = "/home/scons/scons/branch.0/branch.96/baseline/src/script/scons.py 0.96.91.D001 2005/09/08 09:14:36 knight"
-__version__ = "0.96.90"
+__version__ = "0.96.91"
__build__ = "D001"
-__buildsys__ = "casablanca"
+__buildsys__ = "roxbury"
-__date__ = "2005/02/15 20:11:37"
+__date__ = "2005/09/08 09:14:36"
__developer__ = "knight"
Modified: trunk/support/third-party/scons/sconsign.py
===================================================================
--- trunk/support/third-party/scons/sconsign.py 2006-01-30 20:15:14 UTC (rev 40)
+++ trunk/support/third-party/scons/sconsign.py 2006-04-08 23:48:20 UTC (rev 41)
@@ -24,15 +24,15 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "/home/scons/scons/branch.0/branch.96/baseline/src/script/sconsign.py 0.96.90.D001 2005/02/15 20:11:37 knight"
+__revision__ = "/home/scons/scons/branch.0/branch.96/baseline/src/script/sconsign.py 0.96.91.D001 2005/09/08 09:14:36 knight"
-__version__ = "0.96.90"
+__version__ = "0.96.91"
__build__ = "D001"
-__buildsys__ = "casablanca"
+__buildsys__ = "roxbury"
-__date__ = "2005/02/15 20:11:37"
+__date__ = "2005/09/08 09:14:36"
__developer__ = "knight"
@@ -201,6 +201,7 @@
Print_Flags = Flagger()
Verbose = 0
Readable = 0
+Raw = 0
def default_mapper(entry, name):
try:
@@ -241,23 +242,44 @@
'implicit' : 'bkids',
}
-def printfield(name, entry):
- def field(name, verbose=Verbose, entry=entry):
- if not Print_Flags[name]:
- return None
- fieldname = map_name.get(name, name)
- mapper = map_field.get(fieldname, default_mapper)
- val = mapper(entry, name)
- if verbose:
- val = name + ": " + val
- return val
+def field(name, entry, verbose=Verbose):
+ if not Print_Flags[name]:
+ return None
+ fieldname = map_name.get(name, name)
+ mapper = map_field.get(fieldname, default_mapper)
+ val = mapper(entry, name)
+ if verbose:
+ val = name + ": " + val
+ return val
- fieldlist = ["timestamp", "bsig", "csig"]
- outlist = [name+":"] + filter(None, map(field, fieldlist))
- sep = Verbose and "\n " or " "
- print string.join(outlist, sep)
+def nodeinfo_raw(name, ninfo, prefix=""):
+ # This does essentially what the pprint module does,
+ # except that it sorts the keys for deterministic output.
+ d = ninfo.__dict__
+ keys = d.keys()
+ keys.sort()
+ l = []
+ for k in keys:
+ l.append('%s: %s' % (repr(k), repr(d[k])))
+ return name + ': {' + string.join(l, ', ') + '}'
- outlist = field("implicit", 0)
+def nodeinfo_string(name, ninfo, prefix=""):
+ fieldlist = ["bsig", "csig", "timestamp", "size"]
+ f = lambda x, ni=ninfo, v=Verbose: field(x, ni, v)
+ outlist = [name+":"] + filter(None, map(f, fieldlist))
+ if Verbose:
+ sep = "\n " + prefix
+ else:
+ sep = " "
+ return string.join(outlist, sep)
+
+def printfield(name, entry, prefix=""):
+ if Raw:
+ print nodeinfo_raw(name, entry.ninfo, prefix)
+ else:
+ print nodeinfo_string(name, entry.ninfo, prefix)
+
+ outlist = field("implicit", entry, 0)
if outlist:
if Verbose:
print " implicit:"
@@ -273,8 +295,10 @@
else:
printfield(name, entry)
else:
- for name, e in entries.items():
- printfield(name, e)
+ names = entries.keys()
+ names.sort()
+ for name in names:
+ printfield(name, entries[name])
class Do_SConsignDB:
def __init__(self, dbm_name, dbm):
@@ -362,14 +386,17 @@
-h, --help Print this message and exit.
-i, --implicit Print implicit dependency information.
-r, --readable Print timestamps in human-readable form.
+ --raw Print raw Python object representations.
+ -s, --size Print file sizes.
-t, --timestamp Print timestamp information.
-v, --verbose Verbose, describe each field.
"""
-opts, args = getopt.getopt(sys.argv[1:], "bcd:e:f:hirtv",
+opts, args = getopt.getopt(sys.argv[1:], "bcd:e:f:hirstv",
['bsig', 'csig', 'dir=', 'entry=',
'format=', 'help', 'implicit',
- 'readable', 'timestamp', 'verbose'])
+ 'raw', 'readable',
+ 'size', 'timestamp', 'verbose'])
for o, a in opts:
@@ -400,8 +427,12 @@
sys.exit(0)
elif o in ('-i', '--implicit'):
Print_Flags['implicit'] = 1
+ elif o in ('--raw',):
+ Raw = 1
elif o in ('-r', '--readable'):
Readable = 1
+ elif o in ('-s', '--size'):
+ Print_Flags['size'] = 1
elif o in ('-t', '--timestamp'):
Print_Flags['timestamp'] = 1
elif o in ('-v', '--verbose'):
Modified: trunk/support/utils/PysteTool.py
===================================================================
--- trunk/support/utils/PysteTool.py 2006-01-30 20:15:14 UTC (rev 40)
+++ trunk/support/utils/PysteTool.py 2006-04-08 23:48:20 UTC (rev 41)
@@ -366,7 +366,6 @@
'.pyste',
],
path_function = SCons.Scanner.FindPathDirs(
- 'CPPPATH',
SCons.Node.FS.default_fs
),
recursive = True
More information about the Avida-cvs
mailing list