diff options
| author | Jacob Bachmeyer <jcb@gnu.org> | 2020-11-09 21:59:21 -0600 |
|---|---|---|
| committer | Jacob Bachmeyer <jcb@gnu.org> | 2020-11-09 21:59:21 -0600 |
| commit | 2a33c9e6a64107f1455ecdd52ba0d8b52e5c6d71 (patch) | |
| tree | cd42a3be58f6b590f9027e75bd94f7fabeb99e03 | |
| parent | 3d62df24deedfb3c7c3e396a31b8ce431138eb49 (diff) | |
| download | dejagnu-2a33c9e6a64107f1455ecdd52ba0d8b52e5c6d71.zip dejagnu-2a33c9e6a64107f1455ecdd52ba0d8b52e5c6d71.tar.gz dejagnu-2a33c9e6a64107f1455ecdd52ba0d8b52e5c6d71.tar.bz2 | |
Revert "Add hook to put branch and evision in the version for development builds."
This reverts commit 1a76740eff41f63e64f1e65e930ad286f357362c.
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 9 insertions, 10 deletions
@@ -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 diff --git a/Makefile.am b/Makefile.am index fb75367..bd5b0fc 100644 --- a/Makefile.am +++ b/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 diff --git a/configure.ac b/configure.ac index 71bff39..40ee6cc 100644 --- a/configure.ac +++ b/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]) |