make/common/SetupJavaCompilers.gmk
author jlahoda
Fri, 20 Jan 2017 15:32:03 +0100
changeset 43271 ce89609dde7c
parent 41535 b488e70ae145
child 43597 707f869e5e9a
child 44628 513c3026b94f
permissions -rw-r--r--
8172809: Error compiling javafx modules after fix for JDK-8169197 Summary: Properly stripping broken requires from ModuleSymbols. Reviewed-by: jjg, mcimadamore
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     1
#
41458
f285e333e8db 8167424: Various trivial fixes in build system
ihse
parents: 41172
diff changeset
     2
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     4
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    10
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    15
# accompanied this code).
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    16
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    20
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    23
# questions.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    24
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    25
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    26
ifndef _SETUP_GMK
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    27
_SETUP_GMK := 1
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    28
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    29
include JavaCompilation.gmk
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    30
41535
b488e70ae145 8145471: javac changes for enhanced deprecation
jjg
parents: 41458
diff changeset
    31
DISABLE_WARNINGS := -Xlint:all,-deprecation,-removal,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    32
28359
3a02fb1e9144 8067099: Add deprecation lint warning to build of jdk repository
darcy
parents: 27602
diff changeset
    33
# If warnings needs to be non-fatal for testing purposes use a command like:
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    34
# make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
41535
b488e70ae145 8145471: javac changes for enhanced deprecation
jjg
parents: 41458
diff changeset
    35
JAVAC_WARNINGS := -Xlint:all,-removal -Werror
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    36
26548
3b002da2aee1 8058118: Generate modules.list during the build
erikj
parents: 26115
diff changeset
    37
# The BOOT_JAVAC setup uses the boot jdk compiler to compile the tools
3b002da2aee1 8058118: Generate modules.list during the build
erikj
parents: 26115
diff changeset
    38
# and the interim javac, to be run by the boot jdk.
3b002da2aee1 8058118: Generate modules.list during the build
erikj
parents: 26115
diff changeset
    39
$(eval $(call SetupJavaCompiler,BOOT_JAVAC, \
3b002da2aee1 8058118: Generate modules.list during the build
erikj
parents: 26115
diff changeset
    40
    JAVAC := $(JAVAC), \
41172
1de8867db5a3 8166965: Some small java build tools are still running with big JVM configuration
erikj
parents: 40611
diff changeset
    41
    FLAGS := \
1de8867db5a3 8166965: Some small java build tools are still running with big JVM configuration
erikj
parents: 40611
diff changeset
    42
        $(JAVA_TOOL_FLAGS_SMALL) \
1de8867db5a3 8166965: Some small java build tools are still running with big JVM configuration
erikj
parents: 40611
diff changeset
    43
        $(BOOT_JDK_SOURCETARGET) \
1de8867db5a3 8166965: Some small java build tools are still running with big JVM configuration
erikj
parents: 40611
diff changeset
    44
        -XDignore.symbol.file=true -g \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35366
diff changeset
    45
        -Xlint:all$(COMMA)-deprecation$(COMMA)-options -Werror, \
33055
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32460
diff changeset
    46
    DISABLE_SJAVAC := true, \
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32460
diff changeset
    47
))
26548
3b002da2aee1 8058118: Generate modules.list during the build
erikj
parents: 26115
diff changeset
    48
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 26548
diff changeset
    49
# Any java code executed during a JDK build to build other parts of the JDK must be
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 26548
diff changeset
    50
# executed by the bootstrap JDK (probably with -Xbootclasspath/p: ) and for this
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 26548
diff changeset
    51
# purpose must be built with -target PREVIOUS for bootstrapping purposes, which
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    52
# requires restricting to language level and api of previous JDK.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    53
#
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    54
# The generate old bytecode javac setup uses the new compiler to compile for the
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    55
# boot jdk to generate tools that need to be run with the boot jdk.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    56
# Thus we force the target bytecode to the previous JDK version.
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 26548
diff changeset
    57
# Add -Xlint:-options to avoid the warning about not setting -bootclasspath. Since
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 26548
diff changeset
    58
# it's running on the boot jdk, the default bootclasspath is correct.
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    59
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    60
    JVM := $(JAVA_SMALL), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    61
    JAVAC := $(NEW_JAVAC), \
35366
394a28cc1032 8148483: JEP 280: Indify String Concatenation
shade
parents: 34101
diff changeset
    62
    FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true -XDstringConcat=inline \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 26548
diff changeset
    63
        $(DISABLE_WARNINGS) -Xlint:-options, \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    64
    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    65
    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    66
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    67
# The generate new bytecode javac setup uses the new compiler to compile for the
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    68
# new jdk. This new bytecode might only be possible to run using the new jvm.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    69
$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
34101
a1db3b482137 8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents: 33055
diff changeset
    70
    JVM := $(JAVA_JAVAC), \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    71
    JAVAC := $(NEW_JAVAC), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    72
    FLAGS := -source 9 -target 9 \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 26548
diff changeset
    73
        -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    74
    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    75
    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    76
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    77
# The generate new bytecode javac setup uses the new compiler to compile for the
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    78
# new jdk. This new bytecode might only be possible to run using the new jvm.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    79
$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE_NOWARNINGS, \
34101
a1db3b482137 8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents: 33055
diff changeset
    80
    JVM := $(JAVA_JAVAC), \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    81
    JAVAC := $(NEW_JAVAC), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    82
    FLAGS := -source 9 -target 9 \
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 26548
diff changeset
    83
        -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    84
    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    85
    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    86
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    87
# After the jdk is built, we want to build demos using only the recently
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    88
# generated jdk classes and nothing else, no jdk source, etc etc.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    89
# I.e. the rt.jar, but since rt.jar has not yet been generated
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    90
# (it will be in "make images") therefore we use classes instead.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    91
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    92
    JVM := $(JAVA_SMALL), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    93
    JAVAC := $(NEW_JAVAC), \
40611
53ba2f7abd45 8160851: Remove old launcher module-related options
mchung
parents: 40241
diff changeset
    94
    FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none $(DISABLE_WARNINGS), \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    95
    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    96
    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    97
98ce0879ab4c 8054834: Modular Source Code
chegar
parents:
diff changeset
    98
endif # _SETUP_GMK