Rework the way SCons recurses into subdirectories, making it

automatic.  The point is that now a subdirectory can be added
to the build process just by creating a SConscript file in it.
The process has two passes.  On the first pass, all subdirs
of the root of the tree are searched for SConsopts files.
These files contain any command line options that ought to be
added for a particular subdirectory.  On the second pass,
all subdirs of the src directory are searched for SConscript
files.  These files describe how to build any given subdirectory.
I have added a Source() function.  Any file (relative to the
directory in which the SConscript resides) passed to that
function is added to the build.  Clean up everything to take
advantage of Source().
function is added to the list of files to be built.

--HG--
extra : convert_revision : 103f6b490d2eb224436688c89cdc015211c4fd30

1 files changed, 9 insertions, 4 deletions

diff --git a/src/python/SConscript b/src/python/SConscript
index 94db1a747..6662c8a45 100644
--- a/src/python/SConscript
+++ b/src/python/SConscript
@@ -29,14 +29,14 @@
 # Authors: Steve Reinhardt
 #          Nathan Binkert
 
-import os, os.path, re, sys
-from zipfile import PyZipFile
+import os
+import zipfile
 
 # handy function for path joins
 def join(*args):
     return os.path.normpath(os.path.join(*args))
 
-Import('env')
+Import('*')
 
 # This SConscript is in charge of collecting .py files and generating
 # a zip archive that is appended to the m5 binary.
@@ -106,6 +106,11 @@ def swig_it(module):
                 '$SWIG $SWIGFLAGS -outdir ${TARGETS[1].dir} '
                 '-o ${TARGETS[0]} $SOURCES')
     swig_modules.append(module)
+    Source('swig/%s_wrap.cc' % module)
+
+Source('swig/init.cc')
+Source('swig/pyevent.cc')
+Source('swig/pyobject.cc')
 
 swig_it('core')
 swig_it('debug')
@@ -144,7 +149,7 @@ env.Command('swig/init.cc', swig_cc_files, MakeSwigInit)
 # Action function to build the zip archive.  Uses the PyZipFile module
 # included in the standard Python library.
 def buildPyZip(target, source, env):
-    pzf = PyZipFile(str(target[0]), 'w')
+    pzf = zipfile.PyZipFile(str(target[0]), 'w')
     for s in source:
         pzf.writepy(str(s))