[arch-commits] Commit in jsoncpp/trunk (PKGBUILD)

[Levente Polyak]

    Date: Thursday, January 25, 2018 @ 01:18:03
  Author: anthraxx
Revision: 315421

upgpkg: jsoncpp 1.8.4-2

Modified:
  jsoncpp/trunk/PKGBUILD

----------+
 PKGBUILD |   38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-25 00:18:10 UTC (rev 315420)
+++ PKGBUILD	2018-01-25 01:18:03 UTC (rev 315421)
@@ -6,12 +6,13 @@
 pkgbase=jsoncpp
 pkgname=('jsoncpp' 'jsoncpp-doc')
 pkgver=1.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc='C++ library for interacting with JSON'
 url='https://github.com/open-source-parsers/jsoncpp'
 arch=('x86_64')
 license=('MIT' 'custom:Public_Domain')
-makedepends=('gcc-libs' 'cmake' 'doxygen' 'graphviz' 'python')
+makedepends=('gcc-libs' 'doxygen' 'graphviz' 'python' 'meson')
+checkdepends=('python2')
 options=('staticlibs')
 source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/open-source-parsers/${pkgbase}/archive/${pkgver}.tar.gz)
 sha256sums=('c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6')
@@ -24,24 +25,26 @@
 
 build() {
   cd ${pkgbase}-${pkgver}
-  python doxybuild.py --with-dot
+  msg2 "Building docs..."
+  python doxybuild.py \
+    --doxygen="$(which doxygen)" \
+    --with-dot
 
-  cd build
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_SHARED_LIBS=ON \
-    -DBUILD_STATIC_LIBS=ON \
-    -DJSONCPP_WITH_CMAKE_PACKAGE=ON \
-    ..
-  make
+  msg2 "Building shared library..."
+  arch-meson --default-library shared build
+  ninja -C build
+
+  msg2 "Building static library..."
+  arch-meson --default-library static build-static
+  ninja -C build-static
 }
 
 check() {
-  cd ${pkgbase}-${pkgver}/build
-  make test jsoncpp_test jsoncpp_readerwriter_tests
+  cd ${pkgbase}-${pkgver}
+  ninja -C build test
+  cd test
+  python2 runjsontests.py ../build/jsontestrunner
+  python2 rununittests.py ../build/jsoncpp_test
 }
 
 package_jsoncpp() {
@@ -49,7 +52,8 @@
   optdepends=('jsoncpp-doc: documentation')
 
   cd ${pkgbase}-${pkgver}
-  make -C build DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -C build install
+  DESTDIR="${pkgdir}" ninja -C build-static install
   install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
   install -Dm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
 }