Update version.

2 files changed, 32 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef9627014aa6..cf7ff5265e22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,16 @@
 pkgbase = mingw-w64-gtest
 	pkgdesc = Google Test - C++ testing utility based on the xUnit framework (like JUnit) (mingw-w64)
-	pkgver = 1.8.1
+	pkgver = 1.11.0
 	pkgrel = 1
 	url = https://github.com/google/googletest
 	arch = any
 	license = custom:BSD3
 	makedepends = mingw-w64-cmake
-	makedepends = python2
 	depends = mingw-w64-crt
 	options = !buildflags
 	options = staticlibs
 	options = !strip
-	source = https://github.com/google/googletest/archive/release-1.8.1.tar.gz
-	sha512sums = e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
+	source = mingw-w64-gtest-1.11.0.tar.gz::https://github.com/google/googletest/archive/release-1.11.0.tar.gz
+	sha512sums = 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28
 
 pkgname = mingw-w64-gtest
-
diff --git a/PKGBUILD b/PKGBUILD
index b662bf0ab3fe..1175082d24a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,44 @@
-# $Id: PKGBUILD 151545 2015-12-10 03:56:01Z foutrelis $
-# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 # Contributor: Felix Yan <felixonmars@gmail.com>
 # Contributor: Alexandre Bique <bique.alexandre@gmail.com>
 # Contributor: Louis R. Marascio <lrm@fitnr.com>
 # Contributor: Cody Maloney <cmaloney@theoreticalchaos.com>
 
 pkgname=mingw-w64-gtest
-pkgver=1.8.1
+pkgver=1.11.0
 pkgrel=1
-pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit) (mingw-w64)"
-arch=(any)
-url="https://github.com/google/googletest"
-license=(custom:BSD3)
-depends=(mingw-w64-crt)
-makedepends=(mingw-w64-cmake python2)
+pkgdesc='Google Test - C++ testing utility based on the xUnit framework (like JUnit) (mingw-w64)'
+arch=('any')
+url='https://github.com/google/googletest'
+license=('custom:BSD3')
+depends=('mingw-w64-crt')
+makedepends=('mingw-w64-cmake')
 options=(!buildflags staticlibs !strip)
-source=("https://github.com/google/googletest/archive/release-${pkgver}.tar.gz")
-sha512sums=('e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/google/googletest/archive/release-${pkgver}.tar.gz")
+sha512sums=('6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28')
 
-_mingw_arch=(i686-w64-mingw32 x86_64-w64-mingw32)
+_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
+_flags=( -Wno-dev -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE='-O2 -DNDEBUG' )
+_srcdir="googletest-release-${pkgver}"
 
 build() {
-    cd "googletest-release-${pkgver}/googletest"
-
-    for _arch in "${_mingw_arch[@]}"; do
-        mkdir -p "build_${_arch}"
-        pushd "build_${_arch}"
-        "${_arch}-cmake" \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DLIB_INSTALL_DIR=lib \
-            -DBUILD_SHARED_LIBS=ON \
-            -DCMAKE_SKIP_RPATH=ON \
-            -Dgtest_disable_pthreads=ON \
-            ..
-        make
-        popd
-    done
-
-    python2 scripts/fuse_gtest_files.py fused-src
+	for _arch in "${_architectures[@]}"; do
+		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}-static" "${_flags[@]}" -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr/${_arch}/static"
+		cmake --build "build-${_arch}-static"
+		
+		${_arch}-cmake -S "${_srcdir}" -B "build-${_arch}" "${_flags[@]}" -DBUILD_TESTING=OFF
+		cmake --build "build-${_arch}"
+	done
 }
 
 package() {
-    cd "googletest-release-${pkgver}/googletest"
-
-    for _arch in "${_mingw_arch[@]}"; do
-        mkdir -pm 0755 "${pkgdir}/usr/${_arch}"/{bin,lib,include/gtest/internal/custom,share/licenses/${pkgname},src/gtest/src,src/gtest/cmake}
-        install -m 0644 "build_${_arch}"/libgtest{,_main}.dll "${pkgdir}/usr/${_arch}"/bin
-        install -m 0644 "build_${_arch}"/libgtest{,_main}.dll.a "${pkgdir}/usr/${_arch}"/lib
-        install -m 0644 include/gtest/*.h "${pkgdir}/usr/${_arch}"/include/gtest
-        install -m 0644 include/gtest/internal/*.h "${pkgdir}/usr/${_arch}"/include/gtest/internal/
-        install -m 0644 include/gtest/internal/custom/*.h "${pkgdir}/usr/${_arch}"/include/gtest/internal/custom
-        install -m 0644 LICENSE "${pkgdir}/usr/${_arch}"/share/licenses/${pkgname}/
-        install -m 0644 fused-src/gtest/* "${pkgdir}/usr/${_arch}"/src/gtest/src/
-        install -m 0644 CMakeLists.txt "${pkgdir}/usr/${_arch}"/src/gtest/
-        install -m 0644 cmake/* "${pkgdir}/usr/${_arch}"/src/gtest/cmake/
-    done
+	for _arch in "${_architectures[@]}"; do
+		DESTDIR="${pkgdir}" cmake --install "build-${_arch}-static"
+		${_arch}-strip -g "$pkgdir"/usr/${_arch}/static/lib/*.a
+		
+		DESTDIR="${pkgdir}" cmake --install "build-${_arch}"
+		${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+		${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
+	done
 }