Browse Source

Revert "Add hook to put branch and evision in the version for development builds."

This reverts commit 1a76740eff.

This caused problems (reported in PR44462 as a secondary issue)
when a source tree is copied out of a Git directory.  A better
solution will be developed for the 1.6.4 release that also tags
development versions when run from Git working directories without
relying on an installation hook.

The problem can be demonstrated with:
    git -z ls-files | cpio -0dp /tmp/dejagnu-test-src
followed by configuring in that non-Git copy of the source tree.
dejagnu-1.6.3
Jacob Bachmeyer 6 years ago
parent
commit
2a33c9e6a6
  1. 8
      ChangeLog
  2. 4
      Makefile.am
  3. 7
      configure.ac

8
ChangeLog

@ -1,3 +1,11 @@
2020-11-09 Jacob Bachmeyer <jcb@gnu.org>
* configure.ac: Revert development version branch tagging hook.
* Makefile.am: Likewise.
These caused failures (reported in PR44462 as a secondary issue)
when a source tree is copied out of a Git directory.
2020-08-31 Jacob Bachmeyer <jcb@gnu.org>
* doc/runtest.1: Add brief GFDL notice. License notice in the

4
Makefile.am

@ -233,7 +233,3 @@ dejagnu_TEXINFOS = doc/fdl.texi
pip-install:
pip3 install --upgrade -e $(top_srcdir)
install-data-hook:
revision=`cd $(srcdir) && git rev-parse --short HEAD` \
&& sed -i -e "s/^set *frame_version.*/set frame_version $(BRANCH)-$${revision}/" $(pkgdatadir)/runtest.exp

7
configure.ac

@ -59,11 +59,6 @@ then
DEJAGNU="/dev/null"
fi
AC_SUBST(DEJAGNU)
# See what branch we're in
# FIXME: this will need to deal with a release branch and
# do something different
BRANCH=$(cd ${srcdir} && git branch | grep '^\*' | cut -d ' ' -f 2)
AC_SUBST(BRANCH)
dnl Makefile.am arranges for DEJAGNU to be exported in the environment.
AC_OUTPUT([Makefile])

Loading…
Cancel
Save