X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmisc.cpp;h=679e38affcd3df915f97f5d2af1fd3ed71962957;hp=5912514c23dbadaf63133281c130497fe3a63a72;hb=ad43ce143664953087b44dd3b4324f77c212bd46;hpb=c2d42ea8339b49e52a116e488214a14fda09d413

diff --git a/src/misc.cpp b/src/misc.cpp
index 5912514c..679e38af 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -52,46 +52,44 @@
 
 using namespace std;
 
-/// Version number. If EngineVersion is left empty, then AppTag plus
-/// current date (in the format YYMMDD) is used as a version number.
 
-static const string AppName = "Stockfish";
-static const string EngineVersion = "";
-static const string AppTag  = "";
+/// Version number. If Version is left empty, then Tag plus current
+/// date (in the format YYMMDD) is used as a version number.
 
+static const string Version = "";
+static const string Tag  = "";
 
-/// engine_name() returns the full name of the current Stockfish version.
+
+/// engine_info() returns the full name of the current Stockfish version.
 /// This will be either "Stockfish YYMMDD" (where YYMMDD is the date when
 /// the program was compiled) or "Stockfish <version number>", depending
-/// on whether the constant EngineVersion is empty.
+/// on whether Version is empty.
 
-const string engine_name() {
+const string engine_info(bool to_uci) {
 
   const string months("Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec");
-  const string cpu64(CpuIs64Bit ? " 64bit" : "");
-
-  if (!EngineVersion.empty())
-      return AppName + " " + EngineVersion + cpu64;
+  const string cpu64(Is64Bit ? " 64bit" : "");
+  const string popcnt(HasPopCnt ? " SSE4.2" : "");
 
-  stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"
   string month, day, year;
+  stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"
 
-  date >> month >> day >> year;
-
-  s << setfill('0') << AppName + " " + AppTag + " "
-    << year.substr(2, 2) << setw(2)
-    << (1 + months.find(month) / 4) << setw(2)
-    << day << cpu64;
-
-  return s.str();
-}
-
+  if (Version.empty())
+  {
+      date >> month >> day >> year;
 
-/// Our brave developers! Required by UCI
+      s << "Stockfish " << Tag
+        << setfill('0') << " " << year.substr(2)
+        << setw(2) << (1 + months.find(month) / 4)
+        << setw(2) << day << cpu64 << popcnt;
+  }
+  else
+      s << "Stockfish " << Version << cpu64 << popcnt;
 
-const string engine_authors() {
+  s << (to_uci ? "\nid author ": " by ")
+    << "Tord Romstad, Marco Costalba and Joona Kiiski";
 
-  return "Tord Romstad, Marco Costalba and Joona Kiiski";
+  return s.str();
 }