Merge branch 'coldtom/move-makemaker' into 'master'

Move makemaker plugin to bst-plugins-experimental

See merge request BuildStream/buildstream!1538

6 files changed, 3 insertions, 101 deletions

diff --git a/doc/source/core_plugins.rst b/doc/source/core_plugins.rst
index 2d612a11d..d34236eaf 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/makemaker
    elements/modulebuild
    elements/pip
 
diff --git a/src/buildstream/plugins/elements/makemaker.py b/src/buildstream/plugins/elements/makemaker.py
deleted file mode 100644
index 7da051592..000000000
--- a/src/buildstream/plugins/elements/makemaker.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 <http://www.gnu.org/licenses/>.
-#
-#  Authors:
-#        Tristan Van Berkom <tristan.vanberkom@codethink.co.uk>
-
-"""
-makemaker - Perl MakeMaker build element
-========================================
-A :mod:`BuildElement <buildstream.buildelement>` implementation for using
-the Perl ExtUtil::MakeMaker build system
-
-The MakeMaker default configuration:
-  .. literalinclude:: ../../../src/buildstream/plugins/elements/makemaker.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 'makemaker' kind.
-class MakeMakerElement(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 MakeMakerElement
diff --git a/src/buildstream/plugins/elements/makemaker.yaml b/src/buildstream/plugins/elements/makemaker.yaml
deleted file mode 100644
index c9c4622cb..000000000
--- a/src/buildstream/plugins/elements/makemaker.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Default configuration for the Perl ExtUtil::MakeMaker
-# build system 
-
-variables:
-
-  # To install perl distributions into the correct location
-  # in our chroot we need to set PREFIX to <destdir>/<prefix>
-  # 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 Makefile.PL PREFIX=%{install-root}%{prefix}
-
-  make: make
-  make-install: make install
-
-config:
-
-  # Commands for configuring the software
-  #
-  configure-commands:
-  - |
-    %{configure}
-
-  # 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}
diff --git a/tests/format/variables/defaults/project.conf b/tests/format/variables/defaults/project.conf
index 20295400f..3fed2612d 100644
--- a/tests/format/variables/defaults/project.conf
+++ b/tests/format/variables/defaults/project.conf
@@ -7,3 +7,4 @@ plugins:
   package-name: bst-plugins-experimental
   elements:
     cmake: 0
+    makemaker: 0
diff --git a/tests/format/variables/overrides/project.conf b/tests/format/variables/overrides/project.conf
index 66974e638..2b1f1422c 100644
--- a/tests/format/variables/overrides/project.conf
+++ b/tests/format/variables/overrides/project.conf
@@ -6,3 +6,4 @@ plugins:
   package-name: bst-plugins-experimental
   elements:
     cmake: 0
+    makemaker: 0
diff --git a/tox.ini b/tox.ini
index 678bd26e8..51ad87839 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@927c771f9c7327a3378f184c93f83395be355a61
+    git+https://gitlab.com/BuildStream/bst-plugins-experimental.git@9299a56d4739df3dd30b65632ec4ef74798ae2e5
 
     # Only require coverage and pytest-cov when using it
     !nocover: -rrequirements/cov-requirements.txt