Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add git commit to the reported version with -v #318

Merged
merged 1 commit into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,29 @@ if eval "test x$GCC = xyes"; then
CXXFLAGS="$CXXFLAGS -Wall -W -Wno-unused-parameter -fno-rtti -fno-exceptions -pedantic -std=c++11 -D_POSIX_C_SOURCE=200112L"
fi

dnl ----------------------------------
dnl Check if we can use the git commit
dnl ----------------------------------
git_ok=no
AC_CHECK_PROG(git_found, git, yes, no)
if test "x$git_found" = "xyes" ; then
AC_MSG_CHECKING([.git directory exists])
if test -d "$srcdir/.git"; then
AC_MSG_RESULT([yes])
AC_MSG_CHECKING(git describe works)
git_version=`git --work-tree="$srcdir" describe --dirty`
if test "x$git_version" = "x"; then
AC_MSG_RESULT(no)
else
git_ok=yes
AC_MSG_RESULT([yes ($git_version)])
fi
else
AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL([GIT_AVAILABLE], [test "x$git_ok" = "xyes"])

AC_SUBST(BASE_CUR_WORKING_DIR)
AC_SUBST(LIBJPEG_LIBS)
AC_SUBST(LIBJPEG_LDFLAGS)
Expand Down
16 changes: 16 additions & 0 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -138,5 +138,21 @@ dillo_SOURCES = \
xembed.cc \
xembed.hh

# https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html
nodist_dillo_SOURCES = commit.h
dillo.$(OBJEXT): commit.h
CLEANFILES = commit.h

if GIT_AVAILABLE
# Always rebuild
.PHONY: commit.h
commit.h:
printf '#define GIT_COMMIT "%s"\n' `git --work-tree="$(top_srcdir)" describe --dirty` > commit.h
else
# No need to rebuild
commit.h:
echo "" > commit.h
endif # GIT_AVAILABLE

dist_sysconf_DATA = domainrc keysrc hsts_preload
EXTRA_DIST = chg srch
9 changes: 8 additions & 1 deletion src/version.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/

#include "config.h"
#include "commit.h"

#include "djpeg.h"
#include "dpng.h"
Expand Down Expand Up @@ -114,7 +115,13 @@ static void print_features()

void a_Version_print_info(void)
{
printf("Dillo version " VERSION "\n");
const char *version = "v" VERSION;

#ifdef GIT_COMMIT
version = GIT_COMMIT;
#endif

printf("Dillo %s\n", version);
print_libs();
print_features();
}
Loading