changeset 483e936f44f0 in /z/repo/m5 details: http://repo.m5sim.org/m5?cmd=changeset;node=483e936f44f0 description: scons: rename some things from m5 to gem5
The default generated binary is now gem5.<type> instead of m5.<type>. The latter does still work but gem5.<type> will be generated first and then m5.<type> will be hard linked to it. diffstat: src/SConscript | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diffs (56 lines): diff -r c1a07ecb6619 -r 483e936f44f0 src/SConscript --- a/src/SConscript Thu Jun 02 17:36:07 2011 -0700 +++ b/src/SConscript Thu Jun 02 17:36:18 2011 -0700 @@ -41,7 +41,7 @@ import SCons -# This file defines how to build a particular configuration of M5 +# This file defines how to build a particular configuration of gem5 # based on variable settings in the 'env' build environment. Import('*') @@ -61,8 +61,8 @@ # get specifies a set of filters, only files that match those filters # will be accepted (unspecified filters on files are assumed to be # false). Current filters are: -# main -- specifies the m5 main() function -# skip_lib -- do not put this file into the m5 library +# main -- specifies the gem5 main() function +# skip_lib -- do not put this file into the gem5 library # <unittest> -- unit tests use filters based on the unit test name # # A parent can now be specified for a source file and default filter @@ -298,7 +298,7 @@ env.Append(CPPPATH=Dir(extra_dir)) # Workaround for bug in SCons version > 0.97d20071212 -# Scons bug id: 2006 M5 Bug id: 308 +# Scons bug id: 2006 gem5 Bug id: 308 for root, dirs, files in os.walk(base_dir, topdown=True): Dir(root[len(base_dir) + 1:]) @@ -866,8 +866,9 @@ def makeEnv(label, objsfx, strip = False, **kwargs): # SCons doesn't know to append a library suffix when there is a '.' in the # name. Use '_' instead. - libname = 'm5_' + label - exename = 'm5.' + label + libname = 'gem5_' + label + exename = 'gem5.' + label + secondary_exename = 'm5.' + label new_env = env.Clone(OBJSUFFIX=objsfx, SHOBJSUFFIX=objsfx + 's') new_env.Label = label @@ -943,7 +944,10 @@ cmd = 'strip $SOURCE -o $TARGET' targets = new_env.Command(exename, progname, MakeAction(cmd, Transform("STRIP"))) - + + new_env.Command(secondary_exename, exename, + MakeAction('ln $SOURCE $TARGET', Transform("HARDLINK"))) + new_env.M5Binary = targets[0] envList.append(new_env) _______________________________________________ gem5-dev mailing list gem5-dev@m5sim.org http://m5sim.org/mailman/listinfo/gem5-dev