[arch-commits] Commit in gtest/repos/community-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Sun May 9 09:29:34 UTC 2021
Date: Sunday, May 9, 2021 @ 09:29:34
Author: arojas
Revision: 928997
archrelease: copy trunk to community-x86_64
Added:
gtest/repos/community-x86_64/PKGBUILD
(from rev 928996, gtest/trunk/PKGBUILD)
gtest/repos/community-x86_64/gtest-1.10.0-libversion.patch
(from rev 928996, gtest/trunk/gtest-1.10.0-libversion.patch)
Deleted:
gtest/repos/community-x86_64/PKGBUILD
gtest/repos/community-x86_64/gtest-1.10.0-libversion.patch
-------------------------------+
PKGBUILD | 175 ++++++++++++++++++----------------------
gtest-1.10.0-libversion.patch | 54 ++++++------
2 files changed, 107 insertions(+), 122 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-09 09:29:20 UTC (rev 928996)
+++ PKGBUILD 2021-05-09 09:29:34 UTC (rev 928997)
@@ -1,95 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Alexandre Bique <bique.alexandre at gmail.com>
-# Contributor: Louis R. Marascio <lrm at fitnr.com>
-# Contributor: Cody Maloney <cmaloney at theoreticalchaos.com>
-# Contributor: acxz <akashpatel2008 at yahoo dot com>
-
-pkgbase=gtest
-pkgname=('gtest' 'gmock')
-pkgver=1.10.0
-pkgrel=5
-pkgdesc='Google Test - C++ testing utility'
-url='https://github.com/google/googletest'
-arch=('x86_64')
-license=('BSD')
-makedepends=('python' 'cmake' 'gcc-libs' 'sh')
-_srcname=googletest-release-${pkgver}
-source=(${_srcname}.tar.gz::https://github.com/google/googletest/archive/release-${pkgver}.tar.gz
- gtest-1.10.0-libversion.patch)
-sha512sums=('bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9'
- '57d18cdd2d7b744c4e759a51899372befc78624de00fccc71464293f8c36d32f7dd3bb87ec55fc0303031a397bbba5d45075662687cf5bba378f5001dabf2faa')
-
-prepare() {
- cd ${_srcname}
- cp ../gtest-1.10.0-libversion.patch gtest-1.10.0-libversion.patch
- sed "s|__GOOGLETEST_VERSION__|${pkgver}|g" -i gtest-1.10.0-libversion.patch
- # https://src.fedoraproject.org/rpms/gtest/tree/master
- patch -Np1 -i gtest-1.10.0-libversion.patch
-
- # fixup version as they are never correct
- sed -E "s|(GOOGLETEST_VERSION) [0-9\\.]+|\\1 ${pkgver}|" -i CMakeLists.txt
-}
-
-build() {
- cmake -H${_srcname} -Bbuild \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DBUILD_SHARED_LIBS=ON \
- -Dgtest_build_tests=ON
- cmake --build build
-
-}
-
-check() {
- cmake --build build --target test
-}
-
-package_gtest() {
- pkgdesc='Google Test - C++ testing utility based on the xUnit framework (like JUnit)'
- depends=('gcc-libs' 'sh')
-
- DESTDIR="${pkgdir}" cmake --build build --target install
-
- # Shouldn't be present
- find "${pkgdir}" -name '*.pump' -printf 'Removing %P\n' -delete
-
- # Split gmock
- mkdir -p gmock/{include,lib/pkgconfig}
- mv "${pkgdir}"/usr/include/gmock gmock/include/
- mv "${pkgdir}"/usr/lib/libgmock* gmock/lib/
- mv "${pkgdir}"/usr/lib/pkgconfig/gmock* gmock/lib/pkgconfig/
-
- cd ${_srcname}/googletest
- install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
- install -Dm 644 README.md CONTRIBUTORS -t "${pkgdir}/usr/share/doc/${pkgname}"
- install -Dm 755 scripts/gtest-config.in -t "${pkgdir}/usr/bin"
- install -Dm 644 cmake/* -t "${pkgdir}/usr/src/googletest/cmake"
- install -Dm 644 src/* -t "${pkgdir}/usr/src/googletest/src"
- install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/googletest"
-}
-
-package_gmock() {
- pkgdesc='Google Mock - A library for writing and using C++ mock classes'
- depends=('python' 'gtest' 'gcc-libs' 'sh')
-
- mv gmock "${pkgdir}/usr"
-
- cd ${_srcname}/googlemock
- install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
- install -Dm 644 README.md CONTRIBUTORS -t "${pkgdir}/usr/share/doc/${pkgname}"
- install -Dm 755 scripts/gmock-config.in -t "${pkgdir}/usr/bin"
- install -Dm 644 cmake/* -t "${pkgdir}/usr/src/gmock/cmake"
- install -Dm 644 src/* -t "${pkgdir}/usr/src/gmock/src"
- install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/gmock"
- install -Dm 644 scripts/generator/{*.py,LICENSE,README*} -t "${pkgdir}/usr/share/gmock/generator"
- install -Dm 644 scripts/generator/cpp/* -t "${pkgdir}/usr/share/gmock/generator/cpp"
-
- sed -i 's|src/||' "${pkgdir}/usr/src/gmock/src/gmock-all.cc"
-
- python -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
- python -O -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
-}
-
-# vim: ts=2 sw=2 et:
Copied: gtest/repos/community-x86_64/PKGBUILD (from rev 928996, gtest/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-09 09:29:34 UTC (rev 928997)
@@ -0,0 +1,80 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Alexandre Bique <bique.alexandre at gmail.com>
+# Contributor: Louis R. Marascio <lrm at fitnr.com>
+# Contributor: Cody Maloney <cmaloney at theoreticalchaos.com>
+# Contributor: acxz <akashpatel2008 at yahoo dot com>
+
+pkgname=gtest
+pkgver=1.10.0
+pkgrel=6
+pkgdesc='Google Test - C++ testing utility'
+url='https://github.com/google/googletest'
+arch=('x86_64')
+license=('BSD')
+depends=('gcc-libs' 'sh')
+makedepends=('python' 'cmake' 'gcc-libs' 'sh')
+optdepends=('python: gmock generator')
+conflicts=('gmock')
+replaces=('gmock')
+provides=('gmock')
+_srcname=googletest-release-${pkgver}
+source=(${_srcname}.tar.gz::https://github.com/google/googletest/archive/release-${pkgver}.tar.gz
+ gtest-1.10.0-libversion.patch)
+sha512sums=('bd52abe938c3722adc2347afad52ea3a17ecc76730d8d16b065e165bc7477d762bce0997a427131866a89f1001e3f3315198204ffa5d643a9355f1f4d0d7b1a9'
+ '57d18cdd2d7b744c4e759a51899372befc78624de00fccc71464293f8c36d32f7dd3bb87ec55fc0303031a397bbba5d45075662687cf5bba378f5001dabf2faa')
+
+prepare() {
+ cd ${_srcname}
+ cp ../gtest-1.10.0-libversion.patch gtest-1.10.0-libversion.patch
+ sed "s|__GOOGLETEST_VERSION__|${pkgver}|g" -i gtest-1.10.0-libversion.patch
+ # https://src.fedoraproject.org/rpms/gtest/tree/master
+ patch -Np1 -i gtest-1.10.0-libversion.patch
+
+ # fixup version as they are never correct
+ sed -E "s|(GOOGLETEST_VERSION) [0-9\\.]+|\\1 ${pkgver}|" -i CMakeLists.txt
+}
+
+build() {
+ cmake -H${_srcname} -Bbuild \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=ON \
+ -Dgtest_build_tests=ON
+ cmake --build build
+}
+
+check() {
+ cmake --build build --target test
+}
+
+package() {
+ DESTDIR="${pkgdir}" cmake --build build --target install
+
+ # Shouldn't be present
+ find "${pkgdir}" -name '*.pump' -printf 'Removing %P\n' -delete
+
+ cd ${_srcname}/googletest
+ install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -Dm 644 README.md CONTRIBUTORS -t "${pkgdir}/usr/share/doc/${pkgname}"
+ install -Dm 755 scripts/gtest-config.in -t "${pkgdir}/usr/bin"
+ install -Dm 644 cmake/* -t "${pkgdir}/usr/src/googletest/cmake"
+ install -Dm 644 src/* -t "${pkgdir}/usr/src/googletest/src"
+ install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/googletest"
+
+ cd ../googlemock
+ install -Dm 755 scripts/gmock-config.in -t "${pkgdir}/usr/bin"
+ install -Dm 644 cmake/* -t "${pkgdir}/usr/src/gmock/cmake"
+ install -Dm 644 src/* -t "${pkgdir}/usr/src/gmock/src"
+ install -Dm 644 CMakeLists.txt -t "${pkgdir}/usr/src/gmock"
+ install -Dm 644 scripts/generator/{*.py,LICENSE,README*} -t "${pkgdir}/usr/share/gmock/generator"
+ install -Dm 644 scripts/generator/cpp/* -t "${pkgdir}/usr/share/gmock/generator/cpp"
+
+ sed -i 's|src/||' "${pkgdir}/usr/src/gmock/src/gmock-all.cc"
+
+ python -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
+ python -O -m compileall -d /usr/share/gmock "${pkgdir}/usr/share/gmock"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: gtest-1.10.0-libversion.patch
===================================================================
--- gtest-1.10.0-libversion.patch 2021-05-09 09:29:20 UTC (rev 928996)
+++ gtest-1.10.0-libversion.patch 2021-05-09 09:29:34 UTC (rev 928997)
@@ -1,27 +0,0 @@
-diff -ur a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
---- a/googlemock/CMakeLists.txt 2020-02-24 22:42:28.960922857 -0500
-+++ b/googlemock/CMakeLists.txt 2020-02-24 22:44:55.168453771 -0500
-@@ -100,8 +100,10 @@
- else()
- cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
- target_link_libraries(gmock PUBLIC gtest)
-+ set_target_properties(gmock PROPERTIES VERSION __GOOGLETEST_VERSION__)
- cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
- target_link_libraries(gmock_main PUBLIC gmock)
-+ set_target_properties(gmock_main PROPERTIES VERSION __GOOGLETEST_VERSION__)
- endif()
- # If the CMake version supports it, attach header directory information
- # to the targets for when we are part of a parent build (ie being pulled
-diff -ur a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
---- a/googletest/CMakeLists.txt 2020-02-24 22:42:28.967589562 -0500
-+++ b/googletest/CMakeLists.txt 2020-02-24 22:45:20.125271052 -0500
-@@ -126,7 +126,9 @@
- # are used for other targets, to ensure that gtest can be compiled by a user
- # aggressive about warnings.
- cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
-+set_target_properties(gtest PROPERTIES VERSION __GOOGLETEST_VERSION__)
- cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
-+set_target_properties(gtest_main PROPERTIES VERSION __GOOGLETEST_VERSION__)
- # If the CMake version supports it, attach header directory information
- # to the targets for when we are part of a parent build (ie being pulled
- # in via add_subdirectory() rather than being a standalone build).
Copied: gtest/repos/community-x86_64/gtest-1.10.0-libversion.patch (from rev 928996, gtest/trunk/gtest-1.10.0-libversion.patch)
===================================================================
--- gtest-1.10.0-libversion.patch (rev 0)
+++ gtest-1.10.0-libversion.patch 2021-05-09 09:29:34 UTC (rev 928997)
@@ -0,0 +1,27 @@
+diff -ur a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
+--- a/googlemock/CMakeLists.txt 2020-02-24 22:42:28.960922857 -0500
++++ b/googlemock/CMakeLists.txt 2020-02-24 22:44:55.168453771 -0500
+@@ -100,8 +100,10 @@
+ else()
+ cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
+ target_link_libraries(gmock PUBLIC gtest)
++ set_target_properties(gmock PROPERTIES VERSION __GOOGLETEST_VERSION__)
+ cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
+ target_link_libraries(gmock_main PUBLIC gmock)
++ set_target_properties(gmock_main PROPERTIES VERSION __GOOGLETEST_VERSION__)
+ endif()
+ # If the CMake version supports it, attach header directory information
+ # to the targets for when we are part of a parent build (ie being pulled
+diff -ur a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
+--- a/googletest/CMakeLists.txt 2020-02-24 22:42:28.967589562 -0500
++++ b/googletest/CMakeLists.txt 2020-02-24 22:45:20.125271052 -0500
+@@ -126,7 +126,9 @@
+ # are used for other targets, to ensure that gtest can be compiled by a user
+ # aggressive about warnings.
+ cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
++set_target_properties(gtest PROPERTIES VERSION __GOOGLETEST_VERSION__)
+ cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
++set_target_properties(gtest_main PROPERTIES VERSION __GOOGLETEST_VERSION__)
+ # If the CMake version supports it, attach header directory information
+ # to the targets for when we are part of a parent build (ie being pulled
+ # in via add_subdirectory() rather than being a standalone build).
More information about the arch-commits
mailing list