Skip to content
Permalink
Browse files
8242462: Residual Cleanup of rmic removal
Reviewed-by: jjg, amlu, erikj, iignatyev, mseledtsov
  • Loading branch information
Roger Riggs committed Apr 10, 2020
1 parent 93831d4 commit 3cf922b3d12cf7b6df05be88e86572187a582f8f
Showing 11 changed files with 9 additions and 63 deletions.
@@ -1,5 +1,5 @@
#
# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -88,7 +88,6 @@ src/jdk.naming.dns : jdk/src/jdk.naming.dns
src/jdk.naming.rmi : jdk/src/jdk.naming.rmi
src/jdk.net : jdk/src/jdk.net
src/jdk.pack : jdk/src/jdk.pack
src/jdk.rmic : corba/src/jdk.rmic jdk/src/jdk.rmic
src/jdk.scripting.nashorn : nashorn/src/jdk.scripting.nashorn
src/jdk.scripting.nashorn.shell : nashorn/src/jdk.scripting.nashorn.shell
src/jdk.sctp : jdk/src/jdk.sctp
@@ -140,7 +139,6 @@ src/utils/src/build : jdk/make/non-build-utils/src/build
make/BuildNashorn.gmk : nashorn/make/BuildNashorn.gmk
make/CompileDemos.gmk : jdk/make/CompileDemos.gmk
make/CompileInterimLangtools.gmk : langtools/make/CompileInterim.gmk
make/CompileInterimRmic.gmk : jdk/make/CompileInterimRmic.gmk
make/CompileModuleTools.gmk : jdk/make/CompileModuleTools.gmk
make/CompileToolsHotspot.gmk : hotspot/make/CompileTools.gmk
make/CompileToolsJdk.gmk : jdk/make/CompileTools.gmk
@@ -180,7 +178,6 @@ make/mapfiles/libjvm_dtrace : hotspot/make/mapfiles/libjvm_dtrace
make/mapfiles/libsaproc : hotspot/make/mapfiles/libsaproc
make/nashorn : nashorn/make
make/nb_native : common/nb_native
make/rmic : jdk/make/rmic
make/scripts/addNotices.sh : jdk/make/scripts/addNotices.sh
make/scripts/compare.sh : common/bin/compare.sh
make/scripts/compare_exceptions.sh.incl : common/bin/compare_exceptions.sh.incl
@@ -536,7 +536,7 @@ <h3 id="common-make-targets">Common Make Targets</h3>
<li><code>dist-clean</code> - Remove all files, including configuration</li>
</ul>
<p>Run <code>make help</code> to get an up-to-date list of important make targets and make control variables.</p>
<p>It is possible to build just a single module, a single phase, or a single phase of a single module, by creating make targets according to these followin patterns. A phase can be either of <code>gensrc</code>, <code>gendata</code>, <code>copy</code>, <code>java</code>, <code>launchers</code>, <code>libs</code> or <code>rmic</code>. See <a href="#using-fine-grained-make-targets">Using Fine-Grained Make Targets</a> for more details about this functionality.</p>
<p>It is possible to build just a single module, a single phase, or a single phase of a single module, by creating make targets according to these followin patterns. A phase can be either of <code>gensrc</code>, <code>gendata</code>, <code>copy</code>, <code>java</code>, <code>launchers</code>, or <code>libs</code>. See <a href="#using-fine-grained-make-targets">Using Fine-Grained Make Targets</a> for more details about this functionality.</p>
<ul>
<li><code>&lt;phase&gt;</code> - Build the specified phase and everything it depends on</li>
<li><code>&lt;module&gt;</code> - Build the specified module and everything it depends on</li>
@@ -929,7 +929,6 @@ <h4 id="building-individual-module-phases">Building Individual Module Phases</h4
<li><code>java</code> (Compile Java code)</li>
<li><code>launchers</code> (Compile native executables)</li>
<li><code>libs</code> (Compile native libraries)</li>
<li><code>rmic</code> (Run the <code>rmic</code> tool)</li>
</ul>
<p>You can build only a single phase for a module by using the notation <code>$MODULE-$PHASE</code>. For instance, to build the <code>gensrc</code> phase for <code>java.base</code>, use <code>make java.base-gensrc</code>.</p>
<p>Note that some phases may depend on others, e.g. <code>java</code> depends on <code>gensrc</code> (if present). Make will build all needed prerequisites before building the requested phase.</p>
@@ -818,7 +818,7 @@ control variables.
It is possible to build just a single module, a single phase, or a single phase
of a single module, by creating make targets according to these followin
patterns. A phase can be either of `gensrc`, `gendata`, `copy`, `java`,
`launchers`, `libs` or `rmic`. See [Using Fine-Grained Make Targets](
`launchers`, or `libs`. See [Using Fine-Grained Make Targets](
#using-fine-grained-make-targets) for more details about this functionality.

* `<phase>` - Build the specified phase and everything it depends on
@@ -1619,7 +1619,6 @@ and other artifact the module consists of. The phases are:
* `java` (Compile Java code)
* `launchers` (Compile native executables)
* `libs` (Compile native libraries)
* `rmic` (Run the `rmic` tool)

You can build only a single phase for a module by using the notation
`$MODULE-$PHASE`. For instance, to build the `gensrc` phase for `java.base`,

This file was deleted.

@@ -48,7 +48,6 @@ public static void main(String[] args) throws Exception {
"com/sun/tools/javac/Main",
"jdk/nio/zipfs/ZipInfo",
"java/net/URL",
"sun/rmi/rmic/Main",
"com/sun/jndi/dns/DnsName"));

// First class is loaded from CDS, second class is loaded from JAR
@@ -44,7 +44,6 @@ public static void main(String[] args) throws Exception {
"sun/tools/javac/Main",
"jdk/nio/zipfs/ZipInfo",
"java/net/URL",
"sun/rmi/rmic/Main",
"com/sun/jndi/dns/DnsName"));

