From e77b511bf624e09aa5974b17fbfbd9685ea8cd7b Mon Sep 17 00:00:00 2001 From: Thomas Coldrick Date: Mon, 12 Aug 2019 08:16:14 +0100 Subject: Move modulebuild plugin to bst-plugins-experimental Continuing moving plugins over to bst-plugins-experimental. --- doc/source/core_plugins.rst | 1 - src/buildstream/plugins/elements/modulebuild.py | 51 ----------------------- src/buildstream/plugins/elements/modulebuild.yaml | 48 --------------------- tests/format/variables/defaults/project.conf | 1 + tests/format/variables/overrides/project.conf | 1 + tox.ini | 2 +- 6 files changed, 3 insertions(+), 101 deletions(-) delete mode 100644 src/buildstream/plugins/elements/modulebuild.py delete mode 100644 src/buildstream/plugins/elements/modulebuild.yaml diff --git a/doc/source/core_plugins.rst b/doc/source/core_plugins.rst index d34236eaf..2474f9053 100644 --- a/doc/source/core_plugins.rst +++ b/doc/source/core_plugins.rst @@ -34,7 +34,6 @@ Build elements elements/autotools elements/qmake elements/distutils - elements/modulebuild elements/pip diff --git a/src/buildstream/plugins/elements/modulebuild.py b/src/buildstream/plugins/elements/modulebuild.py deleted file mode 100644 index 63e3840dc..000000000 --- a/src/buildstream/plugins/elements/modulebuild.py +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2016 Codethink Limited -# -# 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 . -# -# Authors: -# Tristan Van Berkom - -""" -modulebuild - Perl Module::Build build element -============================================== -A :mod:`BuildElement ` implementation for using -the Perl Module::Build build system - -The modulebuild default configuration: - .. literalinclude:: ../../../src/buildstream/plugins/elements/modulebuild.yaml - :language: yaml - -See :ref:`built-in functionality documentation ` for -details on common configuration options for build elements. -""" - -from buildstream import BuildElement, SandboxFlags - - -# Element implementation for the 'modulebuild' kind. -class ModuleBuildElement(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 ModuleBuildElement diff --git a/src/buildstream/plugins/elements/modulebuild.yaml b/src/buildstream/plugins/elements/modulebuild.yaml deleted file mode 100644 index 18f034bab..000000000 --- a/src/buildstream/plugins/elements/modulebuild.yaml +++ /dev/null @@ -1,48 +0,0 @@ -# Default configuration for the Perl Module::Build -# build system. - -variables: - - # To install perl distributions into the correct location - # in our chroot we need to set PREFIX to / - # in the configure-commands. - # - # The mapping between PREFIX and the final installation - # directories is complex and depends upon the configuration - # of perl see, - # https://metacpan.org/pod/distribution/perl/INSTALL#Installation-Directories - # and ExtUtil::MakeMaker's documentation for more details. - configure: | - - perl Build.PL --prefix "%{install-root}%{prefix}" - - perl-build: ./Build - perl-install: ./Build install - -config: - - # Commands for configuring the software - # - configure-commands: - - | - %{configure} - - # Commands for building the software - # - build-commands: - - | - %{perl-build} - - # Commands for installing the software into a - # destination folder - # - install-commands: - - | - %{perl-install} - - # Commands for stripping debugging information out of - # installed binaries - # - strip-commands: - - | - %{strip-binaries} diff --git a/tests/format/variables/defaults/project.conf b/tests/format/variables/defaults/project.conf index 3fed2612d..9d38bfe78 100644 --- a/tests/format/variables/defaults/project.conf +++ b/tests/format/variables/defaults/project.conf @@ -8,3 +8,4 @@ plugins: elements: cmake: 0 makemaker: 0 + modulebuild: 0 diff --git a/tests/format/variables/overrides/project.conf b/tests/format/variables/overrides/project.conf index 2b1f1422c..476dff44c 100644 --- a/tests/format/variables/overrides/project.conf +++ b/tests/format/variables/overrides/project.conf @@ -7,3 +7,4 @@ plugins: elements: cmake: 0 makemaker: 0 + modulebuild: 0 diff --git a/tox.ini b/tox.ini index 51ad87839..150d176c5 100644 --- a/tox.ini +++ b/tox.ini @@ -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@9299a56d4739df3dd30b65632ec4ef74798ae2e5 + git+https://gitlab.com/BuildStream/bst-plugins-experimental.git@56bfe6af41469d5264bead5f7d78b24ead8faaf9 # Only require coverage and pytest-cov when using it !nocover: -rrequirements/cov-requirements.txt -- cgit v1.2.1