xorgproto: Branch 'master'

[GitLab Mirror]

 .gitlab-ci.yml |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

New commits:
commit 86ffbbc295a1c6fd501eef44b8a2b2a0f6c327ca
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Feb 25 10:34:07 2021 +1000

    gitlab CI: add a job to compare meson and autotools standard installs
    
    Build and install with meson, build and install with autotools and then run
    diff to compare the two directory trees. They should be the same.
    
    This does not install the legacy protocols, they're behind a configure switch.
    The spec-build is disabled in autotools because we know meson doesn't do that
    yet, so no point in comparing those.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4433b0..65dd0d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,6 +83,27 @@ meson from tarball:
   variables:
     GIT_STRATEGY: none
 
+compare meson and autotools:
+  extends:
+    - .fdo.distribution-image at arch
+  stage: test
+  script:
+    - mkdir -p $PWD/_meson_inst
+    - mkdir -p $PWD/_autotools_inst
+    # the prefix ends up in the pkgconfig files, so we use a symlink
+    # to use the same --prefix for meson and autotools
+    - ln -sf $PWD/_meson_inst $PWD/_inst
+    - meson builddir
+    - meson configure builddir --prefix=$PWD/_inst
+    - ninja -C builddir install
+    - rm $PWD/_inst
+    - ln -sf $PWD/_autotools_inst $PWD/_inst
+    - autoreconf -ivf
+    # meson doesn't build the specs yet
+    - ./configure --prefix=$PWD/_inst --disable-specs
+    - make && make install
+    - diff --brief --recursive $PWD/_meson_inst $PWD/_autotools_inst
+
 check evdev keysyms:
   extends:
     - .fdo.distribution-image at arch