From b000a9cf29c824e234be3543acdd8fbd0cda58ba Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Fri, 3 Jan 2025 12:55:02 +0000 Subject: [PATCH] Use release_tag.h instead of version_tag.h for snapshots/releases. Now we publish releases on GitHub, we need to commit the file to the repository when making a snapshot or release, so we need to use a different filename to the one that is automatically generated by 'git describe' (which we still want git to ignore). --- Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index ba515a38b..8f2c01d32 100644 --- a/Makefile.in +++ b/Makefile.in @@ -283,7 +283,7 @@ iverilog-vpi.pdf: iverilog-vpi.ps $(PS2PDF) iverilog-vpi.ps iverilog-vpi.pdf # For VERSION_TAG in driver/main.c, first try git-describe, then look for a -# version_tag.h file in the source tree (included in snapshots and releases), +# release_tag.h file in the source tree (included in snapshots and releases), # and finally use nothing. # "true" and "false" in the next few lines are Unix shell command names @@ -298,9 +298,9 @@ version_tag.h version: tmp=`(cd $(srcdir) && $(GIT) describe --always --dirty) \ | sed -e 's;\(.*\);#define VERSION_TAG "\1";'`; \ echo "$$tmp" | diff - version_tag.h > /dev/null 2>&1 || echo "$$tmp" > version_tag.h || exit 1; \ - elif test -r $(srcdir)/version_tag.h; then \ - echo "Using $(srcdir)/version_tag.h for VERSION_TAG"; \ - diff $(srcdir)/version_tag.h version_tag.h > /dev/null 2>&1 || cp $(srcdir)/version_tag.h version_tag.h; \ + elif test -r $(srcdir)/release_tag.h; then \ + echo "Using $(srcdir)/release_tag.h for VERSION_TAG"; \ + diff $(srcdir)/release_tag.h version_tag.h > /dev/null 2>&1 || cp $(srcdir)/release_tag.h version_tag.h; \ else \ echo "Using empty VERSION_TAG"; \ echo '#define VERSION_TAG ""' > version_tag.h; \