pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Remove gmock, integrated into googletest.
details: https://anonhg.NetBSD.org/pkgsrc/rev/e7b8cd9091ed
branches: trunk
changeset: 354524:e7b8cd9091ed
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Nov 01 15:32:59 2016 +0000
description:
Remove gmock, integrated into googletest.
diffstat:
devel/Makefile | 3 +-
devel/gmock/DESCR | 9 --
devel/gmock/Makefile | 42 -----------
devel/gmock/PLIST | 17 ----
devel/gmock/buildlink3.mk | 14 ---
devel/gmock/distinfo | 10 --
devel/gmock/patches/patch-Makefile.in | 23 ------
devel/gmock/patches/patch-configure | 24 ------
devel/gmock/patches/patch-gtest_configure | 15 ---
devel/gmock/patches/patch-include_gmock_internal_gmock-port.h | 19 ----
doc/CHANGES-2016 | 3 +-
doc/TODO | 3 +-
12 files changed, 4 insertions(+), 178 deletions(-)
diffs (257 lines):
diff -r a980f004b2f8 -r e7b8cd9091ed devel/Makefile
--- a/devel/Makefile Tue Nov 01 15:32:54 2016 +0000
+++ b/devel/Makefile Tue Nov 01 15:32:59 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2327 2016/10/21 02:32:58 kamil Exp $
+# $NetBSD: Makefile,v 1.2328 2016/11/01 15:32:59 wiz Exp $
#
COMMENT= Development utilities
@@ -285,7 +285,6 @@
SUBDIR+= glibmm
SUBDIR+= global
SUBDIR+= gmake
-SUBDIR+= gmock
SUBDIR+= gmp
SUBDIR+= gmtk
SUBDIR+= gnatpython
diff -r a980f004b2f8 -r e7b8cd9091ed devel/gmock/DESCR
--- a/devel/gmock/DESCR Tue Nov 01 15:32:54 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s
-specifics in mind, Google C++ Mocking Framework (or Google Mock for
-short) is a library for writing and using C++ mock classes. Google Mock:
-
-* lets you create mock classes trivially using simple macros,
-* supports a rich set of matchers and actions,
-* handles unordered, partially ordered, or completely ordered expectations,
-* is extensible by users, and
-* works on Linux, Mac OS X, Windows, Windows Mobile, minGW, and Symbian.
diff -r a980f004b2f8 -r e7b8cd9091ed devel/gmock/Makefile
--- a/devel/gmock/Makefile Tue Nov 01 15:32:54 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2014/05/17 16:10:43 wiz Exp $
-#
-
-DISTNAME= gmock-1.6.0
-PKGREVISION= 1
-CATEGORIES= devel
-MASTER_SITES= http://googlemock.googlecode.com/files/
-EXTRACT_SUFX= .zip
-
-MAINTAINER= ryoon%NetBSD.org@localhost
-HOMEPAGE= http://code.google.com/p/googlemock/
-COMMENT= C++ Mocking Framework
-LICENSE= modified-bsd
-
-INSTALLATION_DIRS= bin
-
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
-
-USE_LIBTOOL= yes
-
-SUBST_CLASSES+= fix-python
-SUBST_STAGE.fix-python= pre-configure
-SUBST_MESSAGE.fix-python= Fixing dynamic python
-SUBST_FILES.fix-python+= gtest/scripts/*py
-SUBST_SED.fix-python+= -e 's,/usr/bin/env python,${PYTHONBIN},'
-
-CONFIGURE_ARGS+= --enable-external-gtest
-
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+= -std=c++11
-.endif
-
-pre-configure:
- ${RM} -r ${WRKSRC}/gtest
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/gmock-config ${DESTDIR}${PREFIX}/bin
-
-.include "../../devel/googletest/buildlink3.mk"
-.include "../../lang/python/extension.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r a980f004b2f8 -r e7b8cd9091ed devel/gmock/PLIST
--- a/devel/gmock/PLIST Tue Nov 01 15:32:54 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/07/29 15:18:29 ryoon Exp $
-bin/gmock-config
-include/gmock/gmock-actions.h
-include/gmock/gmock-cardinalities.h
-include/gmock/gmock-generated-actions.h
-include/gmock/gmock-generated-function-mockers.h
-include/gmock/gmock-generated-matchers.h
-include/gmock/gmock-generated-nice-strict.h
-include/gmock/gmock-matchers.h
-include/gmock/gmock-more-actions.h
-include/gmock/gmock-spec-builders.h
-include/gmock/gmock.h
-include/gmock/internal/gmock-generated-internal-utils.h
-include/gmock/internal/gmock-internal-utils.h
-include/gmock/internal/gmock-port.h
-lib/libgmock.la
-lib/libgmock_main.la
diff -r a980f004b2f8 -r e7b8cd9091ed devel/gmock/buildlink3.mk
--- a/devel/gmock/buildlink3.mk Tue Nov 01 15:32:54 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/07/29 15:18:29 ryoon Exp $
-
-BUILDLINK_TREE+= gmock
-
-.if !defined(GMOCK_BUILDLINK3_MK)
-GMOCK_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gmock+= gmock>=1.6.0
-BUILDLINK_PKGSRCDIR.gmock?= ../../devel/gmock
-
-.include "../../devel/googletest/buildlink3.mk"
-.endif # GMOCK_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -gmock
diff -r a980f004b2f8 -r e7b8cd9091ed devel/gmock/distinfo
--- a/devel/gmock/distinfo Tue Nov 01 15:32:54 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 03:27:28 agc Exp $
-
-SHA1 (gmock-1.6.0.zip) = 4702e98af194d320a915f1e6d2532a32b280819e
-RMD160 (gmock-1.6.0.zip) = e08ea01a82e119591eef9bab69629d0af247784f
-SHA512 (gmock-1.6.0.zip) = 7adff00bb6ff81a6ffb704be71d0747636d69e24b4a8b709e1fb8c177a9a47f6dea8d14fde73034ebfb1529c291c7212a944ad92a34f88abdfe23c2d0b11b6f7
-Size (gmock-1.6.0.zip) = 2053682 bytes
-SHA1 (patch-Makefile.in) = e82f7d84f6e2662bd1e64af833fff5261c473fc3
-SHA1 (patch-configure) = b3721fc233d1e21e5b023f5bbad85e49333c6e3d
-SHA1 (patch-gtest_configure) = 74873f4bc13306bc39c1c6ad87b1c1bb66eb950d
-SHA1 (patch-include_gmock_internal_gmock-port.h) = 26fa64e6322b6e1611413c763cfc1b5034d7e69f
diff -r a980f004b2f8 -r e7b8cd9091ed devel/gmock/patches/patch-Makefile.in
--- a/devel/gmock/patches/patch-Makefile.in Tue Nov 01 15:32:54 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1.1.1 2011/07/29 15:18:29 ryoon Exp $
-
-* Enable 'make install'
-
---- Makefile.in.orig 2011-04-15 19:55:44.000000000 +0000
-+++ Makefile.in
-@@ -1202,14 +1202,14 @@ info: info-recursive
-
- info-am:
-
--install-data-am: install-data-local install-pkgincludeHEADERS \
-+install-data-am: install-pkgincludeHEADERS \
- install-pkginclude_internalHEADERS
-
- install-dvi: install-dvi-recursive
-
- install-dvi-am:
-
--install-exec-am: install-exec-local install-libLTLIBRARIES
-+install-exec-am: install-libLTLIBRARIES
-
- install-html: install-html-recursive
-
diff -r a980f004b2f8 -r e7b8cd9091ed devel/gmock/patches/patch-configure
--- a/devel/gmock/patches/patch-configure Tue Nov 01 15:32:54 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-configure,v 1.1.1.1 2011/07/29 15:18:29 ryoon Exp $
-
-* Improve compatibility.
-
---- configure.orig 2011-04-15 19:55:43.000000000 +0000
-+++ configure
-@@ -14896,7 +14896,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- have_pthreads="$acx_pthread_ok"
- fi
-- if test "x$have_pthreads" == "xyes"; then
-+ if test "x$have_pthreads" = "xyes"; then
- HAVE_PTHREADS_TRUE=
- HAVE_PTHREADS_FALSE='#'
- else
-@@ -14926,7 +14926,7 @@ else
- enable_external_gtest=yes
- fi
-
--if test "x$with_gtest" == "xno"; then :
-+if test "x$with_gtest" = "xno"; then :
- as_fn_error "Support for GoogleTest was explicitly disabled. Currently GoogleMock has a hard
- dependency upon GoogleTest to build, please provide a version, or allow
- GoogleMock to use any installed version and fall back upon its internal
diff -r a980f004b2f8 -r e7b8cd9091ed devel/gmock/patches/patch-gtest_configure
--- a/devel/gmock/patches/patch-gtest_configure Tue Nov 01 15:32:54 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-gtest_configure,v 1.1.1.1 2011/07/29 15:18:29 ryoon Exp $
-
-* Improve compatibility.
-
---- gtest/configure.orig 2011-04-15 19:55:40.000000000 +0000
-+++ gtest/configure
-@@ -14861,7 +14861,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- have_pthreads="$acx_pthread_ok"
- fi
-- if test "x$have_pthreads" == "xyes"; then
-+ if test "x$have_pthreads" = "xyes"; then
- HAVE_PTHREADS_TRUE=
- HAVE_PTHREADS_FALSE='#'
- else
diff -r a980f004b2f8 -r e7b8cd9091ed devel/gmock/patches/patch-include_gmock_internal_gmock-port.h
--- a/devel/gmock/patches/patch-include_gmock_internal_gmock-port.h Tue Nov 01 15:32:54 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-include_gmock_internal_gmock-port.h,v 1.1 2013/05/09 20:05:36 joerg Exp $
-
---- include/gmock/internal/gmock-port.h.orig 2013-05-03 18:26:57.000000000 +0000
-+++ include/gmock/internal/gmock-port.h
-@@ -50,6 +50,14 @@
- // tr1/tuple. gmock-port.h does this via gtest-port.h, which is
- // guaranteed to pull in the tuple header.
-
-+#if __cplusplus >= 201103L
-+namespace std {
-+ namespace tr1 {
-+ using ::std::make_tuple;
-+ }
-+}
-+#endif
-+
- // For MS Visual C++, check the compiler version. At least VS 2003 is
- // required to compile Google Mock.
- #if defined(_MSC_VER) && _MSC_VER < 1310
diff -r a980f004b2f8 -r e7b8cd9091ed doc/CHANGES-2016
--- a/doc/CHANGES-2016 Tue Nov 01 15:32:54 2016 +0000
+++ b/doc/CHANGES-2016 Tue Nov 01 15:32:59 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2016,v 1.4540 2016/11/01 15:32:07 wiz Exp $
+$NetBSD: CHANGES-2016,v 1.4541 2016/11/01 15:32:59 wiz Exp $
Changes to the packages collection and infrastructure in 2016:
@@ -6295,3 +6295,4 @@
Updated devel/google-glog to 0.3.4 [wiz 2016-11-01]
Updated devel/protobuf to 3.1.0nb1 [wiz 2016-11-01]
Updated textproc/FlightCrew to 0.7.2nb29 [wiz 2016-11-01]
+ Removed devel/gmock successor devel/googletest [wiz 2016-11-01]
diff -r a980f004b2f8 -r e7b8cd9091ed doc/TODO
--- a/doc/TODO Tue Nov 01 15:32:54 2016 +0000
+++ b/doc/TODO Tue Nov 01 15:32:59 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.16653 2016/11/01 14:58:02 adam Exp $
+$NetBSD: TODO,v 1.16654 2016/11/01 15:32:59 wiz Exp $
Suggested new packages
======================
@@ -740,7 +740,6 @@
o glom-1.14.2 [GNOME 2.26]
o gloox-1.0.14
o glx-utils-8.3.0
- o gmock-1.7.0
o gnet1-1.1.9
o gnetman-20050429
o gnome-3.22.1
Home |
Main Index |
Thread Index |
Old Index