diff options
-rw-r--r-- | doc/source/core_plugins.rst | 1 | ||||
-rw-r--r-- | src/buildstream/plugins/elements/make.py | 56 | ||||
-rw-r--r-- | src/buildstream/plugins/elements/make.yaml | 42 | ||||
-rw-r--r-- | tests/integration/project/project.conf | 1 | ||||
-rw-r--r-- | tox.ini | 2 |
5 files changed, 2 insertions, 100 deletions
diff --git a/doc/source/core_plugins.rst b/doc/source/core_plugins.rst index b56e24feb..2d612a11d 100644 --- a/doc/source/core_plugins.rst +++ b/doc/source/core_plugins.rst @@ -31,7 +31,6 @@ Build elements :maxdepth: 1 elements/manual - elements/make elements/autotools elements/qmake elements/distutils diff --git a/src/buildstream/plugins/elements/make.py b/src/buildstream/plugins/elements/make.py deleted file mode 100644 index 67a261100..000000000 --- a/src/buildstream/plugins/elements/make.py +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright Bloomberg Finance LP -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library. If not, see <http://www.gnu.org/licenses/>. -# -# Authors: -# Ed Baunton <ebaunton1@bloomberg.net> - -""" -make - Make build element -========================= -This is a :mod:`BuildElement <buildstream.buildelement>` implementation for -using GNU make based build. - -.. note:: - - The ``make`` element is available since :ref:`format version 9 <project_format_version>` - -Here is the default configuration for the ``make`` element in full: - - .. literalinclude:: ../../../src/buildstream/plugins/elements/make.yaml - :language: yaml - -See :ref:`built-in functionality documentation <core_buildelement_builtins>` for -details on common configuration options for build elements. -""" - -from buildstream import BuildElement, SandboxFlags - - -# Element implementation for the 'make' kind. -class MakeElement(BuildElement): - # Supports virtual directories (required for remote execution) - BST_VIRTUAL_DIRECTORY = True - - # Enable command batching across prepare() and assemble() - def configure_sandbox(self, sandbox): - super().configure_sandbox(sandbox) - self.batch_prepare_assemble(SandboxFlags.ROOT_READ_ONLY, - collect=self.get_variable('install-root')) - - -# Plugin entry point -def setup(): - return MakeElement diff --git a/src/buildstream/plugins/elements/make.yaml b/src/buildstream/plugins/elements/make.yaml deleted file mode 100644 index 83e5c658f..000000000 --- a/src/buildstream/plugins/elements/make.yaml +++ /dev/null @@ -1,42 +0,0 @@ -# make default configurations - -variables: - make: make PREFIX="%{prefix}" - make-install: make -j1 PREFIX="%{prefix}" DESTDIR="%{install-root}" install - - # Set this if the sources cannot handle parallelization. - # - # notparallel: True - -config: - - # Commands for building the software - # - build-commands: - - | - %{make} - - # Commands for installing the software into a - # destination folder - # - install-commands: - - | - %{make-install} - - # Commands for stripping debugging information out of - # installed binaries - # - strip-commands: - - | - %{strip-binaries} - -# Use max-jobs CPUs for building and enable verbosity -environment: - MAKEFLAGS: -j%{max-jobs} - V: 1 - -# And dont consider MAKEFLAGS or V as something which may -# affect build output. -environment-nocache: -- MAKEFLAGS -- V diff --git a/tests/integration/project/project.conf b/tests/integration/project/project.conf index 797cb9556..635c73a7f 100644 --- a/tests/integration/project/project.conf +++ b/tests/integration/project/project.conf @@ -26,3 +26,4 @@ plugins: package-name: bst-plugins-experimental elements: cmake: 0 + make: 0 @@ -30,7 +30,7 @@ deps = py{35,36,37}: -rrequirements/requirements.txt py{35,36,37}: -rrequirements/dev-requirements.txt py{35,36,37}: -rrequirements/plugin-requirements.txt - git+https://gitlab.com/BuildStream/bst-plugins-experimental.git@f51bec2b85dc42c7fc0521061a9653ac886e7acb + git+https://gitlab.com/BuildStream/bst-plugins-experimental.git@927c771f9c7327a3378f184c93f83395be355a61 # Only require coverage and pytest-cov when using it !nocover: -rrequirements/cov-requirements.txt |