igt/build: Do not fail git build when there is no git
Subsystems (2)
PATCH 1/1 igt/build: Do not fail git build when there is no git
Git detection probably belongs to configure.ac with the version.h rule reworked accordingly. Feel free to drop this if someone wants to spend time on a better fix.
--- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Makefile.am +3 -1
@@ -41,9 +41,11 @@ MAINTAINERCLEANFILES = ChangeLog INSTALL version.h.tmp: @touch $@ @if test -d .git; then \ - if which git > /dev/null; then git log -n 1 --oneline | \ + 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"' >> $@ ; \
Signature · 1 line
1.9.1
The following patch includes the changes to fix building from a git repository without git being installed and also combines the version.h generation from the Autotools and Android build systems, so the changes do not have to be duplicated.
Thomas Wood (1):
build: improve version.h generation
.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
Signature · 1 line
1.9.3
PATCH 1/1 build: improve version.h generation
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.
--- .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
.gitignore +0 -1
@@ -84,7 +84,6 @@ cscope.* TAGS build-aux/ __pycache__ -version.h gtk-doc.make gtk-doc.m4
Makefile.am +0 -23
@@ -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:
lib/.gitignore new file +1 -0
@@ -0,0 +1 @@ +version.h
lib/Android.mk +1 -22
@@ -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 += \
lib/Makefile.sources +25 -0
@@ -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 +
lib/igt_aux.c +0 -1
@@ -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"
lib/ioctl_wrappers.c +0 -1
@@ -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"
tests/Makefile.am +0 -1
@@ -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)
Signature · 1 line
1.9.3