Merge pull request #190 from rpking42/server_git_version

Return the git hash for `croquery serverversion`
open-power · May 8, 2019 · 0086361 · 0086361
2 parents d7ed0b5 + c55f35e
commit 0086361
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/dllNetwork/server/ControlInstruction.C b/dllNetwork/server/ControlInstruction.C
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <git_version.H>
 
 #ifdef OTHER_USE
 #include <OutputLite.H>
@@ -282,6 +283,7 @@ uint32_t ControlInstruction::execute(ecmdDataBuffer & o_data, InstructionStatus
         std::ostringstream oss;
         oss << "Server Version" << std::endl;
         oss << "Date: " << __DATE__ << " " << __TIME__ << std::endl;
+        oss << "Git Version: " << git_version << std::endl;
         std::map<std::string, uint32_t>::iterator versionIterator = controls->global_version_map_pointer->begin();
         while (versionIterator != controls->global_version_map_pointer->end()) {
           oss << std::left << std::setw(24) << versionIterator->first << " : " << versionIterator->second << std::endl;

diff --git a/dllNetwork/server/git_version.H b/dllNetwork/server/git_version.H
@@ -0,0 +1,4 @@
+#ifndef _GIT_VERSION_H
+#define _GIT_VERSION_H
+extern const char *git_version;
+#endif // _GIT_VERSION_H
diff --git a/dllNetwork/server/makefile b/dllNetwork/server/makefile
@@ -39,6 +39,7 @@ TGT_INCLUDES += PNORInstruction.H
 TGT_INCLUDES += fd_impl.H
 TGT_INCLUDES += ServerSBEFIFOInstruction.H
 TGT_INCLUDES += SBEFIFOInstruction.H
+TGT_INCLUDES += git_version.H
 
 TGT_SOURCE := Instruction.C
 TGT_SOURCE += InstructionStatus.C
@@ -57,6 +58,7 @@ TGT_SOURCE += PNORInstruction.C
 TGT_SOURCE += fd_impl.C
 TGT_SOURCE += ServerSBEFIFOInstruction.C
 TGT_SOURCE += SBEFIFOInstruction.C
+TGT_SOURCE += git_version.C
 TGT_SOURCE += server1p.C
 
 TGT_SOURCE_C := adal_base.c
@@ -80,8 +82,7 @@ LDFLAGS += -ldl -lpthread -lz
 all:
 	${run-all}
 
-generate:
-  # Do nothing
+generate: git_version.C
 
 build: ${TARGET}
 
@@ -115,6 +116,18 @@ ${TGT_SOURCE_C_OBJS}: ${OBJPATH}%.o : %.c ${INCLUDES}
 	@echo Compiling $<
 	${VERBOSE}${CXX} -c ${CXXFLAGS} $< -o $@ ${DEFINES}
 
+# *****************************************************************************
+# Create a .C file containing the git hash to print out as part of the
+# serverversion. If we are building from a .zip download, the .git
+# folder doesn't exist. Create empty targets for the .git folder so
+# make doesn't try to create them. If we build in this situation, the
+# version is an empty string, which is the best we can do.
+# *****************************************************************************
+../../.git/HEAD:
+../../.git/index:
+git_version.C: ../../.git/HEAD ../../.git/index
+	@echo "const char *git_version = \"$(shell git describe --dirty --always --tags)\";" > ${SRCPATH}/$@
+
 # *****************************************************************************
 # Create the Target
 # *****************************************************************************