Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/49393 )
16 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
Change subject: scons,python: Move the marshal.py script into build_tools.
......................................................................
scons,python: Move the marshal.py script into build_tools.
It's really a part of the build system and not part of gem5, and so it
should probably live outside of the main tree. It would be confusing to
have a bunch of python scripts which don't end up inside gem5 alongside
a bunch of ones that do in src/python.
The directory is called build_tools instead of build so it doesn't get
confused with an actual build output directory.
Change-Id: Ie12475a15517508dc2044f0ca4db71a601b7ab6d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49393
Tested-by: kokoro <[email protected]>
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
R build_tools/marshal.py
M src/SConscript
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/marshal.py b/build_tools/marshal.py
similarity index 100%
rename from src/python/marshal.py
rename to build_tools/marshal.py
diff --git a/src/SConscript b/src/SConscript
index e1ee8a4..d5786a8 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -77,11 +77,13 @@
class Source(SourceFile):
pass
+build_tools = Dir('#build_tools')
+
# Build a small helper that marshals the Python code using the same version
# of Python as gem5. This is in an unorthodox location to avoid building it
# for every variant.
gem5py = gem5py_env.Program('gem5py', 'python/gem5py.cc')[0]
-marshal_py = Dir('python').File('marshal.py')
+marshal_py = build_tools.File('marshal.py')
# Embed python files. All .py files that have been indicated by a
# PySource() call in a SConscript need to be embedded into the M5
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49393
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ie12475a15517508dc2044f0ca4db71a601b7ab6d
Gerrit-Change-Number: 49393
Gerrit-PatchSet: 18
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