OutputAnalyzer output;
@@ -30,8 +30,7 @@ public static void main(String args[]) throws Throwable {
// sun.tools.javac.Main (testcase 1),
// jdk.nio.zipfs.ZipInfo (testcase 2),
// java.net.URL (testcase 3),
// sun.rmi.rmic.Main (testcase 4),
// com.sun.jndi.dns.DnsName (testcase 5)
// com.sun.jndi.dns.DnsName (testcase 4)
String testcases[][] =
{{"Loading shared boot module class first", "java.util",
"java.util.Dictionary", "java.util.ServiceConfigurationError"},
@@ -45,9 +44,6 @@ public static void main(String args[]) throws Throwable {
{"Loading non-shared boot module class first", "java.net",
"java.net.HttpCookie", "java.net.URL"},

{"Loading non-shared app module class first", "sun.rmi.rmic",
"sun.rmi.rmic.RMIGenerator", "sun.rmi.rmic.Main"},

{"Loading non-shared ext module class first", "com.sun.jndi.dns",
"com.sun.jndi.dns.Resolver", "com.sun.jndi.dns.DnsName"}};

@@ -30,7 +30,6 @@ public static void main(String args[]) throws Throwable {
// sun.tools.javac.Main (testcase 1),
// jdk.nio.zipfs.ZipInfo (testcase 2),
// java.net.URL (testcase 3),
// sun.rmi.rmic.Main (testcase 4),
// com.sun.jndi.dns.DnsName (testcase 5)
String testcases[][] =
{{"Loading shared boot module class first",
@@ -318,7 +318,6 @@ module:jdk.naming.rmi
module:jdk.net
jdk.net
module:jdk.pack
module:jdk.rmic
module:jdk.scripting.nashorn
jdk.nashorn.api.scripting
jdk.nashorn.api.tree
@@ -261,7 +261,6 @@ module:jdk.net
jdk.net
jdk.nio
module:jdk.pack
module:jdk.rmic
module:jdk.scripting.nashorn
jdk.nashorn.api.scripting
jdk.nashorn.api.tree
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -92,18 +92,17 @@ public void compileAll() throws Exception {
@DataProvider(name = "jdkModules")
public Object[][] jdkModules() {
return new Object[][]{
// --require and a subset of dependences
// --require and a subset of dependencies
{ "jdk.compiler", new String[][] {
new String[] {"jdk.compiler", "jdk.jshell"},
new String[] {"jdk.compiler", "jdk.rmic"},
new String[] {"jdk.compiler", "jdk.javadoc", "jdk.rmic"},
new String[] {"jdk.compiler", "jdk.javadoc"},
}
},
{ "java.compiler", new String[][] {
new String[] {"java.compiler", "jdk.jshell"},
new String[] {"java.compiler", "jdk.compiler", "jdk.jshell"},
new String[] {"java.compiler", "jdk.compiler", "jdk.rmic"},
new String[] {"java.compiler", "jdk.compiler", "jdk.javadoc", "jdk.rmic"},
new String[] {"java.compiler", "jdk.compiler"},
new String[] {"java.compiler", "jdk.compiler", "jdk.javadoc"},
new String[] {"java.compiler", "java.se"},
}
},

0 comments on commit 3cf922b

Please sign in to comment.