From patchwork Tue Jul 22 13:53:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 4602991 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 CCD039F433 for ; Tue, 22 Jul 2014 13:53:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D553720109 for ; Tue, 22 Jul 2014 13:53:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B93F920142 for ; Tue, 22 Jul 2014 13:53:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 22E436E2CB; Tue, 22 Jul 2014 06:53:27 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f170.google.com (mail-we0-f170.google.com [74.125.82.170]) by gabe.freedesktop.org (Postfix) with ESMTP id BF0686E2CB for ; Tue, 22 Jul 2014 06:53:25 -0700 (PDT) Received: by mail-we0-f170.google.com with SMTP id w62so9256446wes.29 for ; Tue, 22 Jul 2014 06:53:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=36feGQLdltXJVk1SU8zMaDKqt7J3EsRo+ZyoQSaoxWc=; b=Iz7nsKkeixvd3fgnBe+5EmchErq8w5W/aWcvvV5YKNxFBwbBfVPxl2l5yUt/xd5tSY zut8BnUO8GgV7jcnjIS1ccuH0Cmadvqt8BWuJFJada9jjslaSQBTVN+xMhZ6JL5q93ml 4tOSkHUQVffnLOg9F9b6LVU1M2l9gjToPC1+ANADeyJ+E7QSZEUHmVHLSiQqO53Hsps0 D8epL02xT3zsgqq7jL4nXSqL/I6m6/5RAkYcXzDCJvCtrSYJTYW4szS1RDwe6xvlUdQW FAY2gfXfk3yR99GHPUZMry8rOKOFi2UOQTH9haWMI0M8riVMT/JZ3NEm6cf21bf6cRsV bW/Q== X-Gm-Message-State: ALoCoQk8n5ir0Q673cHi85J8sZunJwrqsRWp8HKWgHTtVfxScuaFinq6n5M95dMNngpAAKyquCOq X-Received: by 10.180.24.66 with SMTP id s2mr14767324wif.33.1406037202765; Tue, 22 Jul 2014 06:53:22 -0700 (PDT) Received: from pistachio.icx.intel.com ([83.217.123.106]) by mx.google.com with ESMTPSA id lk7sm1170470wjb.24.2014.07.22.06.53.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Jul 2014 06:53:21 -0700 (PDT) From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Tue, 22 Jul 2014 14:53:18 +0100 Message-Id: <1406037198-13188-2-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1406037198-13188-1-git-send-email-thomas.wood@intel.com> References: <1405945687-23831-1-git-send-email-tvrtko.ursulin@linux.intel.com> <1406037198-13188-1-git-send-email-thomas.wood@intel.com> Subject: [Intel-gfx] [PATCH] build: improve version.h generation X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 Move version.h generation into lib/Makefile.sources so that it can be shared between the Autotools and Android build systems. Also make sure the "updating version.h" message is only displayed when version.h actually changes and remove unnecessary includes of version.h. This also includes changes from Tvrtko Ursulin to prevent a build from within the git repository failing when git is not available. Signed-off-by: Thomas Wood Cc: Tvrtko Ursulin --- .gitignore | 1 - Makefile.am | 23 ----------------------- lib/.gitignore | 1 + lib/Android.mk | 23 +---------------------- lib/Makefile.sources | 25 +++++++++++++++++++++++++ lib/igt_aux.c | 1 - lib/ioctl_wrappers.c | 1 - tests/Makefile.am | 1 - 8 files changed, 27 insertions(+), 49 deletions(-) create mode 100644 lib/.gitignore diff --git a/.gitignore b/.gitignore index f40b4f6..a438c1c 100644 --- a/.gitignore +++ b/.gitignore @@ -84,7 +84,6 @@ cscope.* TAGS build-aux/ __pycache__ -version.h gtk-doc.make gtk-doc.m4 diff --git a/Makefile.am b/Makefile.am index 9949679..1dacb17 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,29 +37,6 @@ endif MAINTAINERCLEANFILES = ChangeLog INSTALL -.PHONY: version.h.tmp -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 - -version.h: version.h.tmp - @echo "updating version.h" - @if ! cmp -s version.h.tmp version.h; then \ - mv version.h.tmp version.h ;\ - else \ - rm version.h.tmp ;\ - fi - -BUILT_SOURCES = version.h -CLEANFILES = version.h version.h.tmp - .PHONY: ChangeLog INSTALL INSTALL: diff --git a/lib/.gitignore b/lib/.gitignore new file mode 100644 index 0000000..6702033 --- /dev/null +++ b/lib/.gitignore @@ -0,0 +1 @@ +version.h diff --git a/lib/Android.mk b/lib/Android.mk index 5709aec..6f444a0 100644 --- a/lib/Android.mk +++ b/lib/Android.mk @@ -2,27 +2,6 @@ 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" @@ -34,7 +13,7 @@ include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) LOCAL_GENERATED_SOURCES := \ - $(GPU_TOOLS_PATH)/version.h \ + $(GPU_TOOLS_PATH)/lib/version.h \ $(GPU_TOOLS_PATH)/config.h LOCAL_C_INCLUDES += \ diff --git a/lib/Makefile.sources b/lib/Makefile.sources index 8c6c4dc..2d971c5 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -47,3 +47,28 @@ libintel_tools_la_SOURCES = \ igt_core.h \ $(NULL) +.PHONY: version.h.tmp +version.h.tmp: + @touch $@ + @if test -d $(top_srcdir)/.git; then \ + if which git > /dev/null 2>&1; then git log -n 1 --oneline | \ + sed 's/^\([^ ]*\) .*/#define IGT_GIT_SHA1 "g\1"/' \ + >> $@ ; \ + else \ + echo '#define IGT_GIT_SHA1 "NO-GIT"' >> $@ ; \ + fi \ + else \ + echo '#define IGT_GIT_SHA1 "NOT-GIT"' >> $@ ; \ + fi + +version.h: version.h.tmp + @if ! cmp -s version.h.tmp version.h; then \ + echo "updating version.h"; \ + mv version.h.tmp version.h ;\ + else \ + rm version.h.tmp ;\ + fi + +BUILT_SOURCES = version.h +CLEANFILES = version.h version.h.tmp + diff --git a/lib/igt_aux.c b/lib/igt_aux.c index 7b277be..2e8191e 100644 --- a/lib/igt_aux.c +++ b/lib/igt_aux.c @@ -53,7 +53,6 @@ #include "intel_chipset.h" #include "igt_aux.h" #include "igt_debugfs.h" -#include "version.h" #include "config.h" #include "intel_reg.h" #include "ioctl_wrappers.h" diff --git a/lib/ioctl_wrappers.c b/lib/ioctl_wrappers.c index 67351af..3bce1a9 100644 --- a/lib/ioctl_wrappers.c +++ b/lib/ioctl_wrappers.c @@ -54,7 +54,6 @@ #include "intel_chipset.h" #include "intel_io.h" #include "igt_debugfs.h" -#include "version.h" #include "config.h" #include "ioctl_wrappers.h" diff --git a/tests/Makefile.am b/tests/Makefile.am index e207509..a2fba51 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -36,7 +36,6 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ -I$(srcdir)/../lib \ -include "$(srcdir)/../lib/check-ndebug.h" \ - -include "$(top_builddir)/version.h" \ -DIGT_DATADIR=\""$(abs_srcdir)"\" \ $(NULL)