Use adam greens suggestion to simplify the way the git version string…

… is generated
Smoothieware · e4738895354705de040b42f09758ac072d2ccbb7 · wolfmanjm committed Jun 7, 2013 · Jun 7, 2013 · e473889
1 parent 0833955
commit e4738895354705de040b42f09758ac072d2ccbb7
Unified Split

Showing with 11 additions and 16 deletions.

+1 −1 .gitignore

+0 −8 generate-version.sh

+0 −6 makefile

+2 −0 src/generate-version.sh

+7 −0 src/makefile

+1 −1 src/{version.cpp.placeholder → version.cpp}
@@ -21,4 +21,4 @@ debug
 /mac_install.log
 /win_install.log
 /linux_install.log
-/src/version.cpp
+
@@ -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
-
@@ -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
@@ -0,0 +1,2 @@
+echo `git symbolic-ref HEAD 2> /dev/null | cut -b 12-`-`git log --pretty=format:%h -1`
+touch version.cpp
@@ -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
@@ -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__;