From c141db5ea000479c116fca7d6d6090aff2b0324d Mon Sep 17 00:00:00 2001 From: Thomas Coldrick Date: Mon, 12 Aug 2019 10:33:42 +0100 Subject: Move qmake plugin to bst-plugins-experimental --- doc/source/core_plugins.rst | 1 - src/buildstream/plugins/elements/qmake.py | 51 --------------------------- src/buildstream/plugins/elements/qmake.yaml | 50 -------------------------- tests/format/variables/defaults/project.conf | 1 + tests/format/variables/overrides/project.conf | 1 + tox.ini | 2 +- 6 files changed, 3 insertions(+), 103 deletions(-) delete mode 100644 src/buildstream/plugins/elements/qmake.py delete mode 100644 src/buildstream/plugins/elements/qmake.yaml diff --git a/doc/source/core_plugins.rst b/doc/source/core_plugins.rst index 2474f9053..f69602479 100644 --- a/doc/source/core_plugins.rst +++ b/doc/source/core_plugins.rst @@ -32,7 +32,6 @@ Build elements elements/manual elements/autotools - elements/qmake elements/distutils elements/pip diff --git a/src/buildstream/plugins/elements/qmake.py b/src/buildstream/plugins/elements/qmake.py deleted file mode 100644 index 56a0e641e..000000000 --- a/src/buildstream/plugins/elements/qmake.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 - -""" -qmake - QMake build element -=========================== -A :mod:`BuildElement ` implementation for using -the qmake build system - -The qmake default configuration: - .. literalinclude:: ../../../src/buildstream/plugins/elements/qmake.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 'qmake' kind. -class QMakeElement(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 QMakeElement diff --git a/src/buildstream/plugins/elements/qmake.yaml b/src/buildstream/plugins/elements/qmake.yaml deleted file mode 100644 index 4ac31932e..000000000 --- a/src/buildstream/plugins/elements/qmake.yaml +++ /dev/null @@ -1,50 +0,0 @@ -# QMake default configuration - -variables: - - qmake: qmake -makefile %{conf-root} - make: make - make-install: make -j1 INSTALL_ROOT="%{install-root}" install - - # Set this if the sources cannot handle parallelization. - # - # notparallel: True - -config: - - # Commands for configuring the software - # - configure-commands: - - | - %{qmake} - - # 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/format/variables/defaults/project.conf b/tests/format/variables/defaults/project.conf index 9d38bfe78..9cf530d7c 100644 --- a/tests/format/variables/defaults/project.conf +++ b/tests/format/variables/defaults/project.conf @@ -9,3 +9,4 @@ plugins: cmake: 0 makemaker: 0 modulebuild: 0 + qmake: 0 diff --git a/tests/format/variables/overrides/project.conf b/tests/format/variables/overrides/project.conf index 476dff44c..9d4331e72 100644 --- a/tests/format/variables/overrides/project.conf +++ b/tests/format/variables/overrides/project.conf @@ -8,3 +8,4 @@ plugins: cmake: 0 makemaker: 0 modulebuild: 0 + qmake: 0 diff --git a/tox.ini b/tox.ini index 150d176c5..c6bcd78ad 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@56bfe6af41469d5264bead5f7d78b24ead8faaf9 + git+https://gitlab.com/BuildStream/bst-plugins-experimental.git@effd6be61b6ed5983694da7496adf872d81eddcc # Only require coverage and pytest-cov when using it !nocover: -rrequirements/cov-requirements.txt -- cgit v1.2.1