make/common/JavaCompilation.gmk
author goetz
Thu, 18 Sep 2014 09:37:26 +0200
changeset 26805 73f3e9ac86f5
parent 26129 5ca768410aba
child 26671 b214ab286ce9
permissions -rw-r--r--
8058716: Add include missing in 8015774 Reviewed-by: kvn
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
20636
142c294d346e 6604021: RMIC is defaulting to BOOT jdk version, needs to be rmic.jar
erikj
parents: 20273
diff changeset
     2
# Copyright (c) 2011, 2013, 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
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    26
# This makefile is much simpler now that it can use the smart javac wrapper
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    27
# for dependency tracking between java packages and incremental compiles.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    28
# It could be even more simple if we added support for incremental jar updates
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    29
# directly from the smart javac wrapper.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    30
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    31
# Cleaning/copying properties here is not a good solution. The properties
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    32
# should be cleaned/copied by a annotation processor in sjavac.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    33
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    34
# When you read this source. Remember that $(sort ...) has the side effect
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    35
# of removing duplicates. It is actually this side effect that is
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    36
# desired whenever sort is used below!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    37
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
    38
ifndef _JAVA_COMPILATION_GMK
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
    39
_JAVA_COMPILATION_GMK := 1
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
    40
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    41
ifeq (,$(_MAKEBASE_GMK))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    42
  $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    43
endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    44
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    45
FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    46
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    47
define SetupJavaCompiler
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    48
  # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    49
  # This is the name of the compiler setup.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    50
  # param 2-9 are named args.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    51
  #   JVM:=The jvm used to run the javac/javah command
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    52
  #   JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    53
  #   FLAGS:=Flags to be supplied to javac
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    54
  #   SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    55
  #   SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    56
  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    57
  $(call LogSetupMacroEntry,SetupJavaCompiler($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    58
  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompiler, please update JavaCompilation.gmk))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    59
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    60
  # 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
    61
  # and the cookie necessary to talk to the server.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    62
  $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    63
  # 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
    64
  ifeq ($$($1_SERVER_JVM),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    65
    # 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
    66
    $1_SERVER_JVM:=$$($1_JVM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    67
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    68
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    69
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    70
define SetupArchive
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    71
  # param 1 is for example ARCHIVE_MYPACKAGE
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    72
  # param 2 are the dependecies
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    73
  # param 3,4,5,6,7,8,9 are named args.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    74
  #   SRCS:=List of directories in where to find files to add to archive
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    75
  #   SUFFIXES:=File suffixes to include in jar
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    76
  #   INCLUDES:=List of directories/packages in SRCS that should be included
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    77
  #   EXCLUDES:=List of directories/packages in SRCS that should be excluded
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    78
  #   EXCLUDE_FILES:=List of files in SRCS that should be excluded
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    79
  #   EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    80
  #   JAR:=Jar file to create
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    81
  #   MANIFEST:=Optional manifest file template.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    82
  #   JARMAIN:=Optional main class to add to manifest
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    83
  #   JARINDEX:=true means generate the index in the jar file.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    84
  #   SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    85
  #       added to the archive.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    86
  #   EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    87
  #   CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    88
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    89
  # NOTE: $2 is dependencies, not a named argument!
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    90
  $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    91
  $(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
20364
110ae1fd4f70 8025921: Make LOG=debug output more readable
erikj
parents: 20363
diff changeset
    92
  $(if $(findstring $(LOG_LEVEL),trace), $(info *[2] <dependencies> = $(strip $2)))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    93
  $(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    94
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    95
  $1_JARMAIN:=$(strip $$($1_JARMAIN))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    96
  $1_JARNAME:=$$(notdir $$($1_JAR))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    97
  $1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    98
  $1_DELETESS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletess
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
    99
  $1_DELETES_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   100
  $1_BIN:=$$(dir $$($1_JAR))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   101
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   102
  ifeq (,$$($1_SUFFIXES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   103
    # No suffix was set, default to classes.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   104
    $1_SUFFIXES:=.class
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   105
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   106
  # Convert suffixes to a find expression
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   107
  $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   108
  # On windows, a lot of includes/excludes risk making the command line too long, so
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   109
  # writing the grep patterns to files.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   110
  ifneq (,$$($1_INCLUDES))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   111
    $1_GREP_INCLUDE_PATTERNS:=$$(call EscapeDollar, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   112
        $$(foreach src,$$($1_SRCS), $$(addprefix $$(src)/,$$($1_INCLUDES))))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   113
    # If there are a lot of include patterns, output to file to shorten command lines
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   114
    ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   115
      $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   116
    else
20364
110ae1fd4f70 8025921: Make LOG=debug output more readable
erikj
parents: 20363
diff changeset
   117
      $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include $$(NEWLINE) \
110ae1fd4f70 8025921: Make LOG=debug output more readable
erikj
parents: 20363
diff changeset
   118
          $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \
110ae1fd4f70 8025921: Make LOG=debug output more readable
erikj
parents: 20363
diff changeset
   119
          >> $$($1_BIN)/_the.$$($1_JARNAME)_include)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   120
      $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   121
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   122
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   123
  ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   124
    $1_GREP_EXCLUDE_PATTERNS:=$$(call EscapeDollar, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   125
        $$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   126
        $$($1_EXCLUDES) $$($1_EXCLUDE_FILES))))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   127
    # If there are a lot of include patterns, output to file to shorten command lines
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   128
    ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   129
      $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   130
    else
20364
110ae1fd4f70 8025921: Make LOG=debug output more readable
erikj
parents: 20363
diff changeset
   131
      $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude $$(NEWLINE) \
110ae1fd4f70 8025921: Make LOG=debug output more readable
erikj
parents: 20363
diff changeset
   132
          $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \
110ae1fd4f70 8025921: Make LOG=debug output more readable
erikj
parents: 20363
diff changeset
   133
          >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   134
      $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   135
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   136
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   137
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   138
  # Check if this jar needs to have its index generated.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   139
  ifneq (,$$($1_JARINDEX))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   140
    $1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   141
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   142
    $1_JARINDEX = true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   143
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   144
  # When this macro is run in the same makefile as the java compilation, dependencies are
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   145
  # transfered in make variables. When the macro is run in a different makefile than the
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   146
  # java compilation, the dependencies need to be found in the filesystem.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   147
  ifneq (,$2)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   148
    $1_DEPS:=$2
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   149
  else
23170
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   150
    # Add all source roots to the find cache since we are likely going to run find 
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   151
    # 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
   152
    $$(eval $$(call FillCacheFind, $$($1_FIND_LIST)))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   153
    $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   154
        $$(call CacheFind,$$($1_SRCS)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   155
    ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   156
      $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS))
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   157
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   158
    ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   159
      $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   160
    endif
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   161
    # Look for EXTRA_FILES in all SRCS dirs and as absolute paths.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   162
    $1_DEPS+=$$(wildcard $$(foreach src, $$($1_SRCS), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   163
        $$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   164
    ifeq (,$$($1_SKIP_METAINF))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   165
      $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   166
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   167
  endif
23169
fdc2570ccbf4 8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents: 23167
diff changeset
   168
  # The dependency list should never be empty
fdc2570ccbf4 8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents: 23167
diff changeset
   169
  ifeq ($$(strip $$($1_DEPS)), )
fdc2570ccbf4 8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents: 23167
diff changeset
   170
    $$(warning No dependencies found for $1)
fdc2570ccbf4 8037238: JDK 9 images don't rebuild when access bridge jars rebuild
erikj
parents: 23167
diff changeset
   171
  endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   172
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   173
  # Utility macros, to make the shell script receipt somewhat easier to decipher.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   174
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   175
  # Capture extra files is the same for both CAPTURE_CONTENTS and SCAPTURE_CONTENTS so
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   176
  # only define it once to avoid duplication.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   177
  # The list of extra files might be long, so need to use ListPathsSafely to print
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   178
  # them out to a separte file. Then process the contents of that file to rewrite
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   179
  # into -C <dir> <file> lines.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   180
  # The EXTRA_FILES_RESOLVED varible must be set in the macro so that it's evaluated
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   181
  # in the recipe when the files are guaranteed to exist.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   182
  $1_CAPTURE_EXTRA_FILES=\
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   183
      $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra $$(NEWLINE) \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   184
      $$(eval $1_EXTRA_FILES_RESOLVED:=$$(call DoubleDollar, $$(call DoubleDollar, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   185
          $$(wildcard $$(foreach src, $$($1_SRCS), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   186
          $$(addprefix $$(src)/, $$($1_EXTRA_FILES))) $$($1_EXTRA_FILES))))) \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   187
      $$(if $$($1_EXTRA_FILES_RESOLVED), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   188
        $$(call ListPathsSafely,$1_EXTRA_FILES_RESOLVED,\n, \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   189
            >> $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra) $$(NEWLINE) \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   190
        $(SED) $$(foreach src,$$($1_SRCS), -e 's|$$(src)/|-C $$(src) |g') \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   191
            $$($1_BIN)/_the.$$($1_JARNAME)_contents.extra \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   192
            >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   193
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   194
  # The capture contents macro finds all files (matching the patterns, typically
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   195
  # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
22467
kvn
parents: 22466 21054
diff changeset
   196
  # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   197
  $1_CAPTURE_CONTENTS=\
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   198
      $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   199
      $$(foreach src,$$($1_SRCS), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   200
        $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   201
          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   202
        >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   203
      $$($1_CAPTURE_EXTRA_FILES)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   204
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   205
  # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   206
  ifeq (,$$($1_SKIP_METAINF))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   207
    $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   208
        ( $(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   209
        $$($1_BIN)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE) )
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   210
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   211
  # The capture deletes macro finds all deleted files and concatenates them. The resulting file
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   212
  # tells us what to remove from the jar-file.
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   213
  $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   214
      -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   215
  # The update contents macro updates the jar file with the previously capture contents.
22467
kvn
parents: 22466 21054
diff changeset
   216
  # Use 'wc -w' to see if the contents file is empty.
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   217
  $1_UPDATE_CONTENTS=\
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   218
      if [ "`$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   219
        $(ECHO) "  updating" `$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   220
        $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents; \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   221
      fi $$(NEWLINE)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   222
  # The s-variants of the above macros are used when the jar is created from scratch.
22467
kvn
parents: 22466 21054
diff changeset
   223
  # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   224
  $1_SCAPTURE_CONTENTS=\
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   225
      $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   226
      $$(foreach src,$$($1_SRCS), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   227
        $(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   228
            $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/|-C $$(src) |g' \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   229
            >> $$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)) \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   230
      $$($1_CAPTURE_EXTRA_FILES)
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   231
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   232
  ifeq (,$$($1_SKIP_METAINF))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   233
    $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   234
        ( $(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   235
        $$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   236
  endif
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   237
  $1_SUPDATE_CONTENTS=$(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   238
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   239
  # Use a slightly shorter name for logging, but with enough path to identify this jar.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   240
  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   241
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   242
  ifneq (,$$($1_CHECK_COMPRESS_JAR))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   243
    $1_JAR_CREATE_OPTIONS := c0fm
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   244
    $1_JAR_UPDATE_OPTIONS := u0f
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   245
    ifeq ($(COMPRESS_JARS), true)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   246
      $1_JAR_CREATE_OPTIONS := cfm
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   247
      $1_JAR_UPDATE_OPTIONS := uf
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   248
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   249
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   250
    $1_JAR_CREATE_OPTIONS := cfm
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   251
    $1_JAR_UPDATE_OPTIONS := uf
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   252
  endif
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   253
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   254
  # Here is the rule that creates/updates the jar file.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   255
  $$($1_JAR) : $$($1_DEPS)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   256
	$(MKDIR) -p $$($1_BIN)
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   257
	$$($1_GREP_INCLUDE_OUTPUT)
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   258
	$$($1_GREP_EXCLUDE_OUTPUT)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   259
	$$(if $$($1_MANIFEST), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   260
	  $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   261
	      -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   262
	, \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   263
	  $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   264
	$$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   265
	$$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   266
	$$(if $$(wildcard $$@), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   267
	  $(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   268
	  $$($1_CAPTURE_CONTENTS) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   269
	  $$($1_CAPTURE_METAINF) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   270
	  $(RM) $$($1_DELETES_FILE) $$(NEWLINE) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   271
	  $$($1_CAPTURE_DELETES) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   272
	  $(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   273
	  if [ -s $$($1_DELETESS_FILE) ]; then \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   274
	    $(ECHO) "  deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   275
	    $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   276
	  fi $$(NEWLINE) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   277
	  $$($1_UPDATE_CONTENTS) true $$(NEWLINE) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   278
	  $$($1_JARINDEX) && true \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   279
	, \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   280
	  $(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   281
	  $$($1_SCAPTURE_CONTENTS) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   282
	  $$($1_SCAPTURE_METAINF) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   283
	  $$($1_SUPDATE_CONTENTS) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   284
	  $$($1_JARINDEX) && true )
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   285
22480
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   286
  # Add jar to target list
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   287
  $1 += $$($1_JAR)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   288
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   289
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   290
define SetupZipArchive
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   291
  # param 1 is for example ZIP_MYSOURCE
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   292
  # param 2,3,4,5,6,7,8,9 are named args.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   293
  #   SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   294
  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   295
  $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   296
  $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk))
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
  # To avoid running find over too large sets of files, which causes make to crash
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   299
  # on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   300
  # of directories to run find in, if available.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   301
  ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   302
    $1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   303
        $$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   304
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   305
    $1_FIND_LIST := $$($1_SRC)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   306
  endif
18422
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   307
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   308
  # Find all files in the source tree.
20645
6170a286f879 8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents: 20364
diff changeset
   309
  $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST)))
6170a286f879 8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents: 20364
diff changeset
   310
6170a286f879 8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents: 20364
diff changeset
   311
  # Filter on suffixes if set
6170a286f879 8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents: 20364
diff changeset
   312
  ifneq ($$($1_SUFFIXES),)
6170a286f879 8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents: 20364
diff changeset
   313
    $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS))
6170a286f879 8025869: make docs doesn't regenerate docs correctly after changing API doc comments in jaxp sources
erikj
parents: 20364
diff changeset
   314
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   315
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   316
  ifneq ($$($1_INCLUDES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   317
    ifneq ($$($1_SUFFIXES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   318
      $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   319
          $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   320
    else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   321
      $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   322
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   323
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   324
  ifneq ($$($1_INCLUDE_FILES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   325
    $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   326
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   327
  ifneq ($$($1_EXCLUDES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   328
    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   329
    $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   330
    $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   331
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   332
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   333
  # Use a slightly shorter name for logging, but with enough path to identify this zip.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   334
  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   335
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   336
  # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   337
  # I.e. the zip -i and -x options should match the filtering done in the makefile.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   338
  # Explicitly excluded files can be given with absolute path. The patsubst solution
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   339
  # isn't perfect but the likelyhood of an absolute path to match something in a src
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   340
  # dir is very small.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   341
  # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   342
  # and only fail if it's not.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   343
  $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   344
	$(MKDIR) -p $$(@D)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   345
	$(ECHO) Updating $$($1_NAME)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   346
	$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   347
	$(TOUCH) $$@
22480
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   348
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   349
  # Add zip to target list
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   350
  $1 += $$($1_ZIP)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   351
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   352
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   353
define add_file_to_copy
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   354
  # param 1 = BUILD_MYPACKAGE
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   355
  # parma 2 = The source file to copy.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   356
  $2_TARGET:=$2
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   357
  # Remove the source prefix.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   358
  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   359
  # 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
   360
  # already has one
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   361
  ifeq ($$(findstring $$($2_TARGET), $$($1_COPY_LIST)), )
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   362
    $1_COPY_LIST += $$($2_TARGET)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   363
    # Now we can setup the depency that will trigger the copying.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   364
    $$($1_BIN)$$($2_TARGET) : $2
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   365
	$(MKDIR) -p $$(@D)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   366
	$(CP) $$< $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   367
	$(CHMOD) -f ug+w $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   368
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   369
    # And do not forget this target
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   370
    $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   371
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   372
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   373
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   374
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   375
# This macro is used only for properties files that are to be
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   376
# copied over to the classes directory in cleaned form:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   377
# Previously this was inconsistently done in different repositories.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   378
# 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
   379
# 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
   380
#
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   381
# The sed expression does this:
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   382
# 1. Add a backslash before any :, = or ! that do not have a backslash already.
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   383
# 2. Apply the file unicode2x.sed which does a whole bunch of \u00XX to \xXX 
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   384
#    conversions.
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   385
# 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
   386
# 4. Delete empty lines.
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   387
# 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
   388
# 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
   389
#    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
   390
# 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
   391
# 8. Finally it's all sorted to create a stable output.
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   392
# 
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   393
# 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
   394
define add_file_to_clean
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   395
  # param 1 = BUILD_MYPACKAGE
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   396
  # parma 2 = The source file to copy and clean.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   397
  $2_TARGET:=$2
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   398
  # Remove the source prefix.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   399
  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   400
  # Now we can setup the depency that will trigger the copying.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   401
  $$($1_BIN)$$($2_TARGET) : $2
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   402
	$(MKDIR) -p $$(@D)
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   403
	$(CAT) $$< | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   404
	        -e 's/\([^\\]\)!/\1\\!/g' -e 's/#.*/#/g' \
21759
e24e22311718 8027566: Remove the old build system
ihse
parents: 21054
diff changeset
   405
	    | $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   406
	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   407
	        -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
   408
	        -e 's/^[ 	]*//;s/[ 	]*$$$$//' \
23167
9996c6e2c03a 8036965: 9-dev solaris builds failed: sort: can't read STDIN: Illegal byte sequence
erikj
parents: 23162
diff changeset
   409
	        -e 's/\\=/=/' | LC_ALL=C $(SORT) > $$@
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   410
	$(CHMOD) -f ug+w $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   411
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   412
  # And do not forget this target
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   413
  $1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   414
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   415
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   416
define remove_string
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   417
  $2 := $$(subst $1,,$$($2))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   418
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   419
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   420
define replace_space_with_pathsep
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   421
  $1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2)))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   422
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   423
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   424
define SetupJavaCompilation
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   425
  # param 1 is for example BUILD_MYPACKAGE
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   426
  # param 2,3,4,5,6,7,8 are named args.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   427
  #   SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   428
  #   JVM:=path to ..bin/java
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   429
  #   ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   430
  #   SRC:=one or more directories to search for sources
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   431
  #   BIN:=store classes here
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   432
  #   INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   433
  #   EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   434
  #   COPY:=.prp means copy all prp files to the corresponding package in BIN.
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   435
  #   COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   436
  #   CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN.
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   437
  #   CLEAN_FILES:=myapp/foo/setting.txt means clean this file over to the package myapp/foo
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   438
  #   SRCZIP:=Create a src.zip based on the found sources and copied files.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   439
  #   INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   440
  #   EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   441
  #       "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
20636
142c294d346e 6604021: RMIC is defaulting to BOOT jdk version, needs to be rmic.jar
erikj
parents: 20273
diff changeset
   442
  #   JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete
142c294d346e 6604021: RMIC is defaulting to BOOT jdk version, needs to be rmic.jar
erikj
parents: 20273
diff changeset
   443
  #       source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   444
  #   HEADERS:=path to directory where all generated c-headers are written.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   445
  #   DEPENDS:=Extra dependecy
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   446
  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   447
  $(call LogSetupMacroEntry,SetupJavaCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   448
  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompilation, please update JavaCompilation.gmk))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   449
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   450
  # Extract the info from the java compiler setup.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   451
  $1_JVM := $$($$($1_SETUP)_JVM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   452
  $1_JAVAC := $$($$($1_SETUP)_JAVAC)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   453
  $1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   454
  ifeq ($$($1_JAVAC),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   455
    $$(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
   456
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   457
  $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   458
  $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   459
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   460
  # Handle addons and overrides.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   461
  $1_SRC:=$$(call ADD_SRCS,$$($1_SRC))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   462
  # Make sure the dirs exist.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   463
  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   464
  $$(eval $$(call MakeDir,$$($1_BIN)))
23170
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   465
  # Add all source roots to the find cache since we are likely going to run find 
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   466
  # 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
   467
  $$(eval $$(call FillCacheFind,$$($1_SRC)))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   468
  # Find all files in the source trees. Preserve order of source roots for overrides to
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   469
  # work correctly. CacheFind does not preserve order so need to call it for each root.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   470
  $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(foreach s,$$($1_SRC),$$(call CacheFind,$$(s))))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   471
  # Extract the java files.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   472
  ifneq ($$($1_EXCLUDE_FILES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   473
    $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   474
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   475
  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$(filter %.java,$$($1_ALL_SRCS)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   476
  ifneq ($$($1_INCLUDE_FILES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   477
    $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   478
    $1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   479
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   480
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   481
  # Now we have a list of all java files to compile: $$($1_SRCS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   482
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   483
  # Create the corresponding smart javac wrapper command line.
23983
fa89aaeb38c2 8037085: The sjavac exclude option should accept valid directory identifiers
alundblad
parents: 23170
diff changeset
   484
  $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix /*,$$($1_EXCLUDES))) \
fa89aaeb38c2 8037085: The sjavac exclude option should accept valid directory identifiers
alundblad
parents: 23170
diff changeset
   485
      $$(addprefix -i ,$$(addsuffix /*,$$($1_INCLUDES))) \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   486
      $$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   487
      $$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   488
      -src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   489
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   490
  # Prepend the source/bin path to the filter expressions.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   491
  ifneq ($$($1_INCLUDES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   492
    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   493
    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   494
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   495
  ifneq ($$($1_EXCLUDES),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   496
    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   497
    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   498
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   499
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   500
  # All files below META-INF are always copied.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   501
  $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
   502
  # 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
   503
  ifneq (,$$($1_COPY)$$($1_COPY_FILES))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   504
    # Search for all files to be copied.
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   505
    $1_ALL_COPIES += $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   506
    # Copy these explicitly
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   507
    $1_ALL_COPIES += $$($1_COPY_FILES)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   508
    # Copy must also respect filters.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   509
    ifneq (,$$($1_INCLUDES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   510
      $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   511
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   512
    ifneq (,$$($1_EXCLUDES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   513
      $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   514
    endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   515
    ifneq (,$$($1_EXCLUDE_FILES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   516
      $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   517
    endif
23162
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   518
  endif
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   519
    ifneq (,$$($1_ALL_COPIES))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   520
      # Yep, there are files to be copied!
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   521
      $1_ALL_COPY_TARGETS:=
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   522
          $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   523
      # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   524
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   525
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   526
  # 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
   527
  ifneq (,$$($1_CLEAN)$$($1_CLEAN_FILES))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   528
    # Search for all files to be copied.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   529
    $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
   530
    # Clean these explicitly
cb2710310e93 8036611: Cleanup of handling of properties and other java resources in the build
erikj
parents: 22481
diff changeset
   531
    $1_ALL_CLEANS += $$($1_CLEAN_FILES)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   532
    # Copy and clean must also respect filters.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   533
    ifneq (,$$($1_INCLUDES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   534
      $1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   535
    endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   536
    ifneq (,$$($1_EXCLUDES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   537
      $1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   538
    endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   539
    ifneq (,$$($1_EXCLUDE_FILES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   540
      $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   541
    endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   542
    ifneq (,$$($1_ALL_CLEANS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   543
      # Yep, there are files to be copied and cleaned!
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   544
      $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
   545
          $$(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
   546
      # 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
   547
    endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   548
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   549
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   550
  # Prep the source paths.
20638
lana
parents: 20636 20364
diff changeset
   551
  ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),)
lana
parents: 20636 20364
diff changeset
   552
    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE)))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   553
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   554
    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   555
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   556
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   557
  # 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
   558
  # and remove .java at the end.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   559
  $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
   560
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   561
  ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   562
    ifneq (,$$($1_HEADERS))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   563
      $1_HEADERS_ARG := -h $$($1_HEADERS)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   564
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   565
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   566
    # Using sjavac to compile.
26129
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   567
    $1_COMPILE_TARGETS := $$($1_BIN)/_the.$1_batch
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   568
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   569
    # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   570
    # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   571
    # and javac is simply replaced with sjavac.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   572
    $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   573
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   574
    # Set the $1_REMOTE to spawn a background javac server.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   575
    $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   576
26129
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   577
    $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   578
	$(MKDIR) -p $$(@D)
26129
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   579
        # As a workaround for sjavac not tracking api changed from the classpath, force full
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   580
        # recompile if an external dependency, which is something other than a source
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   581
        # change, triggered this compilation.
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   582
	$$(if $$(filter-out $$($1_SRCS), $$?), $(FIND) $$(@D) -name "*.class" $(FIND_DELETE))
21054
dac7de31b5b5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20650
diff changeset
   583
	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   584
	$(ECHO) Compiling $1
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   585
	($$($1_JVM) $$($1_SJAVAC) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   586
	    $$($1_REMOTE) \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   587
	    -j 1 \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   588
	    --permit-unidentified-artifacts \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   589
	    --permit-sources-without-package \
21054
dac7de31b5b5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20650
diff changeset
   590
	    --compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   591
	    --log=$(LOG_LEVEL) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   592
	    $$($1_SJAVAC_ARGS) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   593
	    $$($1_FLAGS) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   594
	    $$($1_HEADERS_ARG) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   595
	    -d $$($1_BIN) && \
21054
dac7de31b5b5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20650
diff changeset
   596
	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
26129
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   597
        # 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
   598
        # 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
   599
        # Grep returns 1 if no matching lines are found. Do not fail for this.
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   600
	$(GREP) -e "^I" $$($1_BIN)/javac_state > $$($1_BIN)/_the.$1_pubapi.tmp \
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   601
	    || test "$$$$?" = "1"
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   602
	if [ ! -f $$($1_BIN)/_the.$1_pubapi ] \
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   603
	    || [ "`$(DIFF) $$($1_BIN)/_the.$1_pubapi $$($1_BIN)/_the.$1_pubapi.tmp`" != "" ]; then \
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   604
	  $(MV) $$($1_BIN)/_the.$1_pubapi.tmp $$($1_BIN)/_the.$1_pubapi; \
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   605
	fi
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   606
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   607
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   608
    # Using plain javac to batch compile everything.
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   609
    $1_COMPILE_TARGETS := $$($1_BIN)/_the.$1_batch
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   610
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   611
    # 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
   612
    # changed before copying them to the real header dir.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   613
    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
   614
      $1_HEADERS_ARG := -h $$($1_HEADERS).$1.tmp
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   615
21054
dac7de31b5b5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20650
diff changeset
   616
      $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   617
		$(MKDIR) -p $$(@D)
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   618
		if [ -d "$$($1_HEADERS).$1.tmp" ]; then \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   619
		  for f in `ls $$($1_HEADERS).$1.tmp`; do \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   620
		    if [ ! -f "$$($1_HEADERS)/$$$$f" ] \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   621
		        || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).$1.tmp/$$$$f`" != "" ]; then \
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
   622
		    $(CP) -f $$($1_HEADERS).$1.tmp/$$$$f $$($1_HEADERS)/$$$$f; \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   623
		  fi; \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   624
		  done; \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   625
		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
   626
		$(RM) -r $$($1_HEADERS).$1.tmp
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   627
		$(TOUCH) $$@
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   628
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   629
      $1_HEADER_TARGETS := $$($1_HEADERS)/_the.$1_headers
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   630
    endif
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   631
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   632
    # When not using sjavac, pass along all sources to javac using an @file.
21054
dac7de31b5b5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20650
diff changeset
   633
    $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   634
	$(MKDIR) -p $$(@D)
21054
dac7de31b5b5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20650
diff changeset
   635
	$(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp
dac7de31b5b5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20650
diff changeset
   636
	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
dac7de31b5b5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20650
diff changeset
   637
	$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   638
	($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   639
	    -implicit:none -sourcepath "$$($1_SRCROOTSC)" \
21054
dac7de31b5b5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20650
diff changeset
   640
	    -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \
dac7de31b5b5 8009280: JCE jurisdiction policy files not copied into jdk/lib/security
erikj
parents: 20650
diff changeset
   641
	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   642
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   643
  endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   644
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   645
  # Add all targets to main variable
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   646
  $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_COMPILE_TARGETS) \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   647
      $$($1_HEADER_TARGETS)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   648
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   649
  # 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
   650
  ifneq (,$$($1_JAR))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   651
    # If no suffixes was explicitly set for this jar file.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   652
    # 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
   653
    # for the types of files to be put into the jar.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   654
    ifeq (,$$($1_SUFFIXES))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   655
      $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   656
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   657
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   658
    $$(eval $$(call SetupArchive,ARCHIVE_$1,$$($1), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   659
        SRCS:=$$($1_BIN), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   660
        SUFFIXES:=$$($1_SUFFIXES), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   661
        EXCLUDE:=$$($1_EXCLUDES), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   662
        INCLUDES:=$$($1_INCLUDES), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   663
        EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   664
        JAR:=$$($1_JAR), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   665
        JARMAIN:=$$($1_JARMAIN), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   666
        MANIFEST:=$$($1_MANIFEST), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   667
        EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   668
        JARINDEX:=$$($1_JARINDEX), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   669
        HEADERS:=$$($1_HEADERS), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   670
        SETUP:=$$($1_SETUP)))
22480
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   671
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   672
    # Add jar to target list
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   673
    $1 += $$($1_JAR)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   674
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   675
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   676
  # 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
   677
  ifneq (,$$($1_SRCZIP))
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   678
    $$(eval $$(call SetupZipArchive,ARCHIVE_$1, \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   679
        SRC:=$$($1_SRC), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   680
        ZIP:=$$($1_SRCZIP), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   681
        INCLUDES:=$$($1_INCLUDES), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   682
        EXCLUDES:=$$($1_EXCLUDES), \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   683
        EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
22480
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   684
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   685
    # Add zip to target list
d1be923b168a 8026773: Failing compilation in Corba does not fail the build
erikj
parents: 22469
diff changeset
   686
    $1 += $$($1_SRCZIP)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 20273
diff changeset
   687
  endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   688
endef
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   689
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   690
# Use this macro to find the correct target to depend on when the original
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   691
# SetupJavaCompilation is declared in a different makefile, to avoid having
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   692
# to declare and evaluate it again.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   693
# param 1 is for example BUILD_MYPACKAGE
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   694
# param 2 is the output directory (BIN)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   695
define SetupJavaCompilationCompileTarget
26129
5ca768410aba 8055922: Work around sjavac limitation with public api tracking cross modules
erikj
parents: 25854
diff changeset
   696
  $(if $(findstring yes, $(ENABLE_SJAVAC)), $(strip $2)/_the.$(strip $1)_pubapi, \
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   697
      $(strip $2)/_the.$(strip $1)_batch)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   698
endef
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 24080
diff changeset
   699
endif