Add more information to the verbose version string

Added information about product ID (OS and package type).

Change-Id: Ifc1aa0c49bcb875351af3333d854613752fd97d5

Author: Paweł Andruszkiewicz

src/CMakeLists.txt

@@ -90,6 +90,7 @@ if(WIN32)
 endif()
 
 add_definitions(-DMYSH_COMMIT_ID="${MYSH_COMMIT_ID}")
+add_definitions(-DMYSH_PRODUCT_ID="${MYSH_PRODUCT_ID}")
 
 add_shell_executable(mysqlsh "${mysqlsh_SRC}")
 ADD_STAN_TARGET(mysqlsh mysqlsh/main.cc)

src/mysqlsh/main.cc

@@ -530,6 +530,11 @@ static std::string version_string(const char *argv0, bool extra) {
       version_msg.append(" - commit_id ");
       version_msg.append(MYSH_COMMIT_ID);
     }
+
+    if (*MYSH_PRODUCT_ID) {
+      version_msg.append(" - product_id ");
+      version_msg.append(MYSH_PRODUCT_ID);
+    }
   } else {
     snprintf(&version_msg[0], version_msg.size(), "%s   %s", argv0,
              shcore::get_long_version());

version.cmake

@@ -115,6 +115,18 @@ GET_MYSQL_VERSION()
 
 SET(MYSH_BUILD_ID     "$ENV{PARENT_ID}")
 SET(MYSH_COMMIT_ID    "$ENV{PUSH_REVISION}")
+SET(MYSH_PRODUCT_ID   "$ENV{PRODUCT_ID}")
+
+IF(MYSH_PRODUCT_ID)
+  STRING(REPLACE "_" ";" MYSH_PRODUCT_ID_LIST "${MYSH_PRODUCT_ID}")
+  LIST(LENGTH MYSH_PRODUCT_ID_LIST MYSH_PRODUCT_ID_LIST_LEN)
+
+  IF(MYSH_PRODUCT_ID_LIST_LEN GREATER_EQUAL 2)
+    LIST(GET MYSH_PRODUCT_ID_LIST -2 MYSH_PRODUCT_OS)
+    LIST(GET MYSH_PRODUCT_ID_LIST -1 MYSH_PRODUCT_PACKAGE)
+    SET(MYSH_PRODUCT_ID "${MYSH_PRODUCT_OS} ${MYSH_PRODUCT_PACKAGE}")
+  ENDIF()
+ENDIF()
 
 # On Windows, AssemblyVersion does not allow slashes. Example: 1.0.5-labs
 IF(WIN32)