From e4738895354705de040b42f09758ac072d2ccbb7 Mon Sep 17 00:00:00 2001
From: Jim Morris <morris@wolfman.com>
Date: Fri, 7 Jun 2013 02:42:54 -0700
Subject: [PATCH] Use adam greens suggestion to simplify the way the git
 version string is generated

---
 .gitignore                                   | 2 +-
 generate-version.sh                          | 8 --------
 makefile                                     | 6 ------
 src/generate-version.sh                      | 2 ++
 src/makefile                                 | 7 +++++++
 src/{version.cpp.placeholder => version.cpp} | 2 +-
 6 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100755 generate-version.sh
 create mode 100755 src/generate-version.sh
 rename src/{version.cpp.placeholder => version.cpp} (82%)

diff --git a/.gitignore b/.gitignore
index 1af4a22781..bfe82c6972 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,4 @@ debug
 /mac_install.log
 /win_install.log
 /linux_install.log
-/src/version.cpp
+
diff --git a/generate-version.sh b/generate-version.sh
deleted file mode 100755
index d9a2c6456a..0000000000
--- a/generate-version.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "#include \"version.h\"" > src/version.cpp
-echo "const char *Version::get_build(void) const {" >> src/version.cpp
-echo "    return \"`git symbolic-ref HEAD 2> /dev/null | cut -b 12-`-`git log --pretty=format:\"%h\" -1`\";" >> src/version.cpp
-echo "}" >> src/version.cpp
-echo "const char *Version::get_build_date(void) const {" >> src/version.cpp
-echo "    return __DATE__ \" \" __TIME__;" >> src/version.cpp
-echo "}" >> src/version.cpp
-
diff --git a/makefile b/makefile
index f1bfe4e782..9a10c9294c 100644
--- a/makefile
+++ b/makefile
@@ -4,12 +4,6 @@ DIRS = mbed src
 DIRSCLEAN = $(addsuffix .clean,$(DIRS))
 
 all:
-ifneq "$(OS)" "Windows_NT"
-	@./generate-version.sh
-else
-	@xcopy /C /I /Y src/version.cpp.placeholder src/version.cpp
-endif
-	@echo Building mbed SDK
 	@ $(MAKE) -C mbed
 	@echo Building Smoothie
 	@ $(MAKE) -C src
diff --git a/src/generate-version.sh b/src/generate-version.sh
new file mode 100755
index 0000000000..c58098b99d
--- /dev/null
+++ b/src/generate-version.sh
@@ -0,0 +1,2 @@
+echo `git symbolic-ref HEAD 2> /dev/null | cut -b 12-`-`git log --pretty=format:%h -1`
+touch version.cpp
\ No newline at end of file
diff --git a/src/makefile b/src/makefile
index 129a2f4392..aba2390980 100644
--- a/src/makefile
+++ b/src/makefile
@@ -39,6 +39,13 @@ MRI_BREAK_ON_INIT=0
 MRI_SEMIHOST_STDIO=0
 endif
 
+# generate a git version string, sorry only on linux and mac osx
+ifneq "$(OS)" "Windows_NT"
+DEFINES += -D__GITVERSIONSTRING__=\"$(shell ./generate-version.sh)\"
+else
+DEFINES += -D__GITVERSIONSTRING__=\"placeholder\"
+endif
+
 include $(BUILD_DIR)/build.mk
 
 CONSOLE?=/dev/arduino_A900K10V
diff --git a/src/version.cpp.placeholder b/src/version.cpp
similarity index 82%
rename from src/version.cpp.placeholder
rename to src/version.cpp
index 2329ab0318..181df4b53a 100644
--- a/src/version.cpp.placeholder
+++ b/src/version.cpp
@@ -1,6 +1,6 @@
 #include "version.h"
 const char *Version::get_build(void) const {
-    return "placeholder";
+    return __GITVERSIONSTRING__;
 }
 const char *Version::get_build_date(void) const {
     return __DATE__ " " __TIME__;