From patchwork Fri Dec 13 20:48:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: oscar.mateo@intel.com X-Patchwork-Id: 3342401 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 77706C0D4A for ; Fri, 13 Dec 2013 19:52:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9993720783 for ; Fri, 13 Dec 2013 19:52:21 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 49E4420780 for ; Fri, 13 Dec 2013 19:52:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C410CFB430; Fri, 13 Dec 2013 11:52:18 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 924C3FB430 for ; Fri, 13 Dec 2013 11:52:16 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 13 Dec 2013 11:52:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,481,1384329600"; d="scan'208";a="449760324" Received: from omateolo-linux2.isw.intel.com ([10.102.226.161]) by fmsmga002.fm.intel.com with ESMTP; 13 Dec 2013 11:52:15 -0800 From: oscar.mateo@intel.com To: intel-gfx@lists.freedesktop.org Date: Fri, 13 Dec 2013 20:48:24 +0000 Message-Id: <1386967704-17984-1-git-send-email-oscar.mateo@intel.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Intel-gfx] [PATCH] build: Create version and config information files in Android X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Oscar Mateo Also, skip the compilation of pm_lpsp in Android (uses Cairo) Signed-off-by: Oscar Mateo --- tests/Android.mk | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/tests/Android.mk b/tests/Android.mk index c96f30a..c65f94c 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -23,6 +23,33 @@ skip_lib_list := \ lib_list := $(filter-out $(skip_lib_list),$(libintel_tools_la_SOURCES)) LIB_SOURCES := $(addprefix lib/,$(lib_list)) +.PHONY: version.h.tmp + +$(LOCAL_PATH)/version.h.tmp: + @touch $@ + @if test -d .git; then \ + if which git > /dev/null; then git log -n 1 --oneline | \ + sed 's/^\([^ ]*\) .*/#define IGT_GIT_SHA1 "g\1"/' \ + >> $@ ; \ + fi \ + else \ + echo '#define IGT_GIT_SHA1 "NOT-GIT"' >> $@ ; \ + fi + +$(LOCAL_PATH)/version.h: $(LOCAL_PATH)/version.h.tmp + @echo "updating version.h" + @if ! cmp -s $(LOCAL_PATH)/version.h.tmp $(LOCAL_PATH)/version.h; then \ + mv $(LOCAL_PATH)/version.h.tmp $(LOCAL_PATH)/version.h ; \ + else \ + rm $(LOCAL_PATH)/version.h.tmp ; \ + fi + +# FIXME: autogenerate this info # +$(LOCAL_PATH)/config.h: + @echo "updating config.h" + echo '#define PACKAGE_VERSION "1.5"' >> $@ ; \ + echo '#define TARGET_CPU_PLATFORM "android-ia"' >> $@ ; + #================# define add_test @@ -31,7 +58,10 @@ define add_test LOCAL_SRC_FILES := \ tests/$1.c \ $(LIB_SOURCES) - + + LOCAL_GENERATED_SOURCES := \ + $(LOCAL_PATH)/version.h \ + $(LOCAL_PATH)/config.h LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/lib \ @@ -70,7 +100,8 @@ skip_tests_list := \ kms_setmode \ pm_pc8 \ gem_seqno_wrap \ - gem_render_copy + gem_render_copy \ + pm_lpsp tests_list := $(filter-out $(skip_tests_list),$(TESTS_progs) $(TESTS_progs_M) $(HANG) $(TESTS_testsuite))