diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | bootstrap | 45 | ||||
| -rw-r--r-- | configure.ac (renamed from configure.ac.in) | 4 | ||||
| -rwxr-xr-x | version.sh | 34 |
4 files changed, 40 insertions, 45 deletions
diff --git a/Makefile.am b/Makefile.am index 42921b3..0eca29c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ libtool: $(LIBTOOL_DEPS) $(SHELL) ./config.status libtool -EXTRA_DIST = bootstrap configure.ac.in $(srcdir)/m4 +EXTRA_DIST = version.sh configure.ac $(srcdir)/m4 MAINTAINERCLEANFILES = aclocal.m4 config.* configure configure.ac depcomp \ install-sh ltmain.sh Makefile.in missing ylwrap $(PACKAGE)-*.gz @@ -1,44 +1,3 @@ -#! /bin/bash -# bootstrap -- Use this script to create generated files from a VCS checkout -# +#!/bin/sh -version= - -if [ "$1" ]; then - version=$1 -elif head=$(git rev-parse --short --verify HEAD 2>/dev/null); then - - # If available, use the git commit revision for the package version. - - # Add a date prefix for easy reading. - # date='2010-11-30 16:36:09 -0800' - - date=$(git log --pretty=format:"%ci" -1 HEAD) - date=${date##20} - date=${date%%:[0-9][0-9] *} - date=${date//-/.} - date=${date// /.} - date=${date//:/.} - - version=$(printf '%s-%s%s' ${date} g ${head}) - - # Add a '-dirty' postfix for uncommitted changes. - - if git diff-index HEAD | read dummy; then - version=`printf '%s%s' ${version} -dirty` - fi -else - # Default to current date and time. - - version="dev-$(date +%y.%m.%d-%H.%M.%S)" -fi - -set -x - -sed -e s,@version@,${version},g configure.ac.in > configure.ac - -aclocal -libtoolize --force --copy -autoheader -automake --add-missing --copy -autoconf +exec autoreconf -f -i diff --git a/configure.ac.in b/configure.ac index 332c718..3d2ec18 100644 --- a/configure.ac.in +++ b/configure.ac @@ -14,7 +14,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -AC_INIT([petitboot], [@version@], [Geoff Levand <geoff@infradead.org>]) +AC_INIT([petitboot], + [m4_esyscmd_s([./version.sh])], + [Geoff Levand <geoff@infradead.org>]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/version.sh b/version.sh new file mode 100755 index 0000000..eed8d3a --- /dev/null +++ b/version.sh @@ -0,0 +1,34 @@ +#! /bin/bash +# +# version.sh: create a version string for use by configure.ac + +version= + +if head=$(git rev-parse --short --verify HEAD 2>/dev/null); then + + # If available, use the git commit revision for the package version. + + # Add a date prefix for easy reading. + # date='2010-11-30 16:36:09 -0800' + + date=$(git log --pretty=format:"%ci" -1 HEAD) + date=${date##20} + date=${date%%:[0-9][0-9] *} + date=${date//-/.} + date=${date// /.} + date=${date//:/.} + + version=$(printf '%s-%s%s' ${date} g ${head}) + + # Add a '-dirty' postfix for uncommitted changes. + + if git diff-index HEAD | read dummy; then + version=`printf '%s%s' ${version} -dirty` + fi +else + # Default to current date and time. + + version="dev-$(date +%y.%m.%d-%H.%M.%S)" +fi + +echo $version |
