RFR: JDK-8143141: Bring in minor build changes from the jigsaw/jake forest

Erik Joelsson erik.joelsson at oracle.com
Wed Nov 18 13:00:03 UTC 2015


After posting this, I started thinking and I realized the biggest change 
here is not needed. I was able to revert all of the GENSRC_OUTPUTDIR, 
HEADERS_OUTPUTDIR, NATIVE_OUTPUTDIR and MODULES_*_OUTPUTDIR variables in 
jigsaw/jake and subsequently those changes are not needed here.

New webrevs, only for top and jdk now. The other repos no longer need 
changes:
http://cr.openjdk.java.net/~erikj/8143141/webrev.top.02/
http://cr.openjdk.java.net/~erikj/8143141/webrev.jdk.02/

/Erik

On 2015-11-17 16:11, Erik Joelsson wrote:
> Hello,
>
> When bringing changes from jdk9 to jigsaw/jake, the merges have become 
> quite involved. The build files in jdk9 and jake have also diverged 
> unnecessarily over time. I would like to bring them back closer to 
> each other so that we are only carrying the changes we really need to 
> in jake.
>
> The changes in these patches include:
>
> * Introducing GENSRC_OUTPUTDIR, HEADERS_OUTPUTDIR, NATIVE_OUTPUTDIR 
> and MODULES_*_OUTPUTDIR. These variables are needed to be able to 
> globally override these output directories. While not needed right now 
> in jdk9, it is one of the largest and most annoying changes to keep 
> merging in jake.
> * Adding some more utilities to the BUILD_TOOLCHAIN (AR, AS, NM)
> * Cleaning up CompileJavaModules.gmk and removing the redundant macro 
> call setup.
> * Filtering of modules in images uses the global MODULES_FILTER.
> * Minor cleanup in SetupJavaCompilation macro.
> * Removed redundant classpath flags for launchers jdb and jconsole
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8143141
> Webrevs:
> http://cr.openjdk.java.net/~erikj/8143141/webrev.top.01/
> http://cr.openjdk.java.net/~erikj/8143141/webrev.langtools.01/
> http://cr.openjdk.java.net/~erikj/8143141/webrev.corba.01/
> http://cr.openjdk.java.net/~erikj/8143141/webrev.hotspot.01/
> http://cr.openjdk.java.net/~erikj/8143141/webrev.jdk.01/
>
> /Erik




More information about the build-dev mailing list