From 82df189bad55fcfc91cc305617bf65c4db9416b6 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Mon, 17 Jan 2005 23:41:35 -0500
Subject: Config cleanups
sim/pyconfig/m5config.py:
Remove unused code
remove the defined() function that was masking the one
that I really wanted
test/genini.py:
Add the directory that a script was executed from to the
path
--HG--
extra : convert_revision : a1861065b2de46d77c94691d0c5a7865cdce0f09
---
sim/pyconfig/m5config.py | 24 ------------------------
test/genini.py | 5 +++--
2 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/sim/pyconfig/m5config.py b/sim/pyconfig/m5config.py
index 39c2be7ab..d7c0c6507 100644
--- a/sim/pyconfig/m5config.py
+++ b/sim/pyconfig/m5config.py
@@ -46,30 +46,6 @@ class Singleton(type):
cls._instance = super(Singleton, cls).__call__(*args, **kwargs)
return cls._instance
-#class MetaTempObject(type):
-# classes = {}
-# def __new__(mcls, name, bases, dict):
-# _bases = []
-# for base in bases:
-# if base.__name__ is 'TempObject':
-# _bases.append('SimObject')
-# else:
-# _bases.append(base.__name__)
-# newdict = { '_bases' : _bases, '_name' : name, '_params' : dict }
-# cls = type.__new__(mcls, name, bases, newdict)
-# mcls.classes[name] = cls
-# return cls
-#
-#class TempObject(object):
-# __metaclass__ = MetaTempObject
-
-def defined(s):
- try:
- eval(s)
- return True
- except NameError:
- return False
-
if os.environ.has_key('FULL_SYSTEM'):
FULL_SYSTEM = True
diff --git a/test/genini.py b/test/genini.py
index bad173365..e96d7069c 100644
--- a/test/genini.py
+++ b/test/genini.py
@@ -25,13 +25,13 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-import getopt, os, sys
+import getopt, os, os.path, sys
sys.path.append('..')
sys.path.append('../configs/kernel')
sys.path.append('../sim/pyconfig')
-from importer import mpy_exec
+from importer import mpy_exec, AddToPath
from m5config import *
try:
@@ -50,6 +50,7 @@ except getopt.GetoptError:
sys.exit('Improper Usage')
for arg in args:
+ AddToPath(os.path.dirname(arg))
mpy_exec(file(arg, 'r'), globals())
if globals().has_key('root') and isinstance(root, type) \
--
cgit v1.2.3