summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD43
2 files changed, 20 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e0b099a0bad5..2f92bf831caa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = googletest-git
pkgdesc = Google's C++ test framework
- pkgver = 1.8.1.r244.gd5932506
+ pkgver = 1.13.0.r100.g057b4e90
pkgrel = 1
- url = https://github.com/google/googletest
+ url = https://google.github.io/googletest/
arch = i686
arch = x86_64
license = BSD
@@ -10,12 +10,11 @@ pkgbase = googletest-git
makedepends = cmake
depends = gcc-libs
depends = sh
- provides = gmock
- provides = gtest
+ provides = gmock=1.13.0.r100.g057b4e90
+ provides = gtest=1.13.0.r100.g057b4e90
conflicts = gmock
conflicts = gtest
source = git+https://github.com/google/googletest.git
sha256sums = SKIP
pkgname = googletest-git
-
diff --git a/PKGBUILD b/PKGBUILD
index e89e433feecb..f63ac71f6fd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
# Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
pkgname=googletest-git
-pkgver=1.8.1.r244.gd5932506
+pkgver=1.13.0.r100.g057b4e90
pkgrel=1
pkgdesc="Google's C++ test framework"
arch=('i686' 'x86_64')
-url="https://github.com/google/googletest"
+url="https://google.github.io/googletest/"
license=('BSD')
depends=('gcc-libs' 'sh')
makedepends=('git' 'cmake')
-provides=('gmock' 'gtest')
+provides=("gmock=$pkgver" "gtest=$pkgver")
conflicts=('gmock' 'gtest')
source=("git+https://github.com/google/googletest.git")
sha256sums=('SKIP')
@@ -18,45 +18,34 @@ sha256sums=('SKIP')
pkgver() {
cd "googletest"
- git describe --long --tags | sed 's/^release-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+ _tag=$(git tag -l --sort -v:refname | grep -E '^v?[0-9\.]+$' | head -n1)
+ _rev=$(git rev-list --count $_tag..HEAD)
+ _hash=$(git rev-parse --short HEAD)
+ printf "%s.r%s.g%s" "$_tag" "$_rev" "$_hash" | sed 's/^v//'
}
build() {
- cd "$srcdir"
+ cd "googletest"
- mkdir -p "build" && cd "build"
cmake \
+ -B "_build" \
+ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_INSTALL_LIBDIR="lib" \
- -DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=ON \
- -Dgtest_build_tests=ON \
- ../"googletest"
- make
-
- # For g{test,mock}-config
- cd "$srcdir/googletest"
- autoreconf -fi
- ./configure --prefix="/usr"
- make
+ ./
+ make -C "_build"
}
check() {
cd "googletest"
- #make -C "$srcdir/build" test
+ #make -C "_build" test
}
package() {
- cd "$srcdir"
-
- make -C "build" DESTDIR="$pkgdir" install
-
- cd "$srcdir/googletest"
- install -Dm755 "googletest/scripts/gtest-config" -t "$pkgdir/usr/bin"
- install -Dm755 "googlemock/scripts/gmock-config" -t "$pkgdir/usr/bin"
-
- install -Dm644 "googletest/m4/gtest.m4" -t "$pkgdir/usr/share/aclocal"
+ cd "googletest"
- install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/gtest/LICENSE"
+ make -C "_build" DESTDIR="$pkgdir" install
+ install -Dm644 "LICENSE" -t "$pkgdir/usr/share/licenses/gtest"
}