diff options
| author | bodylove <bodylove@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-12-10 16:55:14 +0000 |
|---|---|---|
| committer | bodylove <bodylove@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-12-10 16:55:14 +0000 |
| commit | 78d58dd16a276d5a3547d2f681f5062415736c85 (patch) | |
| tree | afc555af4f4921251c3c4db4640b100f25179ae0 | |
| parent | 9e6cec0dd3301395345777cfe2617559a868f2a9 (diff) | |
| download | openocd+libswd-78d58dd16a276d5a3547d2f681f5062415736c85.tar.gz openocd+libswd-78d58dd16a276d5a3547d2f681f5062415736c85.tar.bz2 openocd+libswd-78d58dd16a276d5a3547d2f681f5062415736c85.tar.xz openocd+libswd-78d58dd16a276d5a3547d2f681f5062415736c85.zip | |
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
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | guess-rev.sh | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/openocd.c | 3 |
5 files changed, 19 insertions, 2 deletions
@@ -2,3 +2,4 @@ Dominic Rath <Dominic.Rath@gmx.de> Magnus Lundin <lundin@mlu.mine.nu> Michael Fischer <fischermi@t-online.de> Spencer Oliver <spen@spen-soft.co.uk> +Carsten Schlote <schlote@vahanus.net> diff --git a/configure.in b/configure.in index ade6785e..3802f60a 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 00000000..15cfff40 --- /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 512aade4..aa315506 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 81aae390..264823a4 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; |