Skip to content

Commit 91adda2

Browse files
committed
Avoid debian tags when generating gitrev.h
As suggested by George Rawlinson. closes anse1#46
1 parent 0547f1e commit 91adda2

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ configure_file(config_h.cmake.in config.h)
8383
# get our git tag
8484
set(GIT_TAG UNRELEASED)
8585
execute_process(
86-
COMMAND git describe --dirty --tags --always
86+
COMMAND git describe --exclude=debian* --dirty --tags --always
8787
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
8888
OUTPUT_VARIABLE GIT_TAG
8989
OUTPUT_STRIP_TRAILING_WHITESPACE

Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ EXTRA_DIST = gitrev.h dump.hh expr.hh grammar.hh log.hh prod.hh \
3131
dut.hh postgres.hh monetdb.hh log-v1.0-to-v1.2.sql boring_sqlstates.txt
3232

3333
gitrev.h: $(HEADERS) $(SOURCES)
34-
-if git describe --dirty --tags --always > /dev/null ; then \
35-
echo "#define GITREV \"$$(git describe --dirty --tags --always)\"" > $@ ;\
34+
-if git describe --exclude='debian*' --dirty --tags --always > /dev/null ; then \
35+
echo "#define GITREV \"$$(git describe --exclude='debian*' --dirty --tags --always)\"" > $@ ;\
3636
else \
3737
echo "#define GITREV \"unreleased\"" > $@ ;\
3838
fi

0 commit comments

Comments
 (0)