diff options
| author | Michael Adam <obnox@samba.org> | 2018-09-04 01:23:01 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2018-09-05 00:56:31 +0200 |
| commit | 9f4ed46c0adf6ce6cb8dd44aff611448b64a37a7 (patch) | |
| tree | e91782c1343270743cd5b8376855019d50f8a7b7 | |
| parent | a662c11b8d106e0a2f3379b89739ed4770c5bbd3 (diff) | |
build: add new version mechanism based on VERSION file and a version.sh script
If this is a git checkout, and git is available, then git describe is
used. Otherwise, the new checked in VERSION file is taken for the version.
This mechanism uses a version.sh script inspired by
http://git.musl-libc.org/cgit/musl/tree/tools/version.sh
Signed-off-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | VERSION | 1 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rwxr-xr-x | scripts/version.sh | 15 |
5 files changed, 24 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index e9113c2..4a3ead6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,8 @@ SUBDIRS = \ etc \ docs \ m4macros \ - tests + tests \ + scripts # tools want this on a single line ACLOCAL_AMFLAGS = -I m4macros @@ -20,7 +21,8 @@ dist_doc_DATA = \ EXTRA_DIST = \ autogen.sh \ tinyproxy-indent.sh \ - TODO + TODO \ + VERSION test: all ./tests/scripts/run_tests.sh @@ -0,0 +1 @@ +1.10.0 diff --git a/configure.ac b/configure.ac index 48ee0b2..1e71e35 100644 --- a/configure.ac +++ b/configure.ac @@ -3,15 +3,7 @@ AC_PREREQ(2.54) -m4_define([tinyproxy_major_version], [1]) -m4_define([tinyproxy_minor_version], [10]) -m4_define([tinyproxy_micro_version], [0]) -m4_define([tinyproxy_real_version], - [tinyproxy_major_version.tinyproxy_minor_version.tinyproxy_micro_version]) -m4_define([tinyproxy_version], [tinyproxy_real_version]) - -# For overriding the version string. Comment out if not needed. -# m4_define([tinyproxy_version], [1.10.0]) +m4_define([tinyproxy_version], esyscmd(sh scripts/version.sh | tr -d '\n')) AC_INIT([Tinyproxy], [tinyproxy_version], [https://tinyproxy.github.io/], @@ -227,6 +219,7 @@ docs/man8/tinyproxy.txt m4macros/Makefile tests/Makefile tests/scripts/Makefile +scripts/Makefile ]) AC_OUTPUT diff --git a/scripts/Makefile.am b/scripts/Makefile.am new file mode 100644 index 0000000..4876c5d --- /dev/null +++ b/scripts/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ + version.sh diff --git a/scripts/version.sh b/scripts/version.sh new file mode 100755 index 0000000..9a965dc --- /dev/null +++ b/scripts/version.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +SCRIPT_DIR="$(cd "$(dirname "${0}")" && pwd)" +GIT_DIR="${SCRIPT_DIR}/../.git" + +if test -d "${GIT_DIR}" ; then + if type git >/dev/null 2>&1 ; then + git describe --match '[0-9]*.[0-9]*.[0-9]*' 2>/dev/null \ + | sed -e 's/-/-git-/' + else + sed 's/$/-git/' < VERSION + fi +else + cat VERSION +fi |