jdk/make/ModuleTools.gmk
author mcimadamore
Mon, 07 Nov 2016 11:16:23 +0000
changeset 41942 260c724e5614
parent 41224 aa0e64b5711c
child 43188 4c5f69ec1762
permissions -rw-r--r--
8168854: javac erroneously reject a a service interface inner class in a provides clause Summary: Java SE 9 proposed spec changes do not explicitly forbid a service interface to be an inner class - javac should follow Reviewed-by: jjg
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     1
#
41224
aa0e64b5711c 8166948: Exploded image too slow to be usable
erikj
parents: 40261
diff changeset
     2
# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     4
#
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    10
#
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    15
# accompanied this code).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    16
#
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    20
#
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    23
# questions.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    24
#
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    25
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    26
include $(SPEC)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    27
include MakeBase.gmk
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    28
include JavaCompilation.gmk
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    29
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    30
TOOLS_CLASSES_DIR := $(BUILDTOOLS_OUTPUTDIR)/tools_jigsaw_classes
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    31
41224
aa0e64b5711c 8166948: Exploded image too slow to be usable
erikj
parents: 40261
diff changeset
    32
# To avoid reevaluating the compilation setup for the tools each time this file
aa0e64b5711c 8166948: Exploded image too slow to be usable
erikj
parents: 40261
diff changeset
    33
# is included, the actual compilation is handled by CompileModuleTools.gmk. The
aa0e64b5711c 8166948: Exploded image too slow to be usable
erikj
parents: 40261
diff changeset
    34
# following trick is used to be able to declare a dependency on the built tools.
aa0e64b5711c 8166948: Exploded image too slow to be usable
erikj
parents: 40261
diff changeset
    35
BUILD_TOOLS_JDK := $(call SetupJavaCompilationCompileTarget, \
aa0e64b5711c 8166948: Exploded image too slow to be usable
erikj
parents: 40261
diff changeset
    36
    BUILD_JIGSAW_TOOLS, $(TOOLS_CLASSES_DIR))
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    37
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    38
TOOL_GENGRAPHS := $(BUILD_JAVA) -esa -ea -cp $(TOOLS_CLASSES_DIR) \
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    39
    build.tools.jigsaw.GenGraphs
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    40
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    41
TOOL_MODULESUMMARY := $(BUILD_JAVA) -esa -ea -cp $(TOOLS_CLASSES_DIR) \
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 36511
diff changeset
    42
    --add-exports jdk.jdeps/com.sun.tools.classfile=ALL-UNNAMED \
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    43
    build.tools.jigsaw.ModuleSummary
41224
aa0e64b5711c 8166948: Exploded image too slow to be usable
erikj
parents: 40261
diff changeset
    44
aa0e64b5711c 8166948: Exploded image too slow to be usable
erikj
parents: 40261
diff changeset
    45
TOOL_ADD_PACKAGES_ATTRIBUTE := $(BUILD_JAVA) $(JAVA_FLAGS_SMALL) \
aa0e64b5711c 8166948: Exploded image too slow to be usable
erikj
parents: 40261
diff changeset
    46
    -cp $(TOOLS_CLASSES_DIR) \
aa0e64b5711c 8166948: Exploded image too slow to be usable
erikj
parents: 40261
diff changeset
    47
    --add-exports java.base/jdk.internal.module=ALL-UNNAMED \
aa0e64b5711c 8166948: Exploded image too slow to be usable
erikj
parents: 40261
diff changeset
    48
    build.tools.jigsaw.AddPackagesAttribute