author | lana |
Fri, 04 Aug 2017 23:29:15 +0000 | |
changeset 46105 | 11d01f32ad33 |
parent 45271 | 81a039ba9344 |
child 47364 | 6b3389375f31 |
permissions | -rw-r--r-- |
25854 | 1 |
# |
41458 | 2 |
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. |
25854 | 3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
# |
|
5 |
# This code is free software; you can redistribute it and/or modify it |
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
|
7 |
# published by the Free Software Foundation. Oracle designates this |
|
8 |
# particular file as subject to the "Classpath" exception as provided |
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
|
10 |
# |
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
# accompanied this code). |
|
16 |
# |
|
17 |
# You should have received a copy of the GNU General Public License version |
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
# |
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
# or visit www.oracle.com if you need additional information or have any |
|
23 |
# questions. |
|
24 |
# |
|
25 |
||
26 |
ifndef _SETUP_GMK |
|
27 |
_SETUP_GMK := 1 |
|
28 |
||
29 |
include JavaCompilation.gmk |
|
30 |
||
41535 | 31 |
DISABLE_WARNINGS := -Xlint:all,-deprecation,-removal,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally |
25854 | 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 | 34 |
# make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000" |
44628
513c3026b94f
8177553: Address removal lint warnings in the JDK build
darcy
parents:
41535
diff
changeset
|
35 |
JAVAC_WARNINGS := -Xlint:all -Werror |
25854 | 36 |
|
26548 | 37 |
# The BOOT_JAVAC setup uses the boot jdk compiler to compile the tools |
38 |
# and the interim javac, to be run by the boot jdk. |
|
39 |
$(eval $(call SetupJavaCompiler,BOOT_JAVAC, \ |
|
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 | 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 | 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 | 52 |
# requires restricting to language level and api of previous JDK. |
53 |
# |
|
54 |
# The generate old bytecode javac setup uses the new compiler to compile for the |
|
55 |
# boot jdk to generate tools that need to be run with the boot jdk. |
|
56 |
# Thus we force the target bytecode to the previous JDK version. |
|
27560 | 57 |
# Add -Xlint:-options to avoid the warning about not setting -bootclasspath. Since |
58 |
# it's running on the boot jdk, the default bootclasspath is correct. |
|
25854 | 59 |
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \ |
60 |
JVM := $(JAVA_SMALL), \ |
|
61 |
JAVAC := $(NEW_JAVAC), \ |
|
35366 | 62 |
FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true -XDstringConcat=inline \ |
27560 | 63 |
$(DISABLE_WARNINGS) -Xlint:-options, \ |
25854 | 64 |
SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
65 |
SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
|
66 |
||
67 |
# The generate new bytecode javac setup uses the new compiler to compile for the |
|
68 |
# new jdk. This new bytecode might only be possible to run using the new jvm. |
|
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 | 71 |
JAVAC := $(NEW_JAVAC), \ |
45271 | 72 |
FLAGS := -source 10 -target 10 --doclint-format html5 \ |
27560 | 73 |
-encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS), \ |
25854 | 74 |
SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
75 |
SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
|
76 |
||
77 |
# The generate new bytecode javac setup uses the new compiler to compile for the |
|
78 |
# new jdk. This new bytecode might only be possible to run using the new jvm. |
|
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 | 81 |
JAVAC := $(NEW_JAVAC), \ |
43597
707f869e5e9a
8173383: Update JDK build to use -source and -target 10
darcy
parents:
41535
diff
changeset
|
82 |
FLAGS := -source 10 -target 10 \ |
27560 | 83 |
-encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS), \ |
25854 | 84 |
SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
85 |
SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
|
86 |
||
87 |
# After the jdk is built, we want to build demos using only the recently |
|
88 |
# generated jdk classes and nothing else, no jdk source, etc etc. |
|
89 |
# I.e. the rt.jar, but since rt.jar has not yet been generated |
|
90 |
# (it will be in "make images") therefore we use classes instead. |
|
91 |
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \ |
|
92 |
JVM := $(JAVA_SMALL), \ |
|
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 | 95 |
SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
96 |
SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
|
97 |
||
98 |
endif # _SETUP_GMK |