Merge pull request ibmruntimes#16 from groeges/jdk8-issue8-diag-jars

Put dtfj, dtfjview and traceformat classes in tools.jar

Author: groeges

jdk/make/CompileLaunchers.gmk

@@ -414,16 +414,19 @@ $(eval $(call SetupLauncher,jcmd, \
 # Include executables for OpenJ9 (jdmpview, traceformat and jextract)
 $(eval $(call SetupLauncher,jdmpview, \
     -DEXPAND_CLASSPATH_WILDCARDS \
-    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.ibm.jvm.dtfjview.DTFJView"$(COMMA) }'))
+    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.ibm.jvm.dtfjview.DTFJView"$(COMMA) }' \
+    -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/classes" }'))
 
 $(eval $(call SetupLauncher,traceformat, \
     -DEXPAND_CLASSPATH_WILDCARDS \
-    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.ibm.jvm.format.TraceFormat"$(COMMA) }'))
+    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.ibm.jvm.format.TraceFormat"$(COMMA) }' \
+    -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/classes" }'))
 
 ifneq ($(findstring $(OPENJDK_TARGET_OS),linux aix),)
   $(eval $(call SetupLauncher,jextract, \
     -DEXPAND_CLASSPATH_WILDCARDS \
-    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.ibm.jvm.j9.dump.extract.Main"$(COMMA) }'))
+    -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.ibm.jvm.j9.dump.extract.Main"$(COMMA) }' \
+    -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/classes" }'))
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)

jdk/make/CreateJars.gmk

@@ -56,47 +56,6 @@ $(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/lib))
 
 ##########################################################################################
 
-$(eval $(call SetupArchive,BUILD_DTFJ_JAR, , \
-    SRCS := $(JDK_OUTPUTDIR)/classes, \
-    INCLUDES := com/ibm/dtfj com/ibm/jvm/j9/dump com/ibm/java/diagnostics/utils, \
-    JAR := $(IMAGES_OUTPUTDIR)/lib/ext/dtfj.jar, \
-    SKIP_METAINF := true))
-
-
-##########################################################################################
-
-$(eval $(call SetupArchive,BUILD_DTFJVIEW_JAR, , \
-    SRCS := $(JDK_OUTPUTDIR)/classes, \
-    INCLUDES := com/ibm/jvm/dtfjview, \
-    JAR := $(IMAGES_OUTPUTDIR)/lib/ext/dtfjview.jar, \
-    SKIP_METAINF := true))
-
-
-##########################################################################################
-
-$(eval $(call SetupArchive,BUILD_TRACEFORMAT_JAR, , \
-    SRCS := $(JDK_OUTPUTDIR)/classes, \
-    INCLUDES := com/ibm/jvm/traceformat \
-                com/ibm/jvm/format \
-                com/ibm/jvm/trace, \
-    EXTRA_FILES := com/ibm/jvm/Debug.class \
-		           com/ibm/jvm/FormatTimestamp.class \
-		           com/ibm/jvm/Indent.class \
-		           com/ibm/jvm/InputFile.class \
-		           com/ibm/jvm/MessageFile.class \
-		           com/ibm/jvm/OutputFile.class \
-		           com/ibm/jvm/ProgramOption.class \
-		           com/ibm/jvm/Statistics.class \
-		           com/ibm/jvm/Summary.class \
-		           com/ibm/jvm/Threads.class \
-		           com/ibm/jvm/Timezone.class \
-		           com/ibm/jvm/TraceFormat.class \
-		           com/ibm/jvm/Verbose.class, \
-    JAR := $(IMAGES_OUTPUTDIR)/lib/ext/traceformat.jar, \
-    SKIP_METAINF := true))
-
-##########################################################################################
-
 $(eval $(call SetupArchive,BUILD_JCONSOLE_JAR, , \
     SRCS := $(JDK_OUTPUTDIR)/classes, \
     SUFFIXES := .class .gif .png .properties, \
@@ -574,8 +533,14 @@ TOOLS_JAR_INCLUDES := \
     sun/tools/serialver \
     sun/tools/tree \
     sun/tools/util \
-    com/ibm/tools/attach/attacher
-
+    com/ibm/tools/attach/attacher \
+    com/ibm/jvm/traceformat \
+    com/ibm/jvm/format \
+    com/ibm/jvm/trace \
+    com/ibm/jvm/dtfjview \
+    com/ibm/dtfj \
+    com/ibm/jvm/j9/dump \
+    com/ibm/java/diagnostics/utils
 
 # The sjavac tools is not ready for public consumption.
 TOOLS_JAR_EXCLUDES = com/sun/tools/sjavac
@@ -590,7 +555,20 @@ $(eval $(call SetupArchive,BUILD_TOOLS_JAR, , \
         META-INF/services/com.sun.jdi.connect.spi.TransportService \
         META-INF/services/com.sun.tools.attach.spi.AttachProvider \
         META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
-        META-INF/services/com.sun.tools.internal.xjc.Plugin, \
+        META-INF/services/com.sun.tools.internal.xjc.Plugin \
+        com/ibm/jvm/Debug.class \
+		com/ibm/jvm/FormatTimestamp.class \
+		com/ibm/jvm/Indent.class \
+		com/ibm/jvm/InputFile.class \
+		com/ibm/jvm/MessageFile.class \
+		com/ibm/jvm/OutputFile.class \
+		com/ibm/jvm/ProgramOption.class \
+		com/ibm/jvm/Statistics.class \
+		com/ibm/jvm/Summary.class \
+		com/ibm/jvm/Threads.class \
+		com/ibm/jvm/Timezone.class \
+		com/ibm/jvm/TraceFormat.class \
+		com/ibm/jvm/Verbose.class, \
     JAR := $(IMAGES_OUTPUTDIR)/lib/tools.jar, \
     SKIP_METAINF := true, \
     CHECK_COMPRESS_JAR := true))

jdk/make/Images.gmk

@@ -125,7 +125,10 @@ ifeq ($(PROFILE), )
       wsimport$(EXE_SUFFIX) \
       schemagen$(EXE_SUFFIX) \
       jsadebugd$(EXE_SUFFIX) \
-      jhat$(EXE_SUFFIX)
+      jhat$(EXE_SUFFIX) \
+      jextract$(EXE_SUFFIX) \
+      jdmpview$(EXE_SUFFIX) \
+      traceformat$(EXE_SUFFIX)
 endif
 
 WINDOWS_JDK_BIN_FILES = \

jdk/make/Profiles.gmk

@@ -89,9 +89,6 @@ ALL_JARS := $(FULL_JRE_JARS) \
     $(IMAGES_OUTPUTDIR)/lib/rt.jar \
     $(IMAGES_OUTPUTDIR)/lib/resources.jar \
     $(IMAGES_OUTPUTDIR)/lib/jconsole.jar \
-    $(IMAGES_OUTPUTDIR)/lib/ext/dtfj.jar \
-    $(IMAGES_OUTPUTDIR)/lib/ext/dtfjview.jar \
-    $(IMAGES_OUTPUTDIR)/lib/ext/traceformat.jar \
     $(IMAGES_OUTPUTDIR)/lib/dt.jar \
     $(IMAGES_OUTPUTDIR)/lib/tools.jar \
     $(IMAGES_OUTPUTDIR)/lib/ct.sym \