Skip to content

F
FMC DEL 1ns 4cha - Software
Commit a611ee27 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

tools: add printing version of repo 

with -V switch
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent fe6c90a5
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 9 deletions
tools/Makefile
View file @ a611ee27
...@@ -9,11 +9,12 @@ ...@@ -9,11 +9,12 @@
REPO_PARENT=../.. REPO_PARENT=../..
-include $(REPO_PARENT)/parent_common.mk -include $(REPO_PARENT)/parent_common.mk
M = $(shell /bin/pwd)/../kernel
DESTDIR ?= /usr/local DESTDIR ?= /usr/local
CFLAGS += -I$(M) -I../lib -Wno-trigraphs -Wall -ggdb $(EXTRACFLAGS) GIT_VERSION := $(shell git describe --dirty --long --tags)
CFLAGS += -I../kernel -I../lib -Wno-trigraphs -Wall -ggdb $(EXTRACFLAGS)
CFLAGS += -DGIT_VERSION="\"$(GIT_VERSION)\""
LDFLAGS = -L../lib LDFLAGS = -L../lib
LDLIBS = -lfdelay LDLIBS = -lfdelay
......
tools/fmc-fdelay-board-time.c
View file @ a611ee27
...@@ -8,11 +8,13 @@ ...@@ -8,11 +8,13 @@
#include "tools-common.h" #include "tools-common.h"
char git_version[] = "git version: " GIT_VERSION;
void help(char *name) void help(char *name)
{ {
fprintf(stderr, "fmc-fdelay-board-time: a tool for manipulating the FMC Fine Delay time base.\n"); fprintf(stderr, "fmc-fdelay-board-time: a tool for manipulating the FMC Fine Delay time base.\n");
fprintf(stderr, "Use: \"%s [-i <index>] [-d <dev>] <command>\"\n", fprintf(stderr, "Use: \"%s [-V] [-i <index>] [-d <dev>] <command>\"\n",
name); name);
fprintf(stderr, " where the <command> can be:\n" fprintf(stderr, " where the <command> can be:\n"
" get - shows current time and White Rabbit status.\n" " get - shows current time and White Rabbit status.\n"
...@@ -37,6 +39,9 @@ int main(int argc, char **argv) ...@@ -37,6 +39,9 @@ int main(int argc, char **argv)
if (tools_need_help(argc, argv)) if (tools_need_help(argc, argv))
help(argv[0]); help(argv[0]);
/* print versions if needed */
print_version(argc, argv);
nboards = fdelay_init(); nboards = fdelay_init();
if (nboards < 0) { if (nboards < 0) {
......
tools/fmc-fdelay-input.c
View file @ a611ee27
...@@ -11,9 +11,11 @@ ...@@ -11,9 +11,11 @@
#include "tools-common.h" #include "tools-common.h"
char git_version[] = "git version: " GIT_VERSION;
void help(char *name) void help(char *name)
{ {
fprintf(stderr, "%s: Use \"%s [-i <index>] [-d <dev>] [<opts>]\n", fprintf(stderr, "%s: Use \"%s [-V] [-i <index>] [-d <dev>] [<opts>]\n",
name, name); name, name);
fprintf(stderr, " options:\n" fprintf(stderr, " options:\n"
" -c <count> default is 0 and means forever\n" " -c <count> default is 0 and means forever\n"
...@@ -49,6 +51,9 @@ int main(int argc, char **argv) ...@@ -49,6 +51,9 @@ int main(int argc, char **argv)
if (tools_need_help(argc, argv)) if (tools_need_help(argc, argv))
help(argv[0]); help(argv[0]);
/* print versions if needed */
print_version(argc, argv);
nboards = fdelay_init(); nboards = fdelay_init();
if (nboards < 0) { if (nboards < 0) {
......
tools/fmc-fdelay-list.c
View file @ a611ee27
...@@ -9,9 +9,12 @@ ...@@ -9,9 +9,12 @@
#include "tools-common.h" #include "tools-common.h"
char git_version[] = "git version: " GIT_VERSION;
void help(char *name) void help(char *name)
{ {
fprintf(stderr, "%s: Lists boards, takes no arguments\n", name); fprintf(stderr, "%s: Lists boards\n"
" -V print version\n", name);
exit(1); exit(1);
} }
...@@ -24,6 +27,9 @@ int main(int argc, char **argv) ...@@ -24,6 +27,9 @@ int main(int argc, char **argv)
if (tools_need_help(argc, argv)) if (tools_need_help(argc, argv))
help(argv[0]); help(argv[0]);
/* print versions if needed */
print_version(argc, argv);
if (argc > 1) { if (argc > 1) {
fprintf(stderr, "%s: too many arguments (none expected)\n", fprintf(stderr, "%s: too many arguments (none expected)\n",
argv[0]); argv[0]);
......
tools/fmc-fdelay-pulse.c
View file @ a611ee27
...@@ -13,9 +13,11 @@ ...@@ -13,9 +13,11 @@
#include "tools-common.h" #include "tools-common.h"
char git_version[] = "git version: " GIT_VERSION;
void help(char *name) void help(char *name)
{ {
fprintf(stderr, "%s: Use \"%s [-i <index>] [-d <dev>] [<opts>]\n", fprintf(stderr, "%s: Use \"%s [-V] [-i <index>] [-d <dev>] [<opts>]\n",
name, name); name, name);
fprintf(stderr, " options:\n" fprintf(stderr, " options:\n"
" -o <output> ouput channel: 1..4 (default 1)\n" " -o <output> ouput channel: 1..4 (default 1)\n"
...@@ -223,6 +225,9 @@ int main(int argc, char **argv) ...@@ -223,6 +225,9 @@ int main(int argc, char **argv)
if (tools_need_help(argc, argv)) if (tools_need_help(argc, argv))
help(argv[0]); help(argv[0]);
/* print versions if needed */
print_version(argc, argv);
nboards = fdelay_init(); nboards = fdelay_init();
if (nboards < 0) { if (nboards < 0) {
......
tools/fmc-fdelay-status.c
View file @ a611ee27
...@@ -8,11 +8,13 @@ ...@@ -8,11 +8,13 @@
#include "tools-common.h" #include "tools-common.h"
char git_version[] = "git version: " GIT_VERSION;
void help(char *name) void help(char *name)
{ {
fprintf(stderr, "fmc-fdelay-status: reports channel programming\n"); fprintf(stderr, "fmc-fdelay-status: reports channel programming\n");
fprintf(stderr, "Use: \"%s [-i <index>] [-d <dev>] [-r]\"\n", name); fprintf(stderr, "Use: \"%s [-V] [-i <index>] [-d <dev>] [-r]\"\n", name);
fprintf(stderr, " -r: display raw hardware configuration"); fprintf(stderr, " -r: display raw hardware configuration");
exit(1); exit(1);
} }
...@@ -27,6 +29,9 @@ int main(int argc, char **argv) ...@@ -27,6 +29,9 @@ int main(int argc, char **argv)
if (tools_need_help(argc, argv)) if (tools_need_help(argc, argv))
help(argv[0]); help(argv[0]);
/* print versions if needed */
print_version(argc, argv);
nboards = fdelay_init(); nboards = fdelay_init();
if (nboards < 0) { if (nboards < 0) {
......
tools/fmc-fdelay-term.c
View file @ a611ee27
...@@ -8,9 +8,11 @@ ...@@ -8,9 +8,11 @@
#include "tools-common.h" #include "tools-common.h"
char git_version[] = "git version: " GIT_VERSION;
void help(char *name) void help(char *name)
{ {
fprintf(stderr, "%s: Use \"%s [-i <index>] [-d <dev>] [on|off]\n", fprintf(stderr, "%s: Use \"%s [-V] [-i <index>] [-d <dev>] [on|off]\n",
name, name); name, name);
exit(1); exit(1);
} }
...@@ -26,6 +28,9 @@ int main(int argc, char **argv) ...@@ -26,6 +28,9 @@ int main(int argc, char **argv)
if (tools_need_help(argc, argv)) if (tools_need_help(argc, argv))
help(argv[0]); help(argv[0]);
/* print versions if needed */
print_version(argc, argv);
nboards = fdelay_init(); nboards = fdelay_init();
if (nboards < 0) { if (nboards < 0) {
......
tools/tools-common.h
View file @ a611ee27
...@@ -14,3 +14,5 @@ extern void tools_report_time(char *name, struct fdelay_time *t, int umode); ...@@ -14,3 +14,5 @@ extern void tools_report_time(char *name, struct fdelay_time *t, int umode);
extern void report_output_config(int channel, struct fdelay_pulse *p, int umode); extern void report_output_config(int channel, struct fdelay_pulse *p, int umode);
extern void help(char *name); /* This is mandatory in all tools */ extern void help(char *name); /* This is mandatory in all tools */
extern void print_version(int argc, char **argv);
tools/tools-util.c
View file @ a611ee27
...@@ -8,6 +8,18 @@ ...@@ -8,6 +8,18 @@
#include "tools-common.h" #include "tools-common.h"
extern void help(char *name); /* This is mandatory in all tools */ extern void help(char *name); /* This is mandatory in all tools */
extern char git_version[];
void print_version(int argc, char **argv)
{
if ((argc == 2) && (!strcmp(argv[1], "-V"))) {
printf("%s %s\n", argv[0], git_version);
printf("%s\n", libfdelay_version_s);
printf("%s\n", libfdelay_zio_version_s);
exit(0);
}
}
void tools_getopt_d_i(int argc, char **argv, void tools_getopt_d_i(int argc, char **argv,
int *dev, int *index) int *dev, int *index)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment