From f65c79aed48114b6708158b8fba421d22c16cd82 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Mon, 15 Feb 2016 07:38:25 +0200 Subject: development/gtest: Updated for version 1.7.0 + new maintainer. Signed-off-by: Dimitris Zlatanidis --- development/gtest/README | 13 -------- development/gtest/gtest.SlackBuild | 66 ++++++++++++++++++++++++-------------- development/gtest/gtest.info | 12 +++---- 3 files changed, 48 insertions(+), 43 deletions(-) diff --git a/development/gtest/README b/development/gtest/README index 094b0fb409..d0bacf4248 100644 --- a/development/gtest/README +++ b/development/gtest/README @@ -6,16 +6,3 @@ on the xUnit architecture. Supports automatic test discovery, a rich set of assertions, user-defined assertions, death tests, fatal and non-fatal failures, value- and type-parameterized tests, various options for running the tests, and XML test report generation. - -Homepage: http://code.google.com/p/googletest - - -IMPORTANT NOTE: - -This build script builds a legacy version. A section on the FAQ pages -from the home site warns about the use of "make install" which is now -deprecated on the latest version. However, you can still continue to do -this if you know what you are doing. You can read more about this here: - -Why is it not recommended to install a pre-compiled copy of Google Test -http://code.google.com/p/googletest/wiki/FAQ diff --git a/development/gtest/gtest.SlackBuild b/development/gtest/gtest.SlackBuild index 7adc1a21f8..6c4d73b8da 100644 --- a/development/gtest/gtest.SlackBuild +++ b/development/gtest/gtest.SlackBuild @@ -1,10 +1,32 @@ #!/bin/sh # Slackware build script for gtest + # 2013-02-12 Bernski Comadizo Cebu +# Copyright 2016 Dimitris Zlatanidis Orestiada, Greece +# +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gtest -VERSION=${VERSION:-1.5.0} +SRCNAM=googletest +VERSION=${VERSION:-1.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,9 +62,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-release-$VERSION +tar -xvf $CWD/$SRCNAM-release-$VERSION.tar.gz || tar -xvf $CWD/release-$VERSION.tar.gz +cd $SRCNAM-release-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -50,32 +72,28 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --build=$ARCH-slackware-linux +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_BUILD_TYPE=Release .. + make +cd .. + +mkdir -p $PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/include/$PRGNAM/internal -# Compile the application and install it into the $PKG directory -make -make install DESTDIR=$PKG +install -m 0644 build/*.so $PKG/usr/lib$LIBDIRSUFFIX +install -m 0644 include/$PRGNAM/*.h $PKG/usr/include/$PRGNAM +install -m 0644 include/$PRGNAM/internal/*.h $PKG/usr/include/$PRGNAM/internal # Strip binaries and libraries find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Remove 'special' files -find $PKG -name perllocal.pod \ - -o -name ".packlist" \ - -o -name "*.bs" \ - | xargs rm -f - # Copy the slack-desc (and a custom doinst.sh if necessary) into ./install mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/development/gtest/gtest.info b/development/gtest/gtest.info index 28cbd13a5d..28e232ec5b 100644 --- a/development/gtest/gtest.info +++ b/development/gtest/gtest.info @@ -1,11 +1,11 @@ PRGNAM="gtest" -VERSION="1.5.0" -HOMEPAGE="http://code.google.com/p/googletest" -DOWNLOAD="http://googletest.googlecode.com/files/gtest-1.5.0.tar.gz" -MD5SUM="7e27f5f3b79dd1ce9092e159cdbd0635" +VERSION="1.7.0" +HOMEPAGE="https://github.com/google/googletest" +DOWNLOAD="https://github.com/google/googletest/archive/release-1.7.0.tar.gz" +MD5SUM="4ff6353b2560df0afecfbda3b2763847" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Bernski Comadizo" -EMAIL="bcomadizo@gmail.com" +MAINTAINER="Dimitris Zlatanidis" +EMAIL="d.zlatanidis@gmail.com" -- cgit v1.2.3