summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve Reinhardt <steve.reinhardt@amd.com>2009-11-08 17:35:49 -0800
committerSteve Reinhardt <steve.reinhardt@amd.com>2009-11-08 17:35:49 -0800
commit374d337693a53c7c7096b55537b20980a29a3e74 (patch)
treeb7ecee75bf196aa9c584cdcedccb1f60960483d6 /src
parent8a4af3668dd8c45de4b98f3eb1fb2ef28bd369a2 (diff)
downloadgem5-374d337693a53c7c7096b55537b20980a29a3e74.tar.xz
scons: deal with generated .py files properly
Diffstat (limited to 'src')
-rw-r--r--src/SConscript14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/SConscript b/src/SConscript
index 35753ce4c..d02d2a6e7 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -132,15 +132,15 @@ class PySource(SourceFile):
modpath = '.'.join(modpath)
arcpath = path + [ self.basename ]
- debugname = self.snode.abspath
- if not exists(debugname):
- debugname = self.tnode.abspath
+ abspath = self.snode.abspath
+ if not exists(abspath):
+ abspath = self.tnode.abspath
self.package = package
self.modname = modname
self.modpath = modpath
self.arcname = joinpath(*arcpath)
- self.debugname = debugname
+ self.abspath = abspath
self.compiled = File(self.filename + 'c')
self.assembly = File(self.filename + '.s')
self.symname = "PyEMB_" + PySource.invalid_sym_char.sub('_', modpath)
@@ -339,9 +339,9 @@ class DictImporter(object):
source = self.modules[fullname]
if source.modname == '__init__':
mod.__path__ = source.modpath
- mod.__file__ = source.snode.abspath
+ mod.__file__ = source.abspath
- exec file(source.snode.abspath, 'r') in mod.__dict__
+ exec file(source.abspath, 'r') in mod.__dict__
return mod
@@ -892,7 +892,7 @@ def objectifyPyFile(target, source, env):
dst = file(str(target[0]), 'w')
pysource = PySource.tnodes[source[0]]
- compiled = compile(src, pysource.debugname, 'exec')
+ compiled = compile(src, pysource.abspath, 'exec')
marshalled = marshal.dumps(compiled)
compressed = zlib.compress(marshalled)
data = compressed