changeset 10839:7d89a5404555

Removing profile name from Version.java
author erikj
date Fri, 17 Oct 2014 15:55:05 +0200
parents 4d0640ae1268
children 810edba2fefc
files make/launcher/Launcher-jdk.compiler.gmk src/java.base/share/classes/sun/misc/Version.java.template
diffstat 2 files changed, 9 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/make/launcher/Launcher-jdk.compiler.gmk	Fri Oct 17 15:42:10 2014 +0200
+++ b/make/launcher/Launcher-jdk.compiler.gmk	Fri Oct 17 15:55:05 2014 +0200
@@ -30,13 +30,6 @@
     -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
     -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }'))
 
-ifeq ($(ENABLE_SJAVAC), yes)
-  $(eval $(call SetupLauncher,sjavac, \
-      -DEXPAND_CLASSPATH_WILDCARDS \
-      -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
-      -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.sjavac.Main"$(COMMA) }'))
-endif
-
 $(eval $(call SetupLauncher,javah, \
     -DEXPAND_CLASSPATH_WILDCARDS \
     -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
@@ -51,3 +44,12 @@
     -DEXPAND_CLASSPATH_WILDCARDS \
     -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.serialver.SerialVer"$(COMMA) }'))
 
+ifeq ($(ENABLE_SJAVAC), yes)
+  # Build sjavac directly to the exploded image so that it does not get included
+  # into any real images
+  $(eval $(call SetupLauncher,sjavac, \
+      -DEXPAND_CLASSPATH_WILDCARDS \
+      -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
+      -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.sjavac.Main"$(COMMA) }',,,,,,, \
+      $(JDK_OUTPUTDIR)/bin))
+endif
--- a/src/java.base/share/classes/sun/misc/Version.java.template	Fri Oct 17 15:42:10 2014 +0200
+++ b/src/java.base/share/classes/sun/misc/Version.java.template	Fri Oct 17 15:55:05 2014 +0200
@@ -38,9 +38,6 @@
     private static final String java_runtime_name =
         "@@java_runtime_name@@";
 
-    private static final String java_profile_name =
-        "@@java_profile_name@@";
-
     private static final String java_runtime_version =
         "@@java_runtime_version@@";
 
@@ -105,11 +102,6 @@
 
         ps.print(java_runtime_name + " (build " + java_runtime_version);
 
-        if (java_profile_name.length() > 0) {
-            // profile name
-            ps.print(", profile " + java_profile_name);
-        }
-
         if (java_runtime_name.indexOf("Embedded") != -1 && isHeadless) {
             // embedded builds report headless state
             ps.print(", headless");