auto-extract repo revs from svn or git as needed - closes issue #5
This commit is contained in:
parent
a5739673e7
commit
f4d9539c4b
|
@ -22,4 +22,4 @@
|
|||
#include "config.h"
|
||||
#include <Globals.h>
|
||||
|
||||
const char *gVersionString = "release " VERSION " built " TIMESTAMP_ISO " rev" SVN_REV " ";
|
||||
const char *gVersionString = "release " VERSION " built " TIMESTAMP_ISO " " REPO_REV " ";
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
#!/bin/sh
|
||||
cd $1
|
||||
|
||||
INFO=""
|
||||
if [ -d ./.svn ]; then
|
||||
INFO="r$(svn info . | grep "Last Changed Rev:" | cut -d " " -f 4) CommonLibs:r$(svn info ./CommonLibs | grep "Last Changed Rev:" | cut -d " " -f 4)"
|
||||
elif [ -d ./.git ]; then
|
||||
INFO="$(git rev-parse --short=10 HEAD) CommonLibs:$(cd CommonLibs; git rev-parse --short=10 HEAD)"
|
||||
fi
|
||||
|
||||
echo $INFO
|
|
@ -31,10 +31,10 @@ NODEMANAGER_INCLUDEDIR = $(top_srcdir)/NodeManager
|
|||
JSONBOX_INCLUDEDIR = $(top_srcdir)/NodeManager/JsonBox-0.4.3/include
|
||||
JSONDB_INCLUDEDIR = $(top_srcdir)/NodeManager/JSONDB
|
||||
|
||||
SVNDEV = -D'SVN_REV="$(shell svn info $(top_builddir) | grep "Last Changed Rev:" | cut -d " " -f 4) CommonLibs:rev$(shell svn info $(top_builddir)/CommonLibs | grep "Last Changed Rev:" | cut -d " " -f 4)"'
|
||||
REPOREV = -D'REPO_REV="$(shell ./$(top_builddir)/Globals/GrabRepoInfo.sh $(top_builddir))"'
|
||||
|
||||
STD_DEFINES_AND_INCLUDES = \
|
||||
$(SVNDEV) \
|
||||
$(REPOREV) \
|
||||
-I$(COMMON_INCLUDEDIR) \
|
||||
-I$(GLOBALS_INCLUDEDIR) \
|
||||
-I$(NODEMANAGER_INCLUDEDIR) \
|
||||
|
|
Loading…
Reference in New Issue