Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/49404 )
Change subject: scons: Pull info.py generation out of SConscript and into
util.
......................................................................
scons: Pull info.py generation out of SConscript and into util.
Change-Id: I36e21901741a61673198011ce3889982e19f37f4
---
M src/SConscript
A util/bld/infopy.py
2 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/src/SConscript b/src/SConscript
index 521eaa2..a9a14e7 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -622,19 +622,14 @@
MakeAction(makeDefinesPyFile, Transform("DEFINES", 0)))
PySource('m5', 'python/m5/defines.py')
-# Generate python file containing info about the M5 source code
-def makeInfoPyFile(target, source, env):
- code = code_formatter()
- for src in source:
- with open(src.srcnode().abspath, 'r') as f:
- data = ''.join(f)
- code('$src = ${{repr(data)}}')
- code.write(str(target[0]))
-
# Generate a file that wraps the basic top level files
-env.Command('python/m5/info.py',
- [ '#/COPYING', '#/LICENSE', '#/README', ],
- MakeAction(makeInfoPyFile, Transform("INFO")))
+gem5py_env.Command('python/m5/info.py',
+ [ File('#/COPYING'), File('#/LICENSE'), File('#/README'),
+ "${GEM5PY}", "${INFOPY_PY}" ],
+ MakeAction('"${GEM5PY}" "${INFOPY_PY}" "${TARGET}" '
+ '${SOURCES[:-2]}',
+ Transform("INFO", 3)),
+ INFOPY_PY=util_bld.File('infopy.py'))
PySource('m5', 'python/m5/info.py')
########################################################################
diff --git a/util/bld/infopy.py b/util/bld/infopy.py
new file mode 100644
index 0000000..0edebbc
--- /dev/null
+++ b/util/bld/infopy.py
@@ -0,0 +1,58 @@
+# Copyright (c) 2018, 2020 ARM Limited
+#
+# The license below extends only to copyright in the software and shall
+# not be construed as granting a license to any other intellectual
+# property including but not limited to intellectual property relating
+# to a hardware implementation of the functionality of the software
+# licensed hereunder. You may use the software subject to the license
+# terms below provided that you ensure that this notice is replicated
+# unmodified and in its entirety in all distributions of the software,
+# modified or unmodified, in source code or in binary form.
+#
+# Copyright (c) 2004-2005 The Regents of The University of Michigan
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import os.path
+import sys
+
+from code_formatter import code_formatter
+
+if len(sys.argv) < 2:
+ print(f"Usage: {sys.argv[0]} INFO_PY [file]...", file=sys.stderr)
+ sys.exit(1)
+
+# Generate python file containing info about the gem5 source code.
+code = code_formatter()
+
+info_py = sys.argv[1]
+
+for source in sys.argv[2:]:
+ src = os.path.basename(source)
+ with open(source, 'r') as f:
+ data = ''.join(f)
+ code('${src} = ${{repr(data)}}')
+
+code.write(info_py)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49404
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: I36e21901741a61673198011ce3889982e19f37f4
Gerrit-Change-Number: 49404
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
