diff --git a/Makefile b/Makefile index e7abaeb..6ed5118 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,7 @@ BUILDTYPES+=cmake BUILDTYPES+=configure BUILDTYPES+=jb BUILDTYPES+=make +BUILDTYPES+=meson BUILDTYPES+=perl-module BUILDTYPES+=perl-module-makemaker BUILDTYPES+=python-module diff --git a/buildtypes/meson.sh.in b/buildtypes/meson.sh.in new file mode 100644 index 0000000..84bd354 --- /dev/null +++ b/buildtypes/meson.sh.in @@ -0,0 +1,55 @@ +# +# bee magic for meson +# +# Copyright (C) 2017 +# Paul Menzel +# and other bee developers +# +# This file is part of bee. +# +# bee is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +: ${BEE_BUILDTYPE_MESON_MESONBUILD:=${S}/meson.build} + +if [ ! -r "${BEE_BUILDTYPE_MESON_MESONBUILD}" ] ; then + return +fi + +BEE_BUILDTYPE_DETECTED=meson + +BEE_BUILDTYPE_MESON_SOURCEDIR=${BEE_BUILDTYPE_MESON_MESONBUILD%/*} + +#### bee_configure() ########################################################## + +bee_configure() { + start_cmd meson \ + --prefix ${PREFIX} \ + --buildtype=plain \ + "${@}" \ + ${S} +} + +#### bee_build() ############################################################## + +bee_build() { + start_cmd ninja -v -C ${B} ${BEE_MAKEFLAGS} "${@}" +} + +#### bee_install() ############################################################ + +bee_install() { + DESTDIR=${D} start_cmd ninja -C ${B} install "${@}" +} + diff --git a/src/beesh.sh.in b/src/beesh.sh.in index c419363..0cca9b0 100644 --- a/src/beesh.sh.in +++ b/src/beesh.sh.in @@ -1032,6 +1032,7 @@ bee_run patch "${bee_PATCHFILES[@]}" bee_buildmagic=( $("${BEE_BINDIR}/beeuniq" "${BEE_BUILDTYPE[@]}" \ cmake \ + meson \ autotools \ autogen \ perl-module \