From patchwork Thu Jul 23 20:39:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 499521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 96AC6140D4D for ; Fri, 24 Jul 2015 06:39:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DA5AB33755; Thu, 23 Jul 2015 20:39:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RtiAR-xEu4LS; Thu, 23 Jul 2015 20:39:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id DE12433874; Thu, 23 Jul 2015 20:39:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 00E451BFA6C for ; Thu, 23 Jul 2015 20:39:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EF363957E8 for ; Thu, 23 Jul 2015 20:39:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DA3NUa4xel6I for ; Thu, 23 Jul 2015 20:39:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.datacom.ind.br (mx.datacom.ind.br [177.66.5.10]) by hemlock.osuosl.org (Postfix) with ESMTPS id BADB0957E5 for ; Thu, 23 Jul 2015 20:39:34 +0000 (UTC) Received: from mail.datacom.ind.br (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTPS id 393F119C198D; Thu, 23 Jul 2015 17:38:39 -0300 (BRT) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTP id 2893419C1772; Thu, 23 Jul 2015 17:38:39 -0300 (BRT) Received: from mail.datacom.ind.br ([127.0.0.1]) by localhost (mail.datacom.ind.br [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 5IYrwQgRtzWr; Thu, 23 Jul 2015 17:38:39 -0300 (BRT) Received: from buildroot.ped.datacom.ind.br (unknown [172.26.20.80]) by mail.datacom.ind.br (Postfix) with ESMTP id 0AA1419C1864; Thu, 23 Jul 2015 17:38:39 -0300 (BRT) From: Carlos Santos To: buildroot@buildroot.org Date: Thu, 23 Jul 2015 17:39:30 -0300 Message-Id: <1437683970-38663-1-git-send-email-casantos@datacom.ind.br> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1431713119-2821-1-git-send-email-casantos@datacom.ind.br> References: <1431713119-2821-1-git-send-email-casantos@datacom.ind.br> Subject: [Buildroot] [PATCH V3 1/1] gmock: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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. http://code.google.com/p/googlemock/ There are both host and target packages. The target one has include files required to compile the tests and the static libraries required to link/run them. The host package installs gmock_gen, a Python script used to generate code mocks. Notice that GMock 1.7.0 requires the Python 2 host package even if Python 3 is selected as a target package. Signed-off-by: Marcelo Barbosa Signed-off-by: Carlos Santos --- package/Config.in | 1 + package/gmock/0001-fuse_gtest_files-python2.patch | 8 ++++ package/gmock/0002-gmock_gen-python2.patch | 8 ++++ package/gmock/Config.in | 31 +++++++++++++ package/gmock/gmock.hash | 2 + package/gmock/gmock.mk | 56 +++++++++++++++++++++++ package/gtest/gtest.mk | 1 + 7 files changed, 107 insertions(+) create mode 100644 package/gmock/0001-fuse_gtest_files-python2.patch create mode 100644 package/gmock/0002-gmock_gen-python2.patch create mode 100644 package/gmock/Config.in create mode 100644 package/gmock/gmock.hash create mode 100644 package/gmock/gmock.mk diff --git a/package/Config.in b/package/Config.in index 9942e3a..c95bfe6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1042,6 +1042,7 @@ menu "Other" source "package/gflags/Config.in" source "package/glibmm/Config.in" source "package/glm/Config.in" + source "package/gmock/Config.in" source "package/gmp/Config.in" source "package/gsl/Config.in" source "package/gtest/Config.in" diff --git a/package/gmock/0001-fuse_gtest_files-python2.patch b/package/gmock/0001-fuse_gtest_files-python2.patch new file mode 100644 index 0000000..dc0096e --- /dev/null +++ b/package/gmock/0001-fuse_gtest_files-python2.patch @@ -0,0 +1,8 @@ +--- ./gtest/scripts/fuse_gtest_files.py.orig 2013-09-18 14:48:30.000000000 -0300 ++++ ./gtest/scripts/fuse_gtest_files.py 2015-07-22 15:42:53.291591205 -0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2009, Google Inc. + # All rights reserved. diff --git a/package/gmock/0002-gmock_gen-python2.patch b/package/gmock/0002-gmock_gen-python2.patch new file mode 100644 index 0000000..9015a22 --- /dev/null +++ b/package/gmock/0002-gmock_gen-python2.patch @@ -0,0 +1,8 @@ +--- ./scripts/generator/gmock_gen.py.orig 2013-09-18 14:50:15.000000000 -0300 ++++ ./scripts/generator/gmock_gen.py 2015-07-22 17:06:51.071815634 -0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2008 Google Inc. All Rights Reserved. + # diff --git a/package/gmock/Config.in b/package/gmock/Config.in new file mode 100644 index 0000000..d792945 --- /dev/null +++ b/package/gmock/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_GMOCK + bool "gmock" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # fork() + help + 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. + + http://code.google.com/p/googlemock/ + + There are both host and target packages. The target one has include + files required to compile the tests and the static libraries required + to link/run them. The host package installs gmock_gen, a Python script + used to generate code mocks. + +comment "gmock needs a toolchain w/ C++, wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/gmock/gmock.hash b/package/gmock/gmock.hash new file mode 100644 index 0000000..2b71739 --- /dev/null +++ b/package/gmock/gmock.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b gmock-1.7.0.zip diff --git a/package/gmock/gmock.mk b/package/gmock/gmock.mk new file mode 100644 index 0000000..aad2183 --- /dev/null +++ b/package/gmock/gmock.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# gmock +# +################################################################################ + +# Make sure this remains the same version as the gtest one +GMOCK_VERSION = 1.7.0 +GMOCK_SOURCE = gmock-$(GMOCK_VERSION).zip +GMOCK_SITE = http://googlemock.googlecode.com/files +GMOCK_INSTALL_STAGING = YES +GMOCK_INSTALL_TARGET = NO +GMOCK_LICENSE = BSD-3c +GMOCK_LICENSE_FILES = LICENSE +GMOCK_DEPENDENCIES = gtest host-gmock + +# GMock 1.7.0 relies on Python 2.7 syntax which is NOT compatible with Python3. +HOST_GMOCK_DEPENDENCIES = host-python +HOST_GMOCK_PYTHONPATH=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages + +GMOCK_CONF_OPTS = --enable-static --disable-shared + +define GMOCK_EXTRACT_CMDS + $(UNZIP) $(DL_DIR)/$(GMOCK_SOURCE) -d $(BUILD_DIR) +endef + +# We can't use the default rule for autotools-package staging because it fails +# because it tries to rebuild/install gtest stuff and fails after this error: +# "'make install' is dangerous and not supported. Instead, see README for +# how to integrate Google Test into your build system." +define GMOCK_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0755 $(@D)/lib/.libs/libgmock.a $(STAGING_DIR)/usr/lib/libgmock.a + $(INSTALL) -D -m 0755 $(@D)/lib/.libs/libgmock_main.a $(STAGING_DIR)/usr/lib/libgmock_main.a + $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/gmock/ + cp -rp $(@D)/include/gmock/* $(STAGING_DIR)/usr/include/gmock/ +endef + +# Unzipping inside $(@D) and moving everything from the created subdirectory is +# required because unzipping directly in $(BUILD_DIR) would cause host-gmock to +# overwrite the gmock subdir instead of unzipping in a host-gmock subdir. +define HOST_GMOCK_EXTRACT_CMDS + $(UNZIP) $(DL_DIR)/$(GMOCK_SOURCE) -d $(@D) + mv $(@D)/gmock-$(GMOCK_VERSION)/* $(@D) + rmdir $(@D)/gmock-$(GMOCK_VERSION) +endef + +define HOST_GMOCK_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/scripts/generator/gmock_gen.py $(HOST_DIR)/usr/bin/gmock_gen.py + ln -sf gmock_gen.py $(HOST_DIR)/usr/bin/gmock_gen + cp -rp $(@D)/scripts/generator/cpp $(HOST_GMOCK_PYTHONPATH) +endef + +$(eval $(autotools-package)) +# The host package does not build anything, just installs gmock_gen stuff, so +# it does not need to be a host-autotools-package. +$(eval $(host-generic-package)) diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk index 562acf0..da08621 100644 --- a/package/gtest/gtest.mk +++ b/package/gtest/gtest.mk @@ -4,6 +4,7 @@ # ################################################################################ +# Make sure this remains the same version as the gmock one GTEST_VERSION = 1.7.0 GTEST_SOURCE = gtest-$(GTEST_VERSION).zip GTEST_SITE = http://googletest.googlecode.com/files