Stringify the git info passed

avoid escaping the string in the Makefile.

Alternative to https://github.com/official-stockfish/Stockfish/pull/4476

closes https://github.com/official-stockfish/Stockfish/pull/4481

No functional change.

diff --git a/src/Makefile b/src/Makefile
index e257bc6347d91da3977e6b351b8b5d22c3be6fe6..0b22fb4e6e93eaf8c1b25653ba4bff8659a79c76 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -705,13 +705,13 @@ endif
 ### 3.7.1 Try to include git commit sha for versioning
 GIT_SHA = $(shell git rev-parse --short HEAD 2>/dev/null)
 ifneq ($(GIT_SHA), )
-       CXXFLAGS += -DGIT_SHA=\"$(GIT_SHA)\"
+       CXXFLAGS += -DGIT_SHA=$(GIT_SHA)
 endif
 
 ### 3.7.2 Try to include git commit date for versioning
 GIT_DATE = $(shell git show -s --date=format:'%Y%m%d' --format=%cd HEAD 2>/dev/null)
 ifneq ($(GIT_DATE), )
-       CXXFLAGS += -DGIT_DATE=\"$(GIT_DATE)\"
+       CXXFLAGS += -DGIT_DATE=$(GIT_DATE)
 endif
 
 ### 3.8 Link Time Optimization

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 99b873004edfd6043b3f9c62add579ca422b2897..12883fcc43e57a8a18f71e407f3604816a989321 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -82,8 +82,6 @@ namespace Eval {
         eval_file = EvalFileDefaultName;
 
     #if defined(DEFAULT_NNUE_DIRECTORY)
-    #define stringify2(x) #x
-    #define stringify(x) stringify2(x)
     vector<string> dirs = { "<internal>" , "" , CommandLine::binaryDirectory , stringify(DEFAULT_NNUE_DIRECTORY) };
     #else
     vector<string> dirs = { "<internal>" , "" , CommandLine::binaryDirectory };

diff --git a/src/misc.cpp b/src/misc.cpp
index cac9dd94996352f7f9f5cda5c723f8460803ef6b..e36a04bccfbef712f07229e78417b252a68625ea 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -160,7 +160,7 @@ string engine_info(bool to_uci) {
   {
       ss << "-";
       #ifdef GIT_DATE
-      ss << GIT_DATE;
+      ss << stringify(GIT_DATE);
       #else
       constexpr string_view months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
       string month, day, year;
@@ -173,7 +173,7 @@ string engine_info(bool to_uci) {
       ss << "-";
 
       #ifdef GIT_SHA
-      ss << GIT_SHA;
+      ss << stringify(GIT_SHA);
       #else
       ss << "nogit";
       #endif
@@ -190,8 +190,6 @@ string engine_info(bool to_uci) {
 
 std::string compiler_info() {
 
-  #define stringify2(x) #x
-  #define stringify(x) stringify2(x)
   #define make_version_string(major, minor, patch) stringify(major) "." stringify(minor) "." stringify(patch)
 
 /// Predefined macros hell:

diff --git a/src/misc.h b/src/misc.h
index c20a816efa068916af0bdcf385dd01075ca6ad47..d4965156325250874df3d51bd665f4107dbfdb69 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -28,6 +28,9 @@
 
 #include "types.h"
 
+#define stringify2(x) #x
+#define stringify(x) stringify2(x)
+
 namespace Stockfish {
 
 std::string engine_info(bool to_uci = false);