version number keyword expansion handling

git-svn-id: svn://svn.berlios.de/openocd/trunk@1086 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
oharboe 2008-10-22 07:55:45 +00:00
parent 6eeab625cd
commit d740e66ccd
1 changed files with 4 additions and 2 deletions

View File

@ -101,7 +101,7 @@ struct tftpd_fileops fileops =
#define ZYLIN_TIME __TIME__ #define ZYLIN_TIME __TIME__
/* hmmm.... we can't pick up the right # during build if we've checked this out /* hmmm.... we can't pick up the right # during build if we've checked this out
* in Eclipse... arrggghh...*/ * in Eclipse... arrggghh...*/
#define ZYLIN_OPENOCD $Revision$ #define ZYLIN_OPENOCD "$Revision$"
#define ZYLIN_OPENOCD_VERSION "Zylin JTAG ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE " " ZYLIN_TIME #define ZYLIN_OPENOCD_VERSION "Zylin JTAG ZY1000 " ZYLIN_VERSION " " ZYLIN_DATE " " ZYLIN_TIME
#define ZYLIN_CONFIG_DIR "/config/settings" #define ZYLIN_CONFIG_DIR "/config/settings"
@ -321,7 +321,9 @@ int handle_zy1000_version_command(struct command_context_s *cmd_ctx, char *cmd,
command_print(cmd_ctx, ZYLIN_OPENOCD_VERSION); command_print(cmd_ctx, ZYLIN_OPENOCD_VERSION);
} else if (strcmp("openocd", args[0])==0) } else if (strcmp("openocd", args[0])==0)
{ {
command_print(cmd_ctx, "%d", ZYLIN_OPENOCD); int revision;
revision=atol(ZYLIN_OPENOCD+strlen("XRevision: "));
command_print(cmd_ctx, "%d", revision);
} else if (strcmp("zy1000", args[0])==0) } else if (strcmp("zy1000", args[0])==0)
{ {
command_print(cmd_ctx, "%s", ZYLIN_VERSION); command_print(cmd_ctx, "%s", ZYLIN_VERSION);