From 8bda6d887b20d57e8b0cdca8fdcee216592bd399 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Fri, 24 Nov 2017 13:09:42 +0000 Subject: [PATCH] build: Rplace PKGBUILD with a working script --- packaging/pkgbuild/PKGBUILD | 69 +++++++++++++------------------------ 1 file changed, 24 insertions(+), 45 deletions(-) diff --git a/packaging/pkgbuild/PKGBUILD b/packaging/pkgbuild/PKGBUILD index 3b0d1f7..a3ce364 100644 --- a/packaging/pkgbuild/PKGBUILD +++ b/packaging/pkgbuild/PKGBUILD @@ -1,59 +1,38 @@ # Maintainer: Enlightenment Developers -pkgname=('edi-git' 'edi_doc-git') -pkgver=0.4.99.0001 +pkgname='edi-git' +pkgver=0.6.99.0001 pkgrel=1 -pkgdesc="Enlightenment toolkit edi - GIT development snapshot" +pkgdesc="Efl based IDE - GIT development snapshot" arch=('i686' 'x86_64' 'arm') -url="http://andywilliams.me" +url="https://www.enlightenment.org/about-edi" license=('GPLv2') -makedepends=('doxygen' 'imagemagick' 'git') -depends=('efl-git') -options=('!libtool' 'debug') +makedepends=('git' 'meson') +depends=('efl-git' 'clang' 'check') +options=('!libtool' 'debug' '!strip') provides=('edi') +source=("edi-git::git+https://github.com/Enlightenment/edi.git#branch=develop") +sha256sums=('SKIP') pkgver() { - cd "../.." - - for _i in v_maj v_min v_mic; do - local v_ver=$v_ver.$(grep -m 1 $_i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*") - done - - v_ver=$(awk -F , -v v_ver=${v_ver#.} '/^AC_INIT/ {gsub(/v_ver/, v_ver); gsub(/[\[\] -]/, ""); print $2}' configure.ac) - - printf "$v_ver.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" + cd "$pkgname" + (set -o pipefail + git describe --tags 2>/dev/null | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' || + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + ) } - build() { - cd "../.." - export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer" - [[ -e Makefile ]] && make clean distclean - ./configure --prefix=/usr \ - --disable-static - make - make doc + cd "$pkgname" + meson --buildtype=release --prefix=/usr build/ + ninja -C build/ } -package_edi-git() { - cd "../.." - make -j1 DESTDIR="$pkgdir/" install - install -Dm644 README "$pkgdir/usr/share/$pkgname/README" - install -Dm644 NEWS "$pkgdir/usr/share/$pkgname/NEWS" - install -Dm644 ChangeLog "$pkgdir/usr/share/$pkgname/ChangeLog" - install -Dm644 AUTHORS "$pkgdir/usr/share/$pkgname/AUTHORS" - install -Dm644 COMPLIANCE "$pkgdir/usr/share/$pkgname/COMPLIANCE" - install -Dm644 COPYING.images "$pkgdir/usr/share/licenses/$pkgname/COPYING.images" - sed -n '1,/details./p' COPYING > "$pkgdir/usr/share/licenses/$pkgname/COPYING" - ln -s "../licenses/$pkgname/COPYING" "$pkgdir/usr/share/$pkgname/COPYING" - ln -s "../licenses/$pkgname/COPYING.images" "$pkgdir/usr/share/$pkgname/COPYING.images" +check() { + cd "$pkgname" + ninja -C build/ test } -package_edi_doc-git() { - pkgdesc="Documentation for Edi" - arch=('any') - unset depends optdepends - - cd "../.." - mkdir -p "$pkgdir/usr/share/doc/$pkgname" - cp -a doc/html "$pkgdir/usr/share/doc/$pkgname/html" - cp -a doc/latex "$pkgdir/usr/share/doc/$pkgname/latex" +package() { + cd "$pkgname" + DESTDIR="$pkgdir/" ninja -C build/ install } +