From patchwork Fri Jan 31 14:57:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rafael.barbalho@intel.com X-Patchwork-Id: 3563471 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 484269F381 for ; Fri, 31 Jan 2014 20:06:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 472AA20253 for ; Fri, 31 Jan 2014 20:06:41 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 836972024F for ; Fri, 31 Jan 2014 20:06:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E2C9210716D; Fri, 31 Jan 2014 12:06:32 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id E6056F9CFB for ; Fri, 31 Jan 2014 06:57:55 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 31 Jan 2014 06:57:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.95,758,1384329600"; d="scan'208";a="475830736" Received: from rbarbalh-linux.isw.intel.com ([10.102.226.47]) by orsmga002.jf.intel.com with ESMTP; 31 Jan 2014 06:57:54 -0800 From: rafael.barbalho@intel.com To: intel-gfx@lists.freedesktop.org Date: Fri, 31 Jan 2014 14:57:39 +0000 Message-Id: <1391180260-23101-5-git-send-email-rafael.barbalho@intel.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1391180260-23101-1-git-send-email-rafael.barbalho@intel.com> References: <1391180260-23101-1-git-send-email-rafael.barbalho@intel.com> Subject: [Intel-gfx] [PATCH 4/5] android: Add the generation of vesion.h & config.h to lib 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.8 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: Rafael Barbalho The lib directory is used by all the tests & tools so it should really be the place where the generate files are created. Signed-off-by: Rafael Barbalho --- lib/Android.mk | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/lib/Android.mk b/lib/Android.mk index 23c7d42..724d884 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -1,5 +1,34 @@ LOCAL_PATH := $(call my-dir) +GPU_TOOLS_PATH := $(LOCAL_PATH)/.. + +.PHONY: version.h.tmp + +$(GPU_TOOLS_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 + +$(GPU_TOOLS_PATH)/version.h: $(GPU_TOOLS_PATH)/version.h.tmp + @echo "updating version.h" + @if ! cmp -s $(GPU_TOOLS_PATH)/version.h.tmp $(GPU_TOOLS_PATH)/version.h; then \ + mv $(GPU_TOOLS_PATH)/version.h.tmp $(GPU_TOOLS_PATH)/version.h ; \ + else \ + rm $(GPU_TOOLS_PATH)/version.h.tmp ; \ + fi + +# FIXME: autogenerate this info # +$(GPU_TOOLS_PATH)/config.h: + @echo "updating config.h" + @echo '#define PACKAGE_VERSION "1.5"' >> $@ ; \ + echo '#define TARGET_CPU_PLATFORM "android-ia"' >> $@ ; + include $(LOCAL_PATH)/Makefile.sources skip_lib_list := \ @@ -12,6 +41,10 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(lib_list) +LOCAL_GENERATED_SOURCES := \ + $(GPU_TOOLS_PATH)/version.h \ + $(GPU_TOOLS_PATH)/config.h + LOCAL_C_INCLUDES += \ $(LOCAL_PATH)/..