Skip to content

Commit

Permalink
Revertet to plain etags
Browse files Browse the repository at this point in the history
  • Loading branch information
schulzs committed Jun 2, 2019
1 parent 828ea52 commit ab67c8b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
8 changes: 6 additions & 2 deletions Makefile
Expand Up @@ -67,8 +67,12 @@ debug_config:
@cat Makefile.vars| \
gawk '/^NODEBUG/{print "NODEBUG = # -DNDEBUG -DFAST_EXIT";next}/^MEMDEBUG/{print "MEMDEBUG = -DCLB_MEMORY_DEBUG # -DCLB_MEMORY_DEBUG2";next}{print}' > __tmpmake__;mv __tmpmake__ Makefile.vars

commit_id:
echo '#define ECOMMITID "'`git rev-parse HEAD`'"' > PROVER/e_gitcommit.h


# Build a distribution
distrib: default_config man documentation cleandist
distrib: default_config commit_id man documentation cleandist
@echo "Did you think about: "
@echo " - Changing the bibliographies to local version"
@echo " - increasing the dev version number and committing to git?"
Expand Down Expand Up @@ -118,7 +122,7 @@ links: remove_links


tags:
etags.emacs25 `find . \( -name "*.[ch]" -or -name "*.py" \) -and \( -not -path "*include*" -and -not -name ".#*" \)`
etags `find . \( -name "*.[ch]" -or -name "*.py" \) -and \( -not -path "*include*" -and -not -name ".#*" \)`
#ctags-exuberant -e -R .
# etags */*.c */*.h
# cd PYTHON; make ptags
Expand Down
4 changes: 3 additions & 1 deletion PROVER/e_version.h
Expand Up @@ -8,7 +8,7 @@ Contents
Define global macro for version number and meta-information.
Copyright 2009-2018 by the authors (see DOC/CONTRIBUTORS).
Copyright 2009-2019 by the authors (see DOC/CONTRIBUTORS).
This code is released under the GNU General Public Licence and
the GNU Lesser General Public License.
See the file COPYING in the main E directory for details..
Expand Down Expand Up @@ -36,6 +36,8 @@ Contents

#define PVERSION "2.3_dev003"

#include "e_gitcommit.h"

#ifdef ENABLE_LFHO
#define LFH "-ho"
#else
Expand Down
4 changes: 2 additions & 2 deletions PROVER/eprover.c
Expand Up @@ -209,7 +209,7 @@ static void print_info(void)
}
if(print_version)
{
fprintf(GlobalOut, "# Version: " VERSION "\n");
fprintf(GlobalOut, "# Version: %s\n", VERSION);
fflush(GlobalOut);
}
}
Expand Down Expand Up @@ -873,7 +873,7 @@ CLState_p process_options(int argc, char* argv[])
print_help(stdout);
exit(NO_ERROR);
case OPT_VERSION:
fprintf(stdout, "E " VERSION " " E_NICKNAME "\n");
fprintf(stdout, "E %s %s %s\n", VERSION, E_NICKNAME, ECOMMITID);
exit(NO_ERROR);
case OPT_OUTPUT:
outname = arg;
Expand Down

0 comments on commit ab67c8b

Please sign in to comment.