41c41,42
< # This SConscript is in charge of collecting .py files and generating a zip archive that is appended to the m5 binary.
---
> # This SConscript is in charge of collecting .py files and generating
> # a zip archive that is appended to the m5 binary.
43,46d43
< # Copy .py source files here (relative to src/python in the build
< # directory).
< pyzip_root = 'zip'
<
61c58
< pyzip_files.append(join(pyzip_root, pkgdir))
---
> pyzip_files.append(pkgdir)
73,76c70
< source = join(pkgdir, path, f)
< target = join(pyzip_root, source)
< pyzip_dep_files.append(target)
< env.CopyFile(target, source)
---
> pyzip_dep_files.append(join(pkgdir, path, f))
84,85c78
< print >>f, "import __main__"
< print >>f, "__main__.m5_build_env = ",
---
> print >>f, "m5_build_env = ",
90c83
< env.Command('defines.py', Value(optionDict), MakeDefinesPyFile)
---
> env.Command('m5/defines.py', Value(optionDict), MakeDefinesPyFile)
94c87
< pyzip_files.append('defines.py')
---
> pyzip_files.append('m5/defines.py')
96a90,96
> env.Command(['swig/main_wrap.cc', 'm5/main.py'],
> 'swig/main.i',
> '$SWIG $SWIGFLAGS -outdir ${TARGETS[1].dir} '
> '-o ${TARGETS[0]} $SOURCES')
>
> pyzip_dep_files.append('m5/main.py')
>