From 98ab45ee24421bc4ca6e4e008ba3b501261f8332 Mon Sep 17 00:00:00 2001
From: Benoit Rat <benoit@sevensols.com>
Date: Thu, 22 Mar 2012 18:46:10 +0100
Subject: [PATCH] Add the git version inside the flasher
---
usb-loader/.gitignore | 1 +
usb-loader/Makefile | 20 ++++++++++++++------
usb-loader/mch_flasher.c | 9 ++++++++-
3 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/usb-loader/.gitignore b/usb-loader/.gitignore
index 4bb5c025c..f56fe3e82 100644
--- a/usb-loader/.gitignore
+++ b/usb-loader/.gitignore
@@ -1 +1,2 @@
+version.c
mch_flasher
diff --git a/usb-loader/Makefile b/usb-loader/Makefile
index 45343b5a4..03f9895a5 100644
--- a/usb-loader/Makefile
+++ b/usb-loader/Makefile
@@ -1,11 +1,19 @@
+OBJS=mch_flasher.o serial_linux.o version.o
+OUTPUT=mch_flasher
-OBJS = mch_flasher.o serial_linux.o
-FLASHER = mch_flasher
+all: $(OBJS)
+ ${CC} -o $(OUTPUT) $(OBJS)
-all: $(FLASHER)
-$(FLASHER): $(OBJS)
- ${CC} -o $@ $(OBJS)
+version.c: ../.git/HEAD ../.git/index
+ echo "/**" > $@
+ echo " * File automatically generated by Makefile (DO NOT MODIFIED)\n *\n * To use this you in a c code just add the following lines:\n * " >> $@
+ echo "\textern const char build_time[];\n\textern const char git_user[];\n\textren const char git_revision[];\n * " >> $@
+ echo "**/" >> $@
+ echo 'const char build_time[] = __DATE__ " @ " __TIME__ ;' >> $@
+ echo "const char git_user[] = \"$(shell git config --get user.name)\";" >> $@
+ echo "const char git_revision[] = \"$(shell git rev-parse HEAD)\";" >> $@
+ echo "" >> $@
clean:
- rm -f $(OBJS) $(FLASHER) *~
+ rm -f version.c $(OBJS) $(OUTPUT):q:q
diff --git a/usb-loader/mch_flasher.c b/usb-loader/mch_flasher.c
index b1c08787d..f640ceafa 100644
--- a/usb-loader/mch_flasher.c
+++ b/usb-loader/mch_flasher.c
@@ -42,6 +42,11 @@
#define PORT_SPEED 115200
+//External variable from version.c
+extern const char build_time[];
+extern const char git_user[];
+extern const char git_revision[];
+
char *program_path;
int applet_silent_mode = 1;
@@ -418,6 +423,8 @@ main(int argc, char *argv[])
if(argc > 2)
serial_port = argv[2];
+ //Print line to know the version of software for testing purpose
+ fprintf(stderr,"\nCompiled by %s (%s)\ngit rev:%s\n\n",git_user,build_time,git_revision);
program_path = dirname(argv[0]);
@@ -437,4 +444,4 @@ main(int argc, char *argv[])
serial_close();
return 0;
-}
\ No newline at end of file
+}
--
GitLab