From 785a05489794b1b341bd3193070fdefb8b982b10 Mon Sep 17 00:00:00 2001
From: Kuai Wei <kuaiwei.kw@alibaba-inc.com>
Date: Mon, 24 Dec 2018 20:17:31 +0800
Subject: [PATCH] [Misc] Add distro name in java version string
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary: add distro name and version in java version string

Reviewers: 传胜

Subscribers: 麦庶

Differential Revision: https://aone.alibaba-inc.com/code/D796935
---
 make/gensrc/GensrcMisc.gmk                       |  2 ++
 src/share/classes/sun/misc/Version.java.template | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/make/gensrc/GensrcMisc.gmk b/make/gensrc/GensrcMisc.gmk
index 9db5c9d6f..049dfa31d 100644
--- a/make/gensrc/GensrcMisc.gmk
+++ b/make/gensrc/GensrcMisc.gmk
@@ -41,6 +41,8 @@ $(PROFILE_VERSION_JAVA_TARGETS): \
 	    -e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
 	    -e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
 	    -e 's/@@java_profile_name@@/$(call profile_version_name, $@)/g' \
+        -e 's/@@java_distro_name@@/$(DISTRO_NAME)/g' \
+        -e 's/@@java_distro_version@@/$(DISTRO_VERSION)/g' \
 	    $< > $@.tmp
 	$(MV) $@.tmp $@
 
diff --git a/src/share/classes/sun/misc/Version.java.template b/src/share/classes/sun/misc/Version.java.template
index 32e2586e7..9c65c022b 100644
--- a/src/share/classes/sun/misc/Version.java.template
+++ b/src/share/classes/sun/misc/Version.java.template
@@ -44,6 +44,12 @@ public class Version {
     private static final String java_runtime_version =
         "@@java_runtime_version@@";
 
+    private static final String java_distro_name =
+        "@@java_distro_name@@";
+
+    private static final String java_distro_version =
+        "@@java_distro_version@@";
+
     static {
         init();
     }
@@ -103,7 +109,9 @@ public class Version {
 
         /* Second line: runtime version (ie, libraries). */
 
-        ps.print(java_runtime_name + " (build " + java_runtime_version);
+        ps.print(java_runtime_name +
+                 " (" + java_distro_name + " " + java_distro_version + ")" +
+                 " (build " + java_runtime_version);
 
         if (java_profile_name.length() > 0) {
             // profile name
@@ -120,7 +128,9 @@ public class Version {
         String java_vm_name    = System.getProperty("java.vm.name");
         String java_vm_version = System.getProperty("java.vm.version");
         String java_vm_info    = System.getProperty("java.vm.info");
-        ps.println(java_vm_name + " (build " + java_vm_version + ", " +
+        ps.println(java_vm_name +
+                   " (" + java_distro_name + " " + java_distro_version + ")" +
+                   " (build " + java_vm_version + ", " +
                    java_vm_info + ")");
     }
 
-- 
GitLab