Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/48374 )
Change subject: scons: Turn gem5_scons.builders from a module into a
package.
......................................................................
scons: Turn gem5_scons.builders from a module into a package.
This will make it easier to organize when there are more builders in the
future.
Change-Id: I3db2f2c87b39ed0d427a2e505c7c9152e47ee58b
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/48374
Tested-by: kokoro <[email protected]>
Reviewed-by: Hoa Nguyen <[email protected]>
Maintainer: Bobby R. Bruce <[email protected]>
---
A site_scons/gem5_scons/builders/__init__.py
A site_scons/gem5_scons/builders/add_local_rpath.py
R site_scons/gem5_scons/builders/config_file.py
A site_scons/gem5_scons/builders/switching_headers.py
4 files changed, 174 insertions(+), 69 deletions(-)
Approvals:
Hoa Nguyen: Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
diff --git a/site_scons/gem5_scons/builders/__init__.py
b/site_scons/gem5_scons/builders/__init__.py
new file mode 100755
index 0000000..1130e42
--- /dev/null
+++ b/site_scons/gem5_scons/builders/__init__.py
@@ -0,0 +1,29 @@
+# Copyright Google, Inc.
+#
+# 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.
+
+
+from .add_local_rpath import AddLocalRPATH
+from .config_file import ConfigFile
+from .switching_headers import SwitchingHeaders
diff --git a/site_scons/gem5_scons/builders/add_local_rpath.py
b/site_scons/gem5_scons/builders/add_local_rpath.py
new file mode 100755
index 0000000..ce26575
--- /dev/null
+++ b/site_scons/gem5_scons/builders/add_local_rpath.py
@@ -0,0 +1,68 @@
+# Copyright (c) 2013, 2015-2020 ARM Limited
+# All rights reserved.
+#
+# 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) 2011 Advanced Micro Devices, Inc.
+# Copyright (c) 2009 The Hewlett-Packard Development Company
+# 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
+
+import SCons.Node.FS
+
+def AddLocalRPATH(env):
+ def add_local_rpath(env, *targets):
+ '''Set up an RPATH for a library which lives in the build
directory.
+
+ The construction environment variable BIN_RPATH_PREFIX should be
set
+ to the relative path of the build directory starting from the
location
+ of the binary.'''
+ for target in targets:
+ target = env.Entry(target)
+ if not isinstance(target, SCons.Node.FS.Dir):
+ target = target.dir
+ relpath = os.path.relpath(target.abspath, env['BUILDDIR'])
+ components = [
+ '\\$$ORIGIN',
+ '${BIN_RPATH_PREFIX}',
+ relpath
+ ]
+ env.Append(RPATH=[env.Literal(os.path.join(*components))])
+
+ if sys.platform != "darwin":
+ env.Append(LINKFLAGS=env.Split('-z origin'))
+
+ env.AddMethod(add_local_rpath, 'AddLocalRPATH')
diff --git a/site_scons/gem5_scons/builders.py
b/site_scons/gem5_scons/builders/config_file.py
similarity index 61%
rename from site_scons/gem5_scons/builders.py
rename to site_scons/gem5_scons/builders/config_file.py
index d0d86ae..458c731 100755
--- a/site_scons/gem5_scons/builders.py
+++ b/site_scons/gem5_scons/builders/config_file.py
@@ -38,17 +38,6 @@
# (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
-import sys
-
-from os.path import join, split
-
-# SCons includes
-import SCons
-import SCons.Node
-import SCons.Node.FS
-import SCons.Script
-
from gem5_scons import Transform, MakeAction
###################################################
@@ -91,61 +80,3 @@
config_builder = env.Builder(emitter=config_emitter,
action=config_action)
env.Append(BUILDERS = { 'ConfigFile' : config_builder })
-
-def AddLocalRPATH(env):
- def add_local_rpath(env, *targets):
- '''Set up an RPATH for a library which lives in the build
directory.
-
- The construction environment variable BIN_RPATH_PREFIX should be
set
- to the relative path of the build directory starting from the
location
- of the binary.'''
- for target in targets:
- target = env.Entry(target)
- if not isinstance(target, SCons.Node.FS.Dir):
- target = target.dir
- relpath = os.path.relpath(target.abspath, env['BUILDDIR'])
- components = [
- '\\$$ORIGIN',
- '${BIN_RPATH_PREFIX}',
- relpath
- ]
- env.Append(RPATH=[env.Literal(os.path.join(*components))])
-
- if sys.platform != "darwin":
- env.Append(LINKFLAGS=env.Split('-z origin'))
-
- env.AddMethod(add_local_rpath, 'AddLocalRPATH')
-
-###################################################
-#
-# This builder and wrapper method are used to set up a directory with
-# switching headers. Those are headers which are in a generic location and
-# that include more specific headers from a directory chosen at build time
-# based on the current build settings.
-#
-###################################################
-
-def SwitchingHeaders(env):
- def build_switching_header(target, source, env):
- path = str(target[0])
- subdir = str(source[0])
- dp, fp = os.path.split(path)
- dp = os.path.relpath(os.path.realpath(dp),
- os.path.realpath(env['BUILDDIR']))
- with open(path, 'w') as hdr:
- print('#include "%s/%s/%s"' % (dp, subdir, fp), file=hdr)
-
- switching_header_action = MakeAction(build_switching_header,
- Transform('GENERATE'))
-
- switching_header_builder = env.Builder(action=switching_header_action,
- source_factory=env.Value,
- single_source=True)
-
- env.Append(BUILDERS = { 'SwitchingHeader': switching_header_builder })
-
- def switching_headers(self, headers, source):
- for header in headers:
- self.SwitchingHeader(header, source)
-
- env.AddMethod(switching_headers, 'SwitchingHeaders')
diff --git a/site_scons/gem5_scons/builders/switching_headers.py
b/site_scons/gem5_scons/builders/switching_headers.py
new file mode 100755
index 0000000..881d568
--- /dev/null
+++ b/site_scons/gem5_scons/builders/switching_headers.py
@@ -0,0 +1,77 @@
+# Copyright (c) 2013, 2015-2020 ARM Limited
+# All rights reserved.
+#
+# 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) 2011 Advanced Micro Devices, Inc.
+# Copyright (c) 2009 The Hewlett-Packard Development Company
+# 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
+
+from gem5_scons import Transform, MakeAction
+
+###################################################
+#
+# This builder and wrapper method are used to set up a directory with
+# switching headers. Those are headers which are in a generic location and
+# that include more specific headers from a directory chosen at build time
+# based on the current build settings.
+#
+###################################################
+
+def SwitchingHeaders(env):
+ def build_switching_header(target, source, env):
+ path = str(target[0])
+ subdir = str(source[0])
+ dp, fp = os.path.split(path)
+ dp = os.path.relpath(os.path.realpath(dp),
+ os.path.realpath(env['BUILDDIR']))
+ with open(path, 'w') as hdr:
+ print('#include "%s/%s/%s"' % (dp, subdir, fp), file=hdr)
+
+ switching_header_action = MakeAction(build_switching_header,
+ Transform('GENERATE'))
+
+ switching_header_builder = env.Builder(action=switching_header_action,
+ source_factory=env.Value,
+ single_source=True)
+
+ env.Append(BUILDERS = { 'SwitchingHeader': switching_header_builder })
+
+ def switching_headers(self, headers, source):
+ for header in headers:
+ self.SwitchingHeader(header, source)
+
+ env.AddMethod(switching_headers, 'SwitchingHeaders')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/48374
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: I3db2f2c87b39ed0d427a2e505c7c9152e47ee58b
Gerrit-Change-Number: 48374
Gerrit-PatchSet: 12
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[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