From bf00b9f49c1ed91e898e5c6f4bc93f7c483c651e Mon Sep 17 00:00:00 2001 From: Olaf Meeuwissen Date: Tue, 25 Jun 2019 21:54:37 +0900 Subject: [PATCH] Use git to put a version in configure CI has been using this for a long time. Now that generated files are no longer in the repository, new clones require autotools already and adding a git requirement doesn't seem like a big burden. --- .gitlab-ci.yml | 1 - README | 2 ++ configure.ac | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c56e59dc..cc169745d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,6 @@ prepare: stage: prepare script: - find -path ./.git -prune -o -type f | xargs tools/style-check.sh - - sed -i '/^AC_INIT/s/,.*/,m4_esyscmd_s([git describe --dirty]),/' configure.ac - ./autogen.sh - ./configure - make dist diff --git a/README b/README index 5b08ad197..a51683eba 100644 --- a/README +++ b/README @@ -71,6 +71,8 @@ the project's website at http://www.sane-project.org/. - gettext (>=0.19.8) + - git (>= 2.1.4) + SANE should build on most Unix-like systems. Support for OS/2, MacOS X, BeOS, and Microsoft Windows is also available. For more details look at the operating system specific README.* files. For a detailed support matrix, see: diff --git a/configure.ac b/configure.ac index b1f37cf08..65176f9c7 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl Set up autoconf and automake dnl When preparing a release, modify the numeric version components dnl and remove the git suffix. dnl ****************************************************************** -AC_INIT([sane-backends],[1.0.27git], +AC_INIT([sane-backends],m4_esyscmd_s([git describe --dirty]), [sane-devel@alioth-lists.debian.net]) AC_PREREQ([2.69]) dnl minimum autoconf version required AC_CONFIG_MACRO_DIR([m4])