Changeset: bf509ae78d27 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf509ae78d27
Modified Files:
rpm.mk.in
Branch: default
Log Message:
Version string should contain the native vcs commit id
It's more useful to report git commit ids when using git.
diffs (16 lines):
diff --git a/rpm.mk.in b/rpm.mk.in
--- a/rpm.mk.in
+++ b/rpm.mk.in
@@ -42,11 +42,8 @@ monetdb_hgversion.h: always
mv -f monetdb_hgversion.h.new monetdb_hgversion.h; \
fi; \
elif [ -e "$(srcdir)"/.git ]; then \
- hgid=`(cd "$(srcdir)"; git log -1 | sed -n '/Notes (hg):/,$$p'
| grep -v Notes | sed 's/^ \+\(............\).*/\1/') 2>/dev/null`; \
+ hgid="`(cd "$(srcdir)"; git rev-parse --short HEAD)` (git)"; \
dirty=`(cd "$(srcdir)"; [[ -z $$(git status -s) ]] || echo
"+")`; \
- if [ -z "$${hgid}" ]; then \
- hgid="`(cd "$(srcdir)"; git rev-parse --short HEAD)`
(git)"; \
- fi; \
echo "#define MERCURIAL_ID \"$$hgid$$dirty\"" >
monetdb_hgversion.h.new; \
if [ -f monetdb_hgversion.h ] && cmp -s monetdb_hgversion.h
monetdb_hgversion.h.new; then \
rm -f monetdb_hgversion.h.new; \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
