[buildstream-plugins] branch master updated: Make usage of ninja implementation detail

[tv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tvb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/buildstream-plugins.git


The following commit(s) were added to refs/heads/master by this push:
     new 44fe709  Make usage of ninja implementation detail
     new 6ddd304  Merge pull request #41 from nanonyme/meson-api
44fe709 is described below

commit 44fe7095a11b04df58e870a051c09a8fcf156fdd
Author: Seppo Yli-Olli <se...@gmail.com>
AuthorDate: Sun Dec 4 15:28:45 2022 +0200

    Make usage of ninja implementation detail
    
    Also invoke meson install directly rather than side-stepping through
    ninja
---
 src/buildstream_plugins/elements/meson.yaml     | 18 +++++++++---------
 tests/cachekey/project/elements/meson1.expected |  2 +-
 tests/cachekey/project/target.expected          |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/buildstream_plugins/elements/meson.yaml b/src/buildstream_plugins/elements/meson.yaml
index c87fb7d..2db56b8 100644
--- a/src/buildstream_plugins/elements/meson.yaml
+++ b/src/buildstream_plugins/elements/meson.yaml
@@ -39,11 +39,11 @@ variables:
 
   meson: meson setup %{conf-root} %{build-dir} %{meson-args}
 
-  ninja: |
-    ninja -j ${NINJAJOBS} -C %{build-dir}
+  meson-build: |
+    ninja -j ${JOBS} -C %{build-dir}
 
-  ninja-install: |
-    env DESTDIR="%{install-root}" ninja -C %{build-dir} install
+  meson-install: |
+    env DESTDIR="%{install-root}" meson install -C %{build-dir} --no-rebuild
 
   # Set this if the sources cannot handle parallelization.
   #
@@ -61,14 +61,14 @@ config:
   #
   build-commands:
   - |
-    %{ninja}
+    %{meson-build}
 
   # Commands for installing the software into a
   # destination folder
   #
   install-commands:
   - |
-    %{ninja-install}
+    %{meson-install}
 
   # Commands for stripping debugging information out of
   # installed binaries
@@ -79,10 +79,10 @@ config:
 
 # Use max-jobs CPUs for building
 environment:
-  NINJAJOBS: |
+  JOBS: |
     %{max-jobs}
 
-# And dont consider NINJAJOBS as something which may
+# And dont consider JOBS as something which may
 # affect build output.
 environment-nocache:
-- NINJAJOBS
+- JOBS
diff --git a/tests/cachekey/project/elements/meson1.expected b/tests/cachekey/project/elements/meson1.expected
index 90c80cf..c2f6bbe 100644
--- a/tests/cachekey/project/elements/meson1.expected
+++ b/tests/cachekey/project/elements/meson1.expected
@@ -1 +1 @@
-06774620db3137433e1ec5efb5872d6379152e9e4b1c64b7374d940334f9a68a
\ No newline at end of file
+45b6ba4192ce48788b202a02255075f0c479cf42dc7ae8316df65709f72a1a97
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index 1c1c9bf..ff90caa 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-253b12d080d6bedfe2af58b035e02ba5aa4a1d719e54d04071685e18d0fea90a
\ No newline at end of file
+1be743d355c5c35502565185d9922213f0667b355abf5e6a3f88594d0fd64f96
\ No newline at end of file