Print git revision in GMR command output

igrr · Oct 14, 2014 · 0bea18d · 0bea18d
1 parent 37dff1e
commit 0bea18d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ bin/
 .DS_Store
 xcuserdata
 project.xcworkspace
+upload.sh
diff --git a/Makefile b/Makefile
@@ -4,7 +4,9 @@ SRC_DIR := src
 OBJ_DIR := obj
 BIN_DIR := bin
 
-CPPFLAGS+=-Iinclude -Isrc/include 
+GIT_REV := $(shell git rev-parse --short HEAD)
+
+CPPFLAGS+=-Iinclude -Isrc/include -DREVISION_STRING=\"$(GIT_REV)\"
 CFLAGS += -std=c99
 CXXFLAGS += -std=c++0x
 

diff --git a/include/dce_common.h b/include/dce_common.h
@@ -10,6 +10,10 @@
 
 #define VERSION_STRING "0.1"
 
+#ifndef REVISION_STRING
+#define REVISION_STRING "?"
+#endif
+
 #if defined(ESP_PLATFORM)
 #include "ets_sys.h"
 #include "os_type.h"

diff --git a/target/esp8266/info_commands.c b/target/esp8266/info_commands.c
@@ -19,7 +19,7 @@ dce_result_t SECTION_ATTR dce_handle_GMM(dce_t* dce, void* group_ctx, int kind,
 
 dce_result_t SECTION_ATTR dce_handle_GMR(dce_t* dce, void* group_ctx, int kind, size_t argc, arg_t* argv)
 {
-    dce_emit_information_response(dce, VERSION_STRING, -1);
+    dce_emit_information_response(dce, VERSION_STRING " r" REVISION_STRING, -1);
     dce_emit_basic_result_code(dce, DCE_RC_OK);
     return DCE_OK;
 }