Browse Source

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
tags/v0.1.0
bodylove 14 years ago
parent
commit
78d58dd16a
5 changed files with 19 additions and 2 deletions
  1. +1
    -0
      AUTHORS
  2. +1
    -1
      configure.in
  3. +8
    -0
      guess-rev.sh
  4. +7
    -0
      src/Makefile.am
  5. +2
    -1
      src/openocd.c

+ 1
- 0
AUTHORS View File

@@ -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>

+ 1
- 1
configure.in View File

@@ -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)


+ 8
- 0
guess-rev.sh View File

@@ -0,0 +1,8 @@
#!/bin/bash

REV=unknown

which svnversion > /dev/null 2>&1 && REV=`svnversion`

echo -n $REV


+ 7
- 0
src/Makefile.am View File

@@ -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


+ 2
- 1
src/openocd.c View File

@@ -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;


Loading…
Cancel
Save