Skip to content

Commit 9085b3c

Browse files
committed
Add short --version-num argument, hopefully to the liking of @g5t :-p
1 parent b37a32a commit 9085b3c

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

mccode/src/instrument.y

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,7 +2149,8 @@ print_usage(void)
21492149
" %s [-o file] [-I dir1 ...] [-t] [-p] [-v] "
21502150
"[--no-main] [--no-runtime] [--verbose] file\n", executable_name);
21512151
fprintf(stderr, " -o FILE --output-file=FILE Place " GENERATE_LANG " output in file FILE.\n");
2152-
fprintf(stderr, " -v --version Prints " MCCODE_NAME " version.\n");
2152+
fprintf(stderr, " -v --version Prints " MCCODE_NAME " full version header.\n");
2153+
fprintf(stderr, " --version-num Prints " MCCODE_NAME " version number only.\n");
21532154
fprintf(stderr, " --verbose Display compilation process steps.\n");
21542155
#if defined(GENERATE_C)
21552156
fprintf(stderr, " -I DIR --search-dir=DIR Append DIR to the component search list. \n");
@@ -2191,9 +2192,12 @@ print_usage_error(void)
21912192

21922193
/* Print McCode version and copyright. */
21932194
static void
2194-
print_version(void)
2195+
print_version(char shrt)
21952196
{
2196-
printf(MCCODE_NAME " code generator version " MCCODE_VERSION " (" MCCODE_DATE ")\n"
2197+
if (shrt)
2198+
printf(MCCODE_VERSION "\n");
2199+
else
2200+
printf(MCCODE_NAME " code generator version " MCCODE_VERSION " (" MCCODE_DATE ")\n"
21972201
"Copyright (C) DTU Physics and Risoe National Laboratory, 1997-" MCCODE_YEAR "\n"
21982202
"Additions (C) Institut Laue Langevin, 2003-2019\n"
21992203
"All rights reserved\n\nComponents are (C) their authors, see component headers.\n");
@@ -2293,9 +2297,11 @@ parse_command_line(int argc, char *argv[])
22932297
lint = 1;
22942298
#endif
22952299
else if(!strcmp("-v", argv[i]))
2296-
print_version();
2300+
print_version(0);
22972301
else if(!strcmp("--version", argv[i]))
2298-
print_version();
2302+
print_version(0);
2303+
else if(!strcmp("--version-num", argv[i]))
2304+
print_version(1);
22992305
else if(!strcmp("-h", argv[i]))
23002306
{ print_usage(); exit(0); }
23012307
else if(!strcmp("--help", argv[i]))

0 commit comments

Comments
 (0)