jdk/makefiles/Setup.gmk
changeset 20547 453837141fac
parent 19846 ee72cd8a1085
child 20884 66f924cdfeb9
equal deleted inserted replaced
20546:5e40a295cce2 20547:453837141fac
    21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    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
    22 # or visit www.oracle.com if you need additional information or have any
    23 # questions.
    23 # questions.
    24 #
    24 #
    25 
    25 
    26 DISABLE_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
    26 DISABLE_WARNINGS := -Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
    27 
    27 
    28 # To build with all warnings enabled, do the following:
    28 # To build with all warnings enabled, do the following:
    29 # make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000" 
    29 # make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
    30 JAVAC_WARNINGS:=-Xlint:-unchecked,-deprecation,-overrides,classfile,dep-ann,divzero,varargs -Werror
    30 JAVAC_WARNINGS := -Xlint:-unchecked,-deprecation,-overrides,classfile,dep-ann,divzero,varargs -Werror
    31 
    31 
    32 # The generate old bytecode javac setup uses the new compiler to compile for the
    32 # The generate old bytecode javac setup uses the new compiler to compile for the
    33 # boot jdk to generate tools that need to be run with the boot jdk.
    33 # boot jdk to generate tools that need to be run with the boot jdk.
    34 # Thus we force the target bytecode to 7.
    34 # Thus we force the target bytecode to 7.
    35 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
    35 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
    36      JVM:=$(JAVA),\
    36     JVM := $(JAVA), \
    37      JAVAC:=$(NEW_JAVAC),\
    37     JAVAC := $(NEW_JAVAC), \
    38      FLAGS:=-source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS),\
    38     FLAGS := -source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS), \
    39      SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    39     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
    40      SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
    40     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
    41 
    41 
    42 # The generate new bytecode javac setup uses the new compiler to compile for the
    42 # The generate new bytecode javac setup uses the new compiler to compile for the
    43 # new jdk. This new bytecode might only be possible to run using the new jvm.
    43 # new jdk. This new bytecode might only be possible to run using the new jvm.
    44 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\
    44 $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
    45      JVM:=$(JAVA),\
    45     JVM := $(JAVA), \
    46      JAVAC:=$(NEW_JAVAC),\
    46     JAVAC := $(NEW_JAVAC), \
    47      FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 \
    47     FLAGS := -bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 \
    48 	    -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS) \
    48         -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS) \
    49 	    $(GENERATE_JDKBYTECODE_EXTRA_FLAGS),\
    49         $(GENERATE_JDKBYTECODE_EXTRA_FLAGS), \
    50      SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    50     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
    51      SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
    51     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
    52 
    52 
    53 # After the jdk is built, we want to build demos using only the recently
    53 # After the jdk is built, we want to build demos using only the recently
    54 # generated jdk classes and nothing else, no jdk source, etc etc.
    54 # generated jdk classes and nothing else, no jdk source, etc etc.
    55 # I.e. the rt.jar, but since rt.jar has not yet been generated
    55 # I.e. the rt.jar, but since rt.jar has not yet been generated
    56 # (it will be in "make images") therefore we use classes instead.
    56 # (it will be in "make images") therefore we use classes instead.
    57 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE,\
    57 $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
    58      JVM:=$(JAVA),\
    58     JVM := $(JAVA), \
    59      JAVAC:=$(NEW_JAVAC),\
    59     JAVAC := $(NEW_JAVAC), \
    60      FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\
    60     FLAGS := -bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS), \
    61      SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    61     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
    62      SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
    62     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))