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

diff --git a/AUTHORS b/AUTHORS
index 784716e3722d95f9e0c8038214512a4f64b79590..b76564beae5140e9a8627e96e344535568a67fa8 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -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>
 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 ade6785e6b9b73232d3f7c7d0c0fe1c7d01119a6..3802f60ac0d9c56a54c18135bed73953b23bfb72 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -222,7 +222,7 @@ else
 fi
 
 AM_CONFIG_HEADER(config.h)
 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)
 
 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 (executable)
index 0000000..15cfff4
--- /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 512aade46026eca2dd39b8c06735970d837802d1..aa3155062173c0106897d21b0d3bd0c9c77eaec9 100644 (file)
--- 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)
 
        -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
 # 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 81aae3909de5d0cd70053d5942f880192ff24fd4..264823a40665dc57473ddc73d3fff220986b1473 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   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"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"


@@ -91,6 +91,7 @@ int main(int argc, char *argv[])
        DEBUG("log init complete");
        
        INFO( OPENOCD_VERSION );
        DEBUG("log init complete");
        
        INFO( OPENOCD_VERSION );

+       INFO( "$URL: $");

 
        cfg_cmd_ctx = copy_command_context(cmd_ctx);
        cfg_cmd_ctx->mode = COMMAND_CONFIG;
 
        cfg_cmd_ctx = copy_command_context(cmd_ctx);
        cfg_cmd_ctx->mode = COMMAND_CONFIG;