# HG changeset patch
# User Ali Saidi <[EMAIL PROTECTED]>
# Date 1212868517 14400
# Node ID 77d1b5e0c9e10b02da7ff6ace10f8d26a3b217c1
# Parent 4065e07a979e949db256b6afb0f57fbff659788f
HG: Add compiled hg revision and date to the standard M5 output.
diff --git a/src/SConscript b/src/SConscript
--- a/src/SConscript
+++ b/src/SConscript
@@ -332,6 +332,10 @@ env.Command('base/traceflags.cc', flags,
env.Command('base/traceflags.cc', flags, generate.traceFlagsCC)
Source('base/traceflags.cc')
+# Generate hginfo.cc
+env.Command('base/hginfo.cc',
+ Value(str(SCons.Node.FS.default_fs.SConstruct_dir)), generate.hgInfo)
+
# Build the zip file
py_compiled = []
py_zip_depends = []
@@ -364,11 +368,19 @@ envList = []
# date.cc.
def make_objs(sources, env):
objs = [env.Object(s) for s in sources]
+
# make date.cc depend on all other objects so it always gets
# recompiled whenever anything else does
date_obj = env.Object('base/date.cc')
+
+ # Make the generation of hginfo.cc dependend on all
+ # the other cc files and the # compiling of hginfo.cc
+ # dependent on all the objects but hginfo.o
+ hg_obj = env.Object('base/hginfo.cc')
+ env.Depends('base/hginfo.cc', sources)
env.Depends(date_obj, objs)
- objs.append(date_obj)
+ env.Depends(hg_obj, objs)
+ objs.extend([date_obj,hg_obj])
return objs
# Function to create a new build environment as clone of current
diff --git a/src/python/generate.py b/src/python/generate.py
--- a/src/python/generate.py
+++ b/src/python/generate.py
@@ -31,8 +31,7 @@ import sys
import sys
import zipfile
-from os.path import basename
-from os.path import exists
+from os.path import basename, exists, isdir, join
class DictImporter(object):
'''This importer takes a dictionary of arbitrary module names that
@@ -527,3 +526,35 @@ extern const Flags *compoundFlags[];
'''
f.close()
+
+ def hgInfo(self, target, source, env):
+ def gen_file(target, rev, node, date):
+ hg_stats = file(target, 'w')
+ print >>hg_stats, 'const char *hgRev = "%s:%s";' % (rev, node)
+ print >>hg_stats, 'const char *hgDate = "%s";' % date
+ hg_stats.close()
+
+ target = str(target[0])
+ scons_dir = eval(str(source[0]))
+ try:
+ import mercurial.demandimport, mercurial.hg, mercurial.ui
+ import mercurial.util, mercurial.node
+ if not exists(scons_dir) or not isdir(scons_dir) or \
+ not exists(join(scons_dir, ".hg")):
+ raise ValueError
+ repo = mercurial.hg.repository(mercurial.ui.ui(), scons_dir)
+ rev = mercurial.node.nullrev + repo.changelog.count()
+ changenode = repo.changelog.node(rev)
+ changes = repo.changelog.read(changenode)
+ date = mercurial.util.datestr(changes[2])
+
+ gen_file(target, rev, mercurial.node.hex(changenode), date)
+
+ mercurial.demandimport.disable()
+ except ImportError:
+ gen_file(target, "Unknown", "Unknown", "Unknown")
+
+ except:
+ print "in except"
+ gen_file(target, "Unknown", "Unknown", "Unknown")
+ mercurial.demandimport.disable()
diff --git a/src/python/m5/main.py b/src/python/m5/main.py
--- a/src/python/m5/main.py
+++ b/src/python/m5/main.py
@@ -268,6 +268,10 @@ def main():
print "M5 compiled %s" % internal.core.cvar.compileDate;
print "M5 started %s" % datetime.datetime.now().ctime()
print "M5 executing on %s" % socket.gethostname()
+
+ print "M5 revision %s" % internal.core.cvar.hgRev
+ print "M5 commit date %s" % internal.core.cvar.hgDate
+
print "command line:",
for argv in sys.argv:
print argv,
diff --git a/src/python/swig/core.i b/src/python/swig/core.i
--- a/src/python/swig/core.i
+++ b/src/python/swig/core.i
@@ -39,6 +39,8 @@
#include "sim/startup.hh"
extern const char *compileDate;
+extern const char *hgRev;
+extern const char *hgDate;
%}
%include "stdint.i"
@@ -51,6 +53,8 @@ void doExitCleanup();
void doExitCleanup();
char *compileDate;
+char *hgRev;
+char *hgDate;
void setClockFrequency(Tick ticksPerSecond);
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
