diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2005-03-08 22:07:26 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2005-03-08 22:07:26 -0500 |
| commit | 689f6d1b02f788ecd2a44ff4ca010acc38d14954 (patch) | |
| tree | 99a5144a8f4d07f3f368c41390102e8f0da99927 /sim | |
| parent | 550e6a5010602049b9be426ba41939ee7167ccd9 (diff) | |
| download | gem5-689f6d1b02f788ecd2a44ff4ca010acc38d14954.tar.xz | |
Split the string importer from the rest of the mpy parsing
and importing stuff to avoid some confusion.
sim/pyconfig/SConscript:
Split the string importer from the rest of the importer code.
The importer.py code can be embedded like m5config.py
sim/pyconfig/m5config.py:
import what we need from importer
--HG--
extra : convert_revision : 9d57f43381b55e717b5b10adfb8f0a522280ac57
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/pyconfig/SConscript | 6 | ||||
| -rw-r--r-- | sim/pyconfig/m5config.py | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sim/pyconfig/SConscript b/sim/pyconfig/SConscript index 9154d3b99..c8671b50f 100644 --- a/sim/pyconfig/SConscript +++ b/sim/pyconfig/SConscript @@ -170,7 +170,7 @@ EmbedMap %(name)s("%(fname)s", /* namespace */ } ''' -embedded_py_files = ['m5config.py', '../../util/pbs/jobfile.py'] +embedded_py_files = ['m5config.py', 'importer.py', '../../util/pbs/jobfile.py'] objpath = os.path.join(env['SRCDIR'], 'objects') for root, dirs, files in os.walk(objpath, topdown=True): for i,dir in enumerate(dirs): @@ -184,7 +184,7 @@ for root, dirs, files in os.walk(objpath, topdown=True): embedded_py_files.append(os.path.join(root, f)) embedfile_hh = os.path.join(env['SRCDIR'], 'base/embedfile.hh') -env.Depends('embedded_py.cc', embedfile_hh) env.Command('embedded_py.py', embedded_py_files, MakeEmbeddedPyFile) -env.Command('embedded_py.cc', ['importer.py', 'embedded_py.py'], +env.Depends('embedded_py.cc', embedfile_hh) +env.Command('embedded_py.cc', ['string_importer.py', 'embedded_py.py'], MakePythonCFile) diff --git a/sim/pyconfig/m5config.py b/sim/pyconfig/m5config.py index 7b1719dfa..f7bc90061 100644 --- a/sim/pyconfig/m5config.py +++ b/sim/pyconfig/m5config.py @@ -26,6 +26,9 @@ from __future__ import generators import os, re, sys, types, inspect + +from importer import AddToPath, LoadMpyFile + noDot = False try: import pydot |