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.
merge-requests/87/head
Olaf Meeuwissen 2019-06-25 21:54:37 +09:00
rodzic 2ab39228b9
commit bf00b9f49c
3 zmienionych plików z 3 dodań i 2 usunięć

Wyświetl plik

@ -18,7 +18,6 @@ prepare:
stage: prepare stage: prepare
script: script:
- find -path ./.git -prune -o -type f | xargs tools/style-check.sh - 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 - ./autogen.sh
- ./configure - ./configure
- make dist - make dist

2
README
Wyświetl plik

@ -71,6 +71,8 @@ the project's website at http://www.sane-project.org/.
- gettext (>=0.19.8) - gettext (>=0.19.8)
- git (>= 2.1.4)
SANE should build on most Unix-like systems. Support for OS/2, MacOS X, BeOS, 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 and Microsoft Windows is also available. For more details look at the
operating system specific README.* files. For a detailed support matrix, see: operating system specific README.* files. For a detailed support matrix, see:

Wyświetl plik

@ -5,7 +5,7 @@ dnl Set up autoconf and automake
dnl When preparing a release, modify the numeric version components dnl When preparing a release, modify the numeric version components
dnl and remove the git suffix. dnl and remove the git suffix.
dnl ****************************************************************** dnl ******************************************************************
AC_INIT([sane-backends],[1.0.27git], AC_INIT([sane-backends],m4_esyscmd_s([git describe --dirty]),
[sane-devel@alioth-lists.debian.net]) [sane-devel@alioth-lists.debian.net])
AC_PREREQ([2.69]) dnl minimum autoconf version required AC_PREREQ([2.69]) dnl minimum autoconf version required
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])