summaryrefslogtreecommitdiff
path: root/src/python/SConscript
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2010-09-12 15:41:34 -0700
committerNathan Binkert <nate@binkert.org>2010-09-12 15:41:34 -0700
commit2edfcbbaee87c1a28351fc0dcd81d52d0d9102a4 (patch)
tree3436d2dad1d98f200566e719add526b135ae0e08 /src/python/SConscript
parentafafaf1dcbab1fac3e3ba2f87dd5138d3ec08588 (diff)
downloadgem5-2edfcbbaee87c1a28351fc0dcd81d52d0d9102a4.tar.xz
swig: make all generated files go into the m5.internal package
This is necessary because versions of swig older than 1.3.39 fail to do the right thing and try to do relative imports for everything (even with the package= option to %module). Instead of putting params in the m5.internal.params package, put params in the m5.internal package and make all param modules start with param_. Same thing for m5.internal.enums. Also, stop importing all generated params into m5.objects. They are not necessary and now with everything using relative imports we wound up with pollution of the namespace (where builtin-range got overridden). --HG-- rename : src/python/m5/internal/enums/__init__.py => src/python/m5/internal/enums.py rename : src/python/m5/internal/params/__init__.py => src/python/m5/internal/params.py
Diffstat (limited to 'src/python/SConscript')
-rw-r--r--src/python/SConscript6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/python/SConscript b/src/python/SConscript
index d995d0091..8109e945d 100644
--- a/src/python/SConscript
+++ b/src/python/SConscript
@@ -50,7 +50,6 @@ PySource('m5', 'm5/stats.py')
PySource('m5', 'm5/ticks.py')
PySource('m5', 'm5/trace.py')
PySource('m5.objects', 'm5/objects/__init__.py')
-PySource('m5.objects', 'm5/objects/params.py')
PySource('m5.util', 'm5/util/__init__.py')
PySource('m5.util', 'm5/util/attrdict.py')
PySource('m5.util', 'm5/util/code_formatter.py')
@@ -70,6 +69,5 @@ SwigSource('m5.internal', 'swig/range.i')
SwigSource('m5.internal', 'swig/stats.i')
SwigSource('m5.internal', 'swig/trace.i')
PySource('m5.internal', 'm5/internal/__init__.py')
-PySource('m5.internal.enums', 'm5/internal/enums/__init__.py')
-PySource('m5.internal.params', 'm5/internal/params/__init__.py')
-PySource('m5.internal.swig', 'm5/internal/swig/__init__.py')
+PySource('m5.internal', 'm5/internal/enums.py')
+PySource('m5.internal', 'm5/internal/params.py')