xorgproto: Branch 'master' - 3 commits

[GitLab Mirror]

 .gitlab-ci.yml |   15 ++++++---------
 meson.build    |    5 +++--
 2 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 1b6e63b2c38a0cf6cd1c70bfc5483cac0d1710e1
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 10 16:19:13 2023 -0800

    meson: replace deprecated source_root with new project_source_root
    
    Fixes deprecation warning for meson 0.56.0 and later.
    Raises minimum meson version to 0.56.0.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/meson.build b/meson.build
index c68e69a..b8d2e44 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@
 
 # keep version in sync with configure.ac
 project('xorgproto', 'c', license : 'MIT', version : '2022.2',
-        meson_version : '>=0.50.0')
+        meson_version : '>=0.56.0')
 cc = meson.get_compiler('c')
 
 pcs = [
@@ -115,7 +115,7 @@ ext_xorgproto = declare_dependency(
 
 subdir('include')
 
-keysymfile = meson.source_root() / 'include' / 'X11' / 'XF86keysym.h'
+keysymfile = meson.project_source_root() / 'include' / 'X11' / 'XF86keysym.h'
 test('evdev-keysym-check',
      find_program('scripts/keysym-generator.py'),
      args: ['-v', '--header', keysymfile, 'verify'])
commit 3fd47893c53e46d99b575a6c4e1a00d79bec3c6d
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 10 16:17:03 2023 -0800

    meson: replace join_paths with /
    
    Sets minimum meson version to 0.50.0 due to use of:
     * 0.49.0: {'/ with string arguments'}
     * 0.50.0: {'install arg in configure_file'}
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/meson.build b/meson.build
index 6bd7110..c68e69a 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,8 @@
 # SOFTWARE.
 
 # keep version in sync with configure.ac
-project('xorgproto', 'c', license : 'MIT', version : '2022.2')
+project('xorgproto', 'c', license : 'MIT', version : '2022.2',
+        meson_version : '>=0.50.0')
 cc = meson.get_compiler('c')
 
 pcs = [
@@ -114,7 +115,7 @@ ext_xorgproto = declare_dependency(
 
 subdir('include')
 
-keysymfile = join_paths(meson.source_root(), 'include', 'X11', 'XF86keysym.h')
+keysymfile = meson.source_root() / 'include' / 'X11' / 'XF86keysym.h'
 test('evdev-keysym-check',
      find_program('scripts/keysym-generator.py'),
      args: ['-v', '--header', keysymfile, 'verify'])
commit 1a1e0a82b10d9b928574b0fe2e8af94e55efe918
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 10 16:10:55 2023 -0800

    gitlab CI: run meson instead of ninja for test & install steps
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8227d25..7e8a2aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,8 +93,8 @@ meson:
     - mkdir -p ../_inst
     - meson builddir --prefix="$PWD/../_inst" $MESON_OPTIONS
     - meson configure builddir
-    - ninja -C builddir test
-    - ninja -C builddir install
+    - meson test -C builddir
+    - meson install -C builddir
 
 autotools:
   extends:
@@ -127,7 +127,7 @@ meson from tarball:
     - pushd _tarball_build/xorgproto-*
     - meson builddir
     - meson configure builddir
-    - ninja -C builddir test
+    - meson test -C builddir
   needs:
     - autotools
   variables:
@@ -145,7 +145,7 @@ compare meson and autotools:
     - ln -sf $PWD/_meson_inst $PWD/_inst
     - meson builddir
     - meson configure builddir --prefix=$PWD/_inst
-    - ninja -C builddir install
+    - meson install -C builddir
     - rm $PWD/_inst
     - ln -sf $PWD/_autotools_inst $PWD/_inst
     - autoreconf -ivf
@@ -179,9 +179,6 @@ check versions are in sync:
   script:
     - autoreconf -ivf
     - ./configure --version | head -n 1 | sed -e 's/xorgproto configure //' > autotools.version
-    - |
-      meson builddir
-      pushd builddir
-      meson introspect --projectinfo | jq -r '.version' > ../meson.version
-      popd
+    - meson builddir
+    - meson introspect --projectinfo builddir | jq -r '.version' > meson.version
     - diff -u autotools.version meson.version || (echo "ERROR - autotools and meson versions not in sync" && false)