make/common/JavaCompilation.gmk
author joehw
Fri, 03 Jun 2016 11:38:38 -0700
changeset 38818 57f451f8c235
parent 37771 30f2faf0e7a6
child 38847 57689ec78480
permissions -rw-r--r--
8150187: NPE expected if the system identifier is null for CatalogResolver Reviewed-by: rriggs, lancea
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
30534
5e259b665bbf 8080630: Stop doing sed manipulation of manifest files in SetupJavaCompilation
ihse
parents: 30095
diff changeset
     2
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    26
# When you read this source. Remember that $(sort ...) has the side effect
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
# of removing duplicates. It is actually this side effect that is
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    28
# desired whenever sort is used below!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
    30
ifndef _JAVA_COMPILATION_GMK
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
    31
_JAVA_COMPILATION_GMK := 1
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
    32
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    33
ifeq (,$(_MAKEBASE_GMK))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    34
  $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    35
endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    36
33438
35cd6a1619df 8141333: Rename SetupArchive to SetupJarArchive
ihse
parents: 33437
diff changeset
    37
# Java compilation needs SetupJarArchive and/or SetupZipArchive, if we're
35cd6a1619df 8141333: Rename SetupArchive to SetupJarArchive
ihse
parents: 33437
diff changeset
    38
# generating a jar file or a source zip.
35cd6a1619df 8141333: Rename SetupArchive to SetupJarArchive
ihse
parents: 33437
diff changeset
    39
include JarArchive.gmk
27592
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    40
include ZipArchive.gmk
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    41
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    42
# Setup make rules for defining a Java compiler, which is needed to compile
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    43
# Java code. This rule generates no output.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    44
#
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    45
# Parameter 1 is the name of the compiler definition. This name needs to be
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    46
# passed to SetupJavaCompilation. This name is used as variable prefix.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    47
#
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    48
# Remaining parameters are named arguments. These include:
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    49
#   JVM:=The jvm used to run the javac/javah command
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    50
#   JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    51
#   FLAGS:=Flags to be supplied to javac
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    52
#   SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
    53
#   SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
33055
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
    54
#   DISABLE_SJAVAC:=Set to true if this setup does not support sjavac
29312
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29174
diff changeset
    55
SetupJavaCompiler = $(NamedParamsMacroTemplate)
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29174
diff changeset
    56
