Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d118b42ff69be63e8e46b512782c293e50416399)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d118b42ff69be63e8e46b512782c293e50416399)
  • Date: Thu, 28 Jul 2022 18:54:19 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 1 +
MESON_FUNCTIONS | 18 ++++++++++--------
2 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit d118b42ff69be63e8e46b512782c293e50416399
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Refactor meson_install()

diff --git a/ChangeLog b/ChangeLog
index fc26104..180a573 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2022-07-28 Vlad Glagolev <stealth AT sourcemage.org>
* security/uacme: new spell, ACMEv2 client written in plain C with
minimal dependencies
+ * MESON_FUNCTIONS: refactor meson_install()

2022-07-23 Pavel Vinogradov <public AT sourcemage.org>
* MESON_FUNCTIONS: modified default muon options to make it run at
least,
diff --git a/MESON_FUNCTIONS b/MESON_FUNCTIONS
index d8e8167..f055429 100755
--- a/MESON_FUNCTIONS
+++ b/MESON_FUNCTIONS
@@ -38,20 +38,22 @@ meson_build () {
}

meson_install () {
- local BUILDER &&
- local BUILDER_OPTS="-j ${MAKE_NJOBS} -C builddir/" &&
+ local MESON_INSTALL &&
+ local MESON_OPTS &&

- if ! is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL}
NINJA-BUILD); then
- BUILDER="muon samu"
- elif [[ $(get_spell_provider ${SPELL} NINJA-BUILD) == samurai ]]; then
- BUILDER="samu"
+ if [[ $(get_spell_provider ${SPELL} MESON-BUILD) == muon ]]; then
+ MESON_INSTALL="muon"
+
+ MESON_OPTS="-C builddir/ install"
else
- BUILDER="ninja"
+ MESON_INSTALL="meson"
+
+ MESON_OPTS="install -C builddir/ --no-rebuild"
fi &&

cd "${SOURCE_DIRECTORY}" &&

- ${BUILDER} ${BUILDER_OPTS} install
+ ${MESON_INSTALL} ${MESON_OPTS}
}

default_build() {



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d118b42ff69be63e8e46b512782c293e50416399), Vlad Glagolev, 07/28/2022

Archive powered by MHonArc 2.6.24.

Top of Page