1
0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00

Use git tools instead of cogito for getting the build ID

The build ID now includes both last tagged version, commit generation
since last tagged version, as well as the leading characters of the
commit ID and a flag for dirty working tree.
This commit is contained in:
Jonas Fonseca 2008-01-22 13:21:29 +01:00
parent 5999d1ef06
commit c2a0d3b969
3 changed files with 6 additions and 4 deletions

View File

@ -53,7 +53,7 @@ ASCIIDOC_FLAGS = @ASCIIDOC_FLAGS@
AWK = @AWK@ AWK = @AWK@
CATALOGS = @CATALOGS@ CATALOGS = @CATALOGS@
CC = @CC@ CC = @CC@
CG_COMMIT_ID = @CG_COMMIT_ID@ GIT = @GIT@
CONFDIR = @CONFDIR@ CONFDIR = @CONFDIR@
GLIBC21 = @GLIBC21@ GLIBC21 = @GLIBC21@
GMOFILES = @GMOFILES@ GMOFILES = @GMOFILES@

View File

@ -55,7 +55,7 @@ AC_PATH_PROGS(AWK, "$AWK")
AC_PROG_RANLIB AC_PROG_RANLIB
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PATH_PROGS(CG_COMMIT_ID, "cg-commit-id") AC_PATH_PROGS(GIT, "git")
AC_PATH_PROGS(SPARSE, "sparse") AC_PATH_PROGS(SPARSE, "sparse")
CONFIG_ASCIIDOC="no" CONFIG_ASCIIDOC="no"

View File

@ -28,8 +28,10 @@ SUBDIRS = \
viewer viewer
# Get the GIT HEAD ID if possible # Get the GIT HEAD ID if possible
ifdef CG_COMMIT_ID ifdef GIT
BUILD_ID=$(shell GIT_DIR=$(top_srcdir)/.git $(CG_COMMIT_ID) 2> /dev/null) GITDESC = $(shell $(GIT) --git-dir=$(top_srcdir)/.git describe 2>/dev/null)
WTDIRTY = $(shell $(GIT) --git-dir=$(top_srcdir)/.git diff-index HEAD 2>/dev/null)
BUILD_ID = $(subst elinks-,,$(GITDESC))$(if $(WTDIRTY),-dirty)
endif endif
INCLUDES += -DBUILD_ID="\"$(BUILD_ID)\"" INCLUDES += -DBUILD_ID="\"$(BUILD_ID)\""