define SetupJavaCompilerBody
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    57
  # The port file contains the tcp/ip on which the server listens
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    58
  # and the cookie necessary to talk to the server.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    59
  $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    60
  # You can use a different JVM to run the background javac server.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    61
  ifeq ($$($1_SERVER_JVM),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    62
    # It defaults to the same JVM that is used to start the javac command.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    63
    $1_SERVER_JVM:=$$($1_JVM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    64
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    65
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    66
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    67
define add_file_to_copy
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    68
  # param 1 = BUILD_MYPACKAGE
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    69
  # parma 2 = The source file to copy.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    70
  $2_TARGET:=$2
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    71
  # Remove the source prefix.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    72
  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
    73
  # To allow for automatic overrides, do not create a rule for a target file that
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
    74
  # already has one
30095
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
    75
  ifneq ($$($1_COPY_$$($2_TARGET)), 1)
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
    76
    $1_COPY_$$($2_TARGET) := 1
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
    77
    # Now we can setup the dependency that will trigger the copying.
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
    78
    $$($1_BIN)$$($1_MODULE_SUBDIR)$$($2_TARGET) : $2
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    79
	$(MKDIR) -p $$(@D)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    80
	$(CP) $$< $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    81
	$(CHMOD) -f ug+w $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    82
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
    83
    # And do not forget this target
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
    84
    $1_ALL_COPY_TARGETS += $$($1_BIN)$$($1_MODULE_SUBDIR)$$($2_TARGET)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
    85
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    86
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    87
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    88
# This macro is used only for properties files that are to be
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    89
# copied over to the classes directory in cleaned form:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    90
# Previously this was inconsistently done in different repositories.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    91
# This is the new clean standard. Though it is to be superseded by
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    92
# a standard annotation processor from with sjavac.
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
    93
#
28900
dd0303e8c9ce 8072950: api/xinclude/Harold/harold-97.html\#harold-97, api/xinclude/Harold/harold-67.html\#harold-67 fails on solaris with build port-stage-aarch64
erikj
parents: 28606
diff changeset
    94
# An empty echo ensures that the input to sed always ends with a newline.
dd0303e8c9ce 8072950: api/xinclude/Harold/harold-97.html\#harold-97, api/xinclude/Harold/harold-67.html\#harold-67 fails on solaris with build port-stage-aarch64
erikj
parents: 28606
diff changeset
    95
# Certain implementations (e.g. Solaris) will skip the last line without
dd0303e8c9ce 8072950: api/xinclude/Harold/harold-97.html\#harold-97, api/xinclude/Harold/harold-67.html\#harold-67 fails on solaris with build port-stage-aarch64
erikj
parents: 28606
diff changeset
    96
# it.
dd0303e8c9ce 8072950: api/xinclude/Harold/harold-97.html\#harold-97, api/xinclude/Harold/harold-67.html\#harold-67 fails on solaris with build port-stage-aarch64
erikj
parents: 28606
diff changeset
    97
#
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
    98
# The sed expression does this:
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
    99
# 1. Add a backslash before any :, = or ! that do not have a backslash already.
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27592
diff changeset
   100
# 2. Apply the file unicode2x.sed which does a whole bunch of \u00XX to \xXX
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   101
#    conversions.
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   102
# 3. Delete all lines starting with #.
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   103
# 4. Delete empty lines.
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   104
# 5. Append lines ending with \ with the next line.
24080
8bfff14321a9 8041265: jdk/bin/rmic -iiop failed on macosx-x86_64 with "Class sun.rmi.rmic.iiop.BatchEnvironmen not found"
erikj
parents: 23983
diff changeset
   105
# 6. Remove leading and trailing white space. Note that tabs must be explicit
8bfff14321a9 8041265: jdk/bin/rmic -iiop failed on macosx-x86_64 with "Class sun.rmi.rmic.iiop.BatchEnvironmen not found"
erikj
parents: 23983
diff changeset
   106
#    as sed on macosx does not understand '\t'.
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   107
# 7. Replace the first \= with just =.
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   108
# 8. Finally it's all sorted to create a stable output.
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27592
diff changeset
   109
#
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   110
# It is assumed that = is the character used for separating names and values.
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   111
define add_file_to_clean
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   112
  # param 1 = BUILD_MYPACKAGE
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   113
  # parma 2 = The source file to copy and clean.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   114
  $2_TARGET:=$2
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   115
  # Remove the source prefix.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   116
  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   117
  # Now we can setup the depency that will trigger the copying.
30095
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
   118
  # To allow for automatic overrides, do not create a rule for a target file that
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
   119
  # already has one
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
   120
  ifneq ($$($1_CLEAN_$$($2_TARGET)), 1)
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
   121
    $1_CLEAN_$$($2_TARGET) := 1
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
   122
    $$($1_BIN)$$($1_MODULE_SUBDIR)$$($2_TARGET) : $2
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   123
	$(MKDIR) -p $$(@D)
28900
dd0303e8c9ce 8072950: api/xinclude/Harold/harold-97.html\#harold-97, api/xinclude/Harold/harold-67.html\#harold-67 fails on solaris with build port-stage-aarch64
erikj
parents: 28606
diff changeset
   124
	export LC_ALL=C ; ( $(CAT) $$< && $(ECHO) "" ) \
27591
f8f4973d2329 8065138: Encodings.isRecognizedEnconding sometimes fails to recognize 'UTF8'
erikj
parents: 26671
diff changeset
   125
	    | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \
29438
6166fd4a617f 8058470: [jconsole] VM Summary Tab is blank for JDK9's jconsole.
sla
parents: 28909
diff changeset
   126
	        -e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ 	]*#.*/#/g' \
21759
e24e22311718 8027566: Remove the old build system
ihse
parents: 21054
diff changeset
   127
	    | $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   128
	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   129
	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
24080
8bfff14321a9 8041265: jdk/bin/rmic -iiop failed on macosx-x86_64 with "Class sun.rmi.rmic.iiop.BatchEnvironmen not found"
erikj
parents: 23983
diff changeset
   130
	        -e 's/^[ 	]*//;s/[ 	]*$$$$//' \
27591
f8f4973d2329 8065138: Encodings.isRecognizedEnconding sometimes fails to recognize 'UTF8'
erikj
parents: 26671
diff changeset
   131
	        -e 's/\\=/=/' \
f8f4973d2329 8065138: Encodings.isRecognizedEnconding sometimes fails to recognize 'UTF8'
erikj
parents: 26671
diff changeset
   132
	    | $(SORT) > $$@
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   133
	$(CHMOD) -f ug+w $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   134
30095
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
   135
    # And do not forget this target
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   136
    $1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($1_MODULE_SUBDIR)$$($2_TARGET)
30095
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
   137
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   138
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   139
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   140
define remove_string
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   141
  $2 := $$(subst $1,,$$($2))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   142
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   143
27592
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   144
# Setup make rules for compiling Java source code to class files and/or a
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   145
# resulting jar file.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   146
#
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   147
# Parameter 1 is the name of the rule. This name is used as variable prefix,
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   148
# and the targets generated are listed in a variable by that name.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   149
#
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   150
# Remaining parameters are named arguments. These include:
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   151
#   SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   152
#   JVM:=path to ..bin/java
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   153
#   ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
30095
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
   154
#   SRC:=one or more directories to search for sources. The order of the source roots
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
   155
#        is significant. The first found file of a certain name has priority.
27592
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   156
#   BIN:=store classes here
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   157
#   MODULE:=Name of module being compiled. If set, classes are put in BIN/MODULE.
32460
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   158
#   CLASSPATH:=a list of additional entries to set as classpath to javac
27592
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   159
#   INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   160
#   EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   161
#   COPY:=.prp means copy all prp files to the corresponding package in BIN.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   162
#   COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   163
#   CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   164
#   CLEAN_FILES:=myapp/foo/setting.txt means clean this file over to the package myapp/foo
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   165
#   SRCZIP:=Create a src.zip based on the found sources and copied files.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   166
#   INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   167
#   EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   168
#       "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   169
#   HEADERS:=path to directory where all generated c-headers are written.
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   170
#   DEPENDS:=Extra dependecy
af7df0dd5ff7 8065911: Introduce EvalDebugWrapper for all Setup* macros
ihse
parents: 27591
diff changeset
   171
#   DISABLE_SJAVAC:=Explicitly disable the use of sjavac for this compilation unit.
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   172
#   KEEP_DUPS:=Do not remove duplicate file names from different source roots.
29312
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29174
diff changeset
   173
SetupJavaCompilation = $(NamedParamsMacroTemplate)
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29174
diff changeset
   174
define SetupJavaCompilationBody
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   175
28902
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 27866
diff changeset
   176
  # Verify arguments
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 27866
diff changeset
   177
  ifeq ($$($1_BIN),)
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 27866
diff changeset
   178
    $$(error Must specify BIN (in $1))
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 27866
diff changeset
   179
  endif
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 27866
diff changeset
   180
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   181
  # Extract the info from the java compiler setup.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   182
  $1_JVM := $$($$($1_SETUP)_JVM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   183
  $1_JAVAC := $$($$($1_SETUP)_JAVAC)
37771
30f2faf0e7a6 8153685: Parfait integration missing in the new tools (jmod and jlink)
erikj
parents: 36506
diff changeset
   184
  $1_FLAGS := $$($$($1_SETUP)_FLAGS) $$($1_ADD_JAVAC_FLAGS) $(JAVAC_FLAGS)
32460
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   185
  ifneq ($$($1_CLASSPATH), )
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   186
    $1_FLAGS += -cp $$(call PathList, $$($1_CLASSPATH))
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   187
  endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   188
  ifeq ($$($1_JAVAC),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   189
    $$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   190
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   191
  $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   192
  $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
33055
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   193
  $1_DISABLE_SJAVAC := $$($$($1_SETUP)_DISABLE_SJAVAC)
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   194
 
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   195
  ifneq ($$($1_MODULE), )
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   196
    $1_MODULE_SUBDIR := /$$($1_MODULE)
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   197
  endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   198
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   199
  # Make sure the dirs exist.
30095
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
   200
  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory >$$d<)))
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28360
diff changeset
   201
  $$(call MakeDir,$$($1_BIN))
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27592
diff changeset
   202
  # Add all source roots to the find cache since we are likely going to run find
