From 78d58dd16a276d5a3547d2f681f5062415736c85 Mon Sep 17 00:00:00 2001 From: bodylove Date: Mon, 10 Dec 2007 16:55:14 +0000 Subject: [PATCH] Changed openocd version info creation to be more useful. - Now displays subversion revision and svn URL git-svn-id: svn://svn.berlios.de/openocd/trunk@220 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- AUTHORS | 1 + configure.in | 2 +- guess-rev.sh | 8 ++++++++ src/Makefile.am | 7 +++++++ src/openocd.c | 3 ++- 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100755 guess-rev.sh diff --git a/AUTHORS b/AUTHORS index 784716e372..b76564beae 100644 --- a/AUTHORS +++ b/AUTHORS @@ -2,3 +2,4 @@ Dominic Rath Magnus Lundin Michael Fischer Spencer Oliver +Carsten Schlote diff --git a/configure.in b/configure.in index ade6785e6b..3802f60ac0 100644 --- a/configure.in +++ b/configure.in @@ -222,7 +222,7 @@ else fi AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(openocd, 0.1) +AM_INIT_AUTOMAKE(openocd, 1.0) AM_CONDITIONAL(PARPORT, test $build_parport = yes) AM_CONDITIONAL(GIVEIO, test $parport_use_giveio = yes) diff --git a/guess-rev.sh b/guess-rev.sh new file mode 100755 index 0000000000..15cfff4008 --- /dev/null +++ b/guess-rev.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +REV=unknown + +which svnversion > /dev/null 2>&1 && REV=`svnversion` + +echo -n $REV + diff --git a/src/Makefile.am b/src/Makefile.am index 512aade460..aa31550621 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,6 +6,13 @@ INCLUDES = -I$(top_srcdir)/src/helper \ -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target -I$(top_srcdir)/src/xsvf -I$(top_srcdir)/src/server \ -I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes) +# pass path to prefix path +openocd_CPPFLAGS = \ + -DPKGLIBDIR=\"$(pkglibdir)\" \ + -DPKGBLDDATE=\"`date +%F-%R`\" \ + -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh`\" \ + @CPPFLAGS@ + # the library search path. openocd_LDFLAGS = $(all_libraries) SUBDIRS = helper jtag xsvf target server flash pld diff --git a/src/openocd.c b/src/openocd.c index 81aae3909d..264823a406 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#define OPENOCD_VERSION "Open On-Chip Debugger (2007-09-05 09:00 CEST)" +#define OPENOCD_VERSION "Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") svn:" PKGBLDREV #ifdef HAVE_CONFIG_H #include "config.h" @@ -91,6 +91,7 @@ int main(int argc, char *argv[]) DEBUG("log init complete"); INFO( OPENOCD_VERSION ); + INFO( "$URL: $"); cfg_cmd_ctx = copy_command_context(cmd_ctx); cfg_cmd_ctx->mode = COMMAND_CONFIG; -- 2.30.2