From 9438834654019fade54d7532dc93d0e628980177 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Thu, 13 Feb 2020 10:26:07 -0300
Subject: [PATCH] Rework packaging

Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
 .gitlab-ci.yml | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60adbae2..0340eb3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,35 +12,31 @@ stages:
   - echo "deb  http://deb.debian.org/debian testing main contrib non-free" > /etc/apt/sources.list
   - echo "deb-src http://deb.debian.org/debian testing main contrib non-free" >> /etc/apt/sources.list
   - apt-get update && apt-get $APT_OPTIONS build-dep weston wayland-protocols && apt-get $APT_OPTIONS install build-essential git meson cmake
-  - git clone --depth=1 https://gitlab.freedesktop.org/wayland/wayland-protocols
-  - export WAYLAND_PROTOCOLS_DIR="$(pwd)/prefix-wayland-protocols"
-  - export PKG_CONFIG_PATH="$WAYLAND_PROTOCOLS_DIR/share/pkgconfig:$PKG_CONFIG_PATH"
+  - export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
+  - export ROOTFS="${CI_PROJECT_DIR}/rootfs"
+  - export ROOTFS_WAYLAND_PROTOCOLS="${ROOTFS}/usr/local"
+  - export PKG_CONFIG_PATH="$ROOTFS/usr/local/share/pkgconfig:$PKG_CONFIG_PATH"
   - export MAKEFLAGS="-j4"
+  - git clone --depth=1 https://gitlab.freedesktop.org/wayland/wayland-protocols
   - cd wayland-protocols
   - git show -s HEAD
   - mkdir build
   - cd build
-  - ../autogen.sh --prefix="$WAYLAND_PROTOCOLS_DIR"
+  - ../autogen.sh --prefix="$ROOTFS/usr/local"
   - make install
   - cd ../../
-  - export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-  - export BUILD_ID="weston-$CI_JOB_NAME"
-  - export PREFIX="$(pwd)/prefix-$BUILD_ID"
-  - export BUILDDIR="$(pwd)/build-$BUILD_ID"
-  - mkdir "$BUILDDIR" "$PREFIX"
 
 .build-native-meson:
   extends: .build-native
   script:
   - export PATH=~/.local/bin:$PATH
-  - cd "$BUILDDIR"
-  - meson --prefix="$PREFIX" ${MESON_OPTIONS} ..
-  - DESTDIR=${CI_PROJECT_DIR}/artifacts ninja install
-  - tar --directory ${CI_PROJECT_DIR}/artifacts -cvf ${CI_PROJECT_DIR}/weston.tar.gz .
+  - meson ${MESON_OPTIONS} build
+  - DESTDIR=${ROOTFS}/ ninja -C build install
+  - tar --directory ${ROOTFS} -cvf ${CI_PROJECT_DIR}/weston.tar.gz .
   - (cd ${CI_PROJECT_DIR} && md5sum --tag weston.tar.gz > weston.tar.gz.hash)
-  - ninja clean
+  - ninja -C build clean
   artifacts:
-    name: weston-$CI_COMMIT_SHA
+    name: build-weston
     when: always
     paths:
     - ${CI_PROJECT_DIR}/weston.tar.gz
-- 
GitLab