23170
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   203
  # on these more than once. The cache will only be updated if necessary.
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   204
  $$(eval $$(call FillCacheFind,$$($1_SRC)))
33442
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 33438
diff changeset
   205
  # Find all files in the source trees. Preserve order of source roots so that
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 33438
diff changeset
   206
  # the first version in case of multiple instances of the same file is selected.
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 33438
diff changeset
   207
  # CacheFind does not preserve order so need to call it for each root.
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 33438
diff changeset
   208
  $1_ALL_SRCS += $$(foreach s, $$($1_SRC), $$(call CacheFind, $$(s)))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   209
  # Extract the java files.
34921
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   210
  $1_SRCS := $$(filter %.java, $$($1_ALL_SRCS))
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   211
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   212
  # Translate include/exclude into patterns
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   213
  ifneq ($$($1_EXCLUDE_FILES), )
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   214
    $1_EXCLUDE_PATTERN := $$(addprefix %, $$($1_EXCLUDE_FILES))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   215
  endif
34921
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   216
  ifneq ($$($1_INCLUDE_FILES), )
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   217
    $1_INCLUDE_PATTERN := $$(foreach i, $$($1_SRC), $$(addprefix $$i/, $$($1_INCLUDE_FILES)))
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   218
  endif
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   219
  ifneq ($$($1_EXCLUDES), )
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   220
    $1_EXCLUDE_PATTERN += $$(foreach i, $$($1_SRC), $$(addprefix $$i/, $$(addsuffix /%, $$($1_EXCLUDES))))
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   221
  endif
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   222
  ifneq ($$($1_INCLUDES), )
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   223
    $1_INCLUDE_PATTERN += $$(foreach i, $$($1_SRC), $$(addprefix $$i/, $$(addsuffix /%, $$($1_INCLUDES))))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   224
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   225
34921
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   226
  # Apply include/exclude patterns to java sources
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   227
  ifneq ($$($1_EXCLUDE_PATTERN), )
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   228
    $1_SRCS := $$(filter-out $$($1_EXCLUDE_PATTERN), $$($1_SRCS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   229
  endif
34921
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   230
  ifneq ($$($1_INCLUDE_PATTERN), )
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   231
    $1_SRCS := $$(filter $$($1_INCLUDE_PATTERN), $$($1_SRCS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   232
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   233
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   234
  ifneq ($$($1_KEEP_DUPS), true)
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   235
    # Remove duplicate source files by keeping the first found of each duplicate.
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   236
    # This allows for automatic overrides with custom or platform specific versions
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   237
    # source files.
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   238
    #
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   239
    # For the smart javac wrapper case, add each removed file to an extra exclude
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   240
    # file list to prevent sjavac from finding duplicate sources.
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   241
    $1_SRCS := $$(strip $$(foreach s, $$($1_SRCS), \
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   242
        $$(eval relative_src := $$(call remove-prefixes, $$($1_SRC), $$(s))) \
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   243
        $$(if $$($1_$$(relative_src)), \
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   244
          $$(eval $1_SJAVAC_EXCLUDE_FILES += $$(s)), \
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   245
          $$(eval $1_$$(relative_src) := 1) $$(s))))
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   246
  endif
30095
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29442
diff changeset
   247
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   248
  ifeq ($$(strip $$($1_SRCS)), )
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   249
    $$(error No source files found for $1)
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   250
  endif
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   251
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   252
  $1_SAFE_NAME := $$(strip $$(subst /,_, $1))
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   253
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   254
  # All files below META-INF are always copied.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   255
  $1_ALL_COPIES := $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   256
  # Find all files to be copied from source to bin.
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   257
  ifneq (,$$($1_COPY)$$($1_COPY_FILES))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   258
    # Search for all files to be copied.
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   259
    $1_ALL_COPIES += $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   260
    # Copy these explicitly
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   261
    $1_ALL_COPIES += $$($1_COPY_FILES)
28601
de178dea78cd 8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents: 28600
diff changeset
   262
  endif
de178dea78cd 8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents: 28600
diff changeset
   263
  # Copy must also respect filters.
34921
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   264
  ifneq (,$$($1_INCLUDE_PATTERN))
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   265
    $1_ALL_COPIES := $$(filter $$($1_INCLUDE_PATTERN),$$($1_ALL_COPIES))
28601
de178dea78cd 8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents: 28600
diff changeset
   266
  endif
34921
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   267
  ifneq (,$$($1_EXCLUDE_PATTERN))
34924
9aaa30dd1b5d 8147086: Excluding of copy files broken after JDK-8144226
erikj
parents: 34921
diff changeset
   268
    $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_PATTERN),$$($1_ALL_COPIES))
28601
de178dea78cd 8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents: 28600
diff changeset
   269
  endif
de178dea78cd 8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents: 28600
diff changeset
   270
  ifneq (,$$($1_ALL_COPIES))
de178dea78cd 8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents: 28600
diff changeset
   271
    # Yep, there are files to be copied!
de178dea78cd 8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents: 28600
diff changeset
   272
    $1_ALL_COPY_TARGETS:=
de178dea78cd 8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents: 28600
diff changeset
   273
        $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
de178dea78cd 8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents: 28600
diff changeset
   274
    # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
de178dea78cd 8071550: SetupJavaComilation EXCLUDE/INCLUDE/EXCLUDE_FILE do not work on META-INF files
erikj
parents: 28600
diff changeset
   275
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   276
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   277
  # Find all property files to be copied and cleaned from source to bin.
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   278
  ifneq (,$$($1_CLEAN)$$($1_CLEAN_FILES))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   279
    # Search for all files to be copied.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   280
    $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   281
    # Clean these explicitly
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   282
    $1_ALL_CLEANS += $$($1_CLEAN_FILES)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   283
    # Copy and clean must also respect filters.
34921
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   284
    ifneq (,$$($1_INCLUDE_PATTERN))
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   285
      $1_ALL_CLEANS := $$(filter $$($1_INCLUDE_PATTERN),$$($1_ALL_CLEANS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   286
    endif
34921
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   287
    ifneq (,$$($1_EXCLUDE_PATTERN))
ca6c7c325650 8144226: Sjavac's handling of include/exclude patterns is buggy, redundant and inconsistent
alundblad
parents: 34102
diff changeset
   288
      $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_PATTERN),$$($1_ALL_CLEANS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   289
    endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   290
    ifneq (,$$($1_ALL_CLEANS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   291
      # Yep, there are files to be copied and cleaned!
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   292
      $1_ALL_COPY_CLEAN_TARGETS:=
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   293
          $$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_clean,$1,$$i)))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   294
      # Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files!
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   295
    endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   296
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   297
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   298
  # Create a sed expression to remove the source roots and to replace / with .
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   299
  # and remove .java at the end.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   300
  $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   301
33055
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   302
  # Create SJAVAC variable from JAVAC variable. Expects $1_JAVAC to be
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   303
  # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   304
  # and javac is simply replaced with sjavac.
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   305
  $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   306
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   307
  # Set the $1_REMOTE to spawn a background javac server.
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   308
  $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst \
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   309
      $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   310
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   311
  $1_COMPILE_TARGET := $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1_batch
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   312
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   313
  ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   314
    # Using sjavac to compile.
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   315
35009
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   316
    # Create the sjavac wrapper command line. Sjavac doesn't handle patterns that
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   317
    # match the absolute path, only the part inside each src dir. Instead -i and
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   318
    # -x flags apply only to the next -src arg on the command line.
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   319
    $1_EXCLUDE_FILES_ABS := $$(filter /%, $$($1_EXCLUDE_FILES)) $$($1_SJAVAC_EXCLUDE_FILES)
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   320
    $1_EXCLUDE_FILES_REL := $$(filter-out /%, $$($1_EXCLUDE_FILES))
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   321
    $1_SJAVAC_ARGS_STRING := $$(foreach s, $$(patsubst %/, %, $$($1_SRC)), \
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   322
        $$(addprefix -x ,$$(addsuffix /**,$$($1_EXCLUDES))) \
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   323
        $$(addprefix -i ,$$(addsuffix /**,$$($1_INCLUDES))) \
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   324
        $$(addprefix -x **,$$(strip $$($1_EXCLUDE_FILES_REL))) \
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   325
        $$(addprefix -i **,$$(strip $$($1_INCLUDE_FILES))) \
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   326
        $$(addprefix -x , $$(strip $$(patsubst $$(s)/%, %, $$(filter $$(s)/%, $$($1_EXCLUDE_FILES_ABS))))) \
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   327
        -src $$(s))
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   328
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   329
    ifneq ($$(word 20, $$($1_SJAVAC_ARGS_STRING)), )
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   330
      $1_SJAVAC_ARGS_FILE := $$($1_BIN)/_the.$1_args
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   331
      $1_SJAVAC_ARGS := @$$($1_SJAVAC_ARGS_FILE)
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   332
    else
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   333
      $1_SJAVAC_ARGS := $$($1_SJAVAC_ARGS_STRING)
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   334
    endif
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   335
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   336
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   337
    ifneq (,$$($1_HEADERS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   338
      $1_HEADERS_ARG := -h $$($1_HEADERS)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   339
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   340
35009
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   341
    $1_VARDEPS := $$($1_JVM) $$($1_SJAVAC) $$($1_SJAVAC_ARGS_STRING) $$($1_FLAGS) \
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   342
        $$($1_HEADERS_ARG) $$($1_BIN) $$($1_EXCLUDES) $$($1_INCLUDES) \
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   343
        $$($1_EXCLUDE_FILES) $$($1_INCLUDE_FILES)
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   344
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   345
        $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1.vardeps)
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28360
diff changeset
   346
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   347
    $$($1_COMPILE_TARGET): $$($1_SRCS) $$($1_DEPENDS) $$($1_VARDEPS_FILE)
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   348
	$$(call MakeDir, $$(@D) $$(dir $$($1_SJAVAC_PORTFILE)))
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   349
	$$(eval $$(call ListPathsSafely,$1_SRCS, $$@.tmp))
35009
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   350
        ifneq ($$($1_SJAVAC_ARGS_FILE), )
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   351
	  $$(eval $$(call ListPathsSafely,$1_SJAVAC_ARGS_STRING, $$($1_SJAVAC_ARGS_FILE)))
8b6dd0d6ffe0 8147449: sjavac builds of jdk9/dev with closed sources broken
erikj
parents: 34924
diff changeset
   352
        endif
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   353
	$$(call LogWarn, Compiling $1)
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   354
	$$(call ExecuteWithLog, $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$$($1_SAFE_NAME)_batch, \
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31014
diff changeset
   355
	    $$($1_JVM) $$($1_SJAVAC) \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31014
diff changeset
   356
	        $$($1_REMOTE) \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31014
diff changeset
   357
	        -j 1 \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31014
diff changeset
   358
	        --permit-unidentified-artifacts \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31014
diff changeset
   359
	        --permit-sources-without-package \
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   360
	        --compare-found-sources $$@.tmp \
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31014
diff changeset
   361
	        --log=$(LOG_LEVEL) \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   362
	        --state-dir=$$($1_BIN)$$($1_MODULE_SUBDIR) \
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31014
diff changeset
   363
	        $$($1_SJAVAC_ARGS) \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31014
diff changeset
   364
	        $$($1_FLAGS) \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31014
diff changeset
   365
	        $$($1_HEADERS_ARG) \
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31014
diff changeset
   366
	        -d $$($1_BIN)) && \
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   367
	$(MV) $$@.tmp $$@
26129
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   368
        # Create a pubapi file that only changes when the pubapi changes. Dependent
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   369
        # compilations can use this file to only get recompiled when pubapi has changed.
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   370
        # Grep returns 1 if no matching lines are found. Do not fail for this.
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   371
	$(GREP) -e "^I" $$($1_BIN)$$($1_MODULE_SUBDIR)/javac_state > $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1_pubapi.tmp \
26129
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   372
	    || test "$$$$?" = "1"
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   373
	if [ ! -f $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1_pubapi ] \
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   374
	    || [ "`$(DIFF) $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1_pubapi \
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   375
	        $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1_pubapi.tmp`" != "" ]; then \
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   376
	  $(MV) $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1_pubapi.tmp \
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   377
	      $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1_pubapi; \
26129
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   378
	fi
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   379
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   380
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   381
    # Using plain javac to batch compile everything.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   382
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   383
    # When building in batch, put headers in a temp dir to filter out those that actually
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   384
    # changed before copying them to the real header dir.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   385
    ifneq (,$$($1_HEADERS))
22481
e0f8e9039971 8033210: Intermittent build failure: jdk8 fails on win_i586 in jdk/make (p11_convert.c(67) : Cannot open 'sun_security_pkcs11_wrapper_PKCS11.h)
erikj
parents: 22480
diff changeset
   386
      $1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   387
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   388
      $$($1_HEADERS)/_the.$1_headers: $$($1_COMPILE_TARGET)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   389
		$(MKDIR) -p $$(@D)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   390
		if [ -d "$$($1_HEADERS).$1.tmp" ]; then \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   391
		  for f in `$(CD) $$($1_HEADERS).$1.tmp && $(FIND) . -type f`; do \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   392
		    if [ ! -f "$$($1_HEADERS)/$$$$f" ] \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   393
		        || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   394
		      $(MKDIR) -p `$(DIRNAME) $$($1_HEADERS)/$$$$f`; \
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   395
		      $(CP) -f $$($1_HEADERS).$1.tmp/$$$$f $$($1_HEADERS)/$$$$f; \
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   396
		    fi; \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   397
		  done; \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   398
		fi
22481
e0f8e9039971 8033210: Intermittent build failure: jdk8 fails on win_i586 in jdk/make (p11_convert.c(67) : Cannot open 'sun_security_pkcs11_wrapper_PKCS11.h)
erikj
parents: 22480
diff changeset
   399
		$(RM) -r $$($1_HEADERS).$1.tmp
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   400
		$(TOUCH) $$@
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   401
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   402
      $1_HEADER_TARGETS := $$($1_HEADERS)/_the.$1_headers
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   403
    endif
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   404
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   405
    $1_VARDEPS := $$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) $$($1_BIN) \
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   406
        $$($1_HEADERS_ARG) $$($1_EXCLUDES) $$($1_INCLUDES) \
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32717
diff changeset
   407
        $$($1_EXCLUDE_FILES) $$($1_INCLUDE_FILES)
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   408
    $1_VARDEPS_FILE := $$(call DependOnVariable, $1_VARDEPS, \
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   409
        $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$1.vardeps)
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28360
diff changeset
   410
33055
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   411
    ifeq ($$($1_DISABLE_SJAVAC)x$(ENABLE_JAVAC_SERVER), xyes)
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   412
      $1_JAVAC_CMD := $$($1_SJAVAC) $$($1_REMOTE)
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   413
    else
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   414
      $1_JAVAC_CMD := $$($1_JAVAC)
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   415
    endif
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   416
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   417
    # When not using sjavac, pass along all sources to javac using an @file.
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   418
    $$($1_COMPILE_TARGET): $$($1_SRCS) $$($1_DEPENDS) $$($1_VARDEPS_FILE)
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   419
	$$(call MakeDir, $$(@D))
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   420
	$$(eval $$(call ListPathsSafely,$1_SRCS, $$@.tmp))
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   421
	$$(call LogWarn, Compiling $$(words $$($1_SRCS)) files for $1)
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   422
	$$(call ExecuteWithLog, $$($1_BIN)$$($1_MODULE_SUBDIR)/_the.$$($1_SAFE_NAME)_batch, \
33055
3676b99f33cf 8140312: Enable new sjavac server only mode in jdk build
erikj
parents: 32807
diff changeset
   423
	    $$($1_JVM) $$($1_JAVAC_CMD) $$($1_FLAGS) \
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31014
diff changeset
   424
	        -implicit:none \
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   425
		-d $$($1_BIN) $$($1_HEADERS_ARG) @$$@.tmp) && \
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   426
	$(MV) $$@.tmp $$@
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   427
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   428
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   429
  # Add all targets to main variable
34102
c0a98357f847 8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents: 33442
diff changeset
   430
  $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_COMPILE_TARGET) \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   431
      $$($1_HEADER_TARGETS)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   432
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   433
  # Check if a jar file was specified, then setup the rules for the jar.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   434
  ifneq (,$$($1_JAR))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   435
    # If no suffixes was explicitly set for this jar file.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   436
    # Use class and the cleaned/copied properties file suffixes as the default
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   437
    # for the types of files to be put into the jar.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   438
    ifeq (,$$($1_SUFFIXES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   439
      $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   440
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   441
33438
35cd6a1619df 8141333: Rename SetupArchive to SetupJarArchive
ihse
parents: 33437
diff changeset
   442
    $$(eval $$(call SetupJarArchive, ARCHIVE_$1, \
29312
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29174
diff changeset
   443
        DEPENDENCIES:=$$($1), \
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 35444
diff changeset
   444
        SRCS:=$$($1_BIN)$$($1_MODULE_SUBDIR), \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   445
        SUFFIXES:=$$($1_SUFFIXES), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   446
        EXCLUDE:=$$($1_EXCLUDES), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   447
        INCLUDES:=$$($1_INCLUDES), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   448
        EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   449
        JAR:=$$($1_JAR), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   450
        JARMAIN:=$$($1_JARMAIN), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   451
        MANIFEST:=$$($1_MANIFEST), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   452
        EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   453
        JARINDEX:=$$($1_JARINDEX), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   454
        HEADERS:=$$($1_HEADERS), \
33438
35cd6a1619df 8141333: Rename SetupArchive to SetupJarArchive
ihse
parents: 33437
diff changeset
   455
        SETUP:=$$($1_SETUP), \
35cd6a1619df 8141333: Rename SetupArchive to SetupJarArchive
ihse
parents: 33437
diff changeset
   456
    ))
22480
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   457
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   458
    # Add jar to target list
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   459
    $1 += $$($1_JAR)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   460
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   461
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   462
  # Check if a srczip was specified, then setup the rules for the srczip.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   463
  ifneq (,$$($1_SRCZIP))
33437
1cf150337073 8141261: Clean up building of demos
ihse
parents: 33055
diff changeset
   464
    $$(eval $$(call SetupZipArchive, ZIP_ARCHIVE_$1, \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   465
        SRC:=$$($1_SRC), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   466
        ZIP:=$$($1_SRCZIP), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   467
        INCLUDES:=$$($1_INCLUDES), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   468
        EXCLUDES:=$$($1_EXCLUDES), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   469
        EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
22480
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   470
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   471
    # Add zip to target list
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   472
    $1 += $$($1_SRCZIP)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   473
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   474
endef
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   475
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   476
# Use this macro to find the correct target to depend on when the original
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   477
# SetupJavaCompilation is declared in a different makefile, to avoid having
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   478
# to declare and evaluate it again.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   479
# param 1 is for example BUILD_MYPACKAGE
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   480
# param 2 is the output directory (BIN)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   481
define SetupJavaCompilationCompileTarget
26129
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   482
  $(if $(findstring yes, $(ENABLE_SJAVAC)), $(strip $2)/_the.$(strip $1)_pubapi, \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   483
      $(strip $2)/_the.$(strip $1)_batch)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   484
endef
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28360
diff changeset
   485
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 28360
diff changeset
   486
endif # _JAVA_COMPILATION_GMK