common/makefiles/JavaCompilation.gmk
author henryjen
Mon, 07 Oct 2013 15:18:37 -0700
changeset 20538 4f7f94090a46
parent 18422 8443ba629f9d
child 20273 126644dde85d
child 22466 25aaf85d1ada
permissions -rw-r--r--
8026009: Changes for 8025968 break all stream tests Reviewed-by: mduigou
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     2
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
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
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    38
ifeq  (,$(_MAKEBASE_GMK))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    39
    $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    40
endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    41
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    42
FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    43
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    44
define SetupJavaCompiler
15393
e3761cf4e010 8006872: Stop creating four jars with identical content in the new build system.
ohrstrom
parents: 15062
diff changeset
    45
    # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE
e3761cf4e010 8006872: Stop creating four jars with identical content in the new build system.
ohrstrom
parents: 15062
diff changeset
    46
    # This is the name of the compiler setup.
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    47
    # param 2-9 are named args.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    48
    #   JVM:=The jvm used to run the javac/javah command
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    49
    #   JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    50
    #   FLAGS:=Flags to be supplied to javac
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    51
    #   SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    52
    #   SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    53
    $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    54
    $(call LogSetupMacroEntry,SetupJavaCompiler($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    55
    $(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
    56
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    57
    # The port file contains the tcp/ip on which the server listens
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    58
    # and the cookie necessary to talk to the server.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    59
    $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    60
    # You can use a different JVM to run the background javac server.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    61
    ifeq ($$($1_SERVER_JVM),)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    62
        # It defaults to the same JVM that is used to start the javac command.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    63
        $1_SERVER_JVM:=$$($1_JVM)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    64
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    65
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    66
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    67
define SetupArchive
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    68
    # param 1 is for example ARCHIVE_MYPACKAGE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    69
    # param 2 are the dependecies
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    70
    # param 3,4,5,6,7,8,9 are named args.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    71
    #    SRCS:=List of directories in where to find files to add to archive
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    72
    #    SUFFIXES:=File suffixes to include in jar
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    73
    #    INCLUDES:=List of directories/packages in SRCS that should be included
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    74
    #    EXCLUDES:=List of directories/packages in SRCS that should be excluded
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    75
    #    EXCLUDE_FILES:=List of files in SRCS that should be excluded
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    76
    #    EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    77
    #    JAR:=Jar file to create
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    78
    #    MANIFEST:=Optional manifest file template.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    79
    #    JARMAIN:=Optional main class to add to manifest
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
    80
    #    JARINDEX:=true means generate the index in the jar file.
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    81
    #    SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    82
    #                  added to the archive.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    83
    #    EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest.
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    84
    #    CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    85
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    86
    # NOTE: $2 is dependencies, not a named argument!
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    87
    $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    88
    $(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
16583
f29d60d73e42 8010465: Can't enable sjavac when building in jprt.
erikj
parents: 15790
diff changeset
    89
    $(if $(findstring $(LOG_LEVEL),debug trace), $(info *[2] <dependencies> = $(strip $2)))
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
    90
    $(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    91
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    92
    $1_JARMAIN:=$(strip $$($1_JARMAIN))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    93
    $1_JARNAME:=$$(notdir $$($1_JAR))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    94
    $1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    95
    $1_DELETESS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletess
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    96
    $1_DELETES_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletes
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    97
    $1_BIN:=$$(dir $$($1_JAR))
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
    98
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    99
    ifeq (,$$($1_SUFFIXES))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   100
        # No suffix was set, default to classes.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   101
        $1_SUFFIXES:=.class
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   102
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   103
    # Convert suffixes to a find expression
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   104
    $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   105
    # On windows, a lot of includes/excludes risk making the command line too long, so 
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   106
    # writing the grep patterns to files.
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   107
    ifneq (,$$($1_INCLUDES))
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   108
        $1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),\
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   109
					$$(addprefix $$(src)/,$$($1_INCLUDES)))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   110
        # If there are a lot of include patterns, output to file to shorten command lines
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   111
        ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   112
            $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   113
        else
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   114
            $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include && \
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   115
                                    $$(strip $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   116
                                        >> $$($1_BIN)/_the.$$($1_JARNAME)_include))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   117
            $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   118
        endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   119
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   120
    ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   121
        $1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,\
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   122
		$$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   123
        # If there are a lot of include patterns, output to file to shorten command lines
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   124
        ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   125
            $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   126
        else
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   127
            $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude && \
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   128
                                    $$(strip $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   129
                                        >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   130
            $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   131
        endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   132
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   133
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   134
    # Check if this jar needs to have its index generated.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   135
    ifneq (,$$($1_JARINDEX))
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   136
      $1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@))
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   137
    else
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   138
      $1_JARINDEX = true
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   139
    endif
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   140
    # When this macro is run in the same makefile as the java compilation, dependencies are 
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   141
    # transfered in make variables. When the macro is run in a different makefile than the 
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   142
    # java compilation, the dependencies need to be found in the filesystem.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   143
    ifneq (,$2)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   144
        $1_DEPS:=$2
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   145
    else
15397
37e73be10c27 8007524: build-infra: Incremental build of tools.jar broken
erikj
parents: 15393
diff changeset
   146
        $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)),\
37e73be10c27 8007524: build-infra: Incremental build of tools.jar broken
erikj
parents: 15393
diff changeset
   147
                    $$(call CacheFind,$$($1_SRCS)))
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   148
        ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   149
            $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS))
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   150
        endif
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   151
        ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   152
            $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   153
        endif
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   154
        # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command 
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   155
        # lines, but not here for use in make dependencies.
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   156
        $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   157
        ifeq (,$$($1_SKIP_METAINF))
18422
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   158
            $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   159
        endif
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   160
    endif
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   161
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   162
    # Utility macros, to make the shell script receipt somewhat easier to dechipher.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   163
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   164
    # The capture contents macro finds all files (matching the patterns, typically
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   165
    # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   166
    $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS),\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   167
                   (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   168
                       $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' &&\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   169
                       $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES))) > \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   170
                       $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   171
    # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   172
    ifeq (,$$($1_SKIP_METAINF))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   173
        $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   174
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   175
    # The capture deletes macro finds all deleted files and concatenates them. The resulting file
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   176
    # tells us what to remove from the jar-file.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   177
    $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   178
    # The update contents macro updates the jar file with the previously capture contents.
14379
b449aa34783e 8003274: build-infra: Makefile changes needed for sjavac
tbell
parents: 14377
diff changeset
   179
    # xargs is used to trim the whitespace from the contents file, to see if it is empty.
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   180
    $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS),\
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   181
                    (cd $$(src) && \
14379
b449aa34783e 8003274: build-infra: Makefile changes needed for sjavac
tbell
parents: 14377
diff changeset
   182
                     if [ -n "`$(CAT) _the.$$($1_JARNAME)_contents | $(XARGS)`" ]; then \
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   183
                         $(ECHO) "  updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   184
                         $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   185
                     fi) $$(NEWLINE))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   186
    # The s-variants of the above macros are used when the jar is created from scratch.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   187
    $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS),\
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   188
                    (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   189
			$$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' &&\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   190
			$$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES))) > \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   191
			$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   192
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   193
    ifeq (,$$($1_SKIP_METAINF))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   194
        $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS),\
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   195
                    ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   196
			$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   197
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   198
    $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS),\
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   199
                    (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   200
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   201
    # Use a slightly shorter name for logging, but with enough path to identify this jar.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   202
    $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   203
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   204
    ifneq (,$$($1_CHECK_COMPRESS_JAR))
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   205
        $1_JAR_CREATE_OPTIONS := c0fm
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   206
        $1_JAR_UPDATE_OPTIONS := u0f
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   207
        ifeq ($(COMPRESS_JARS), true)
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   208
            $1_JAR_CREATE_OPTIONS := cfm
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   209
            $1_JAR_UPDATE_OPTIONS := uf
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   210
        endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   211
    else
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   212
        $1_JAR_CREATE_OPTIONS := cfm
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   213
        $1_JAR_UPDATE_OPTIONS := uf
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   214
    endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   215
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   216
    # Here is the rule that creates/updates the jar file.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   217
    $$($1_JAR) : $$($1_DEPS)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   218
	$(MKDIR) -p $$($1_BIN)
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   219
	$$($1_GREP_INCLUDE_OUTPUT)
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   220
	$$($1_GREP_EXCLUDE_OUTPUT)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   221
	$$(if $$($1_MANIFEST),\
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   222
		$(SED) -e "s#@@RELEASE@@#$(RELEASE)#"           \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   223
		       -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   224
	,\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   225
		$(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   226
	$$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   227
	$$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   228
	$$(if $$(wildcard $$@),\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   229
		$(ECHO) Modifying $$($1_NAME) $$(NEWLINE)\
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   230
		$$($1_CAPTURE_CONTENTS) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   231
		$$($1_CAPTURE_METAINF) \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   232
		$(RM) $$($1_DELETES_FILE) $$(NEWLINE)\
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   233
		$$($1_CAPTURE_DELETES) \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   234
		$(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE)\
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   235
		if [ -s $$($1_DELETESS_FILE) ]; then \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   236
			$(ECHO) "  deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   237
	                       $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   238
		fi $$(NEWLINE) \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   239
		$$($1_UPDATE_CONTENTS) true $$(NEWLINE) \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   240
		$$($1_JARINDEX) && true \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   241
	,\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   242
		$(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   243
	        $$($1_SCAPTURE_CONTENTS) \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   244
		$$($1_SCAPTURE_METAINF) \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   245
		$$($1_SUPDATE_CONTENTS) \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   246
		$$($1_JARINDEX) && true ) 
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   247
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   248
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   249
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   250
define SetupZipArchive
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   251
    # param 1 is for example ZIP_MYSOURCE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   252
    # param 2,3,4,5,6,7,8,9 are named args.
15062
0c0ce0e5a112 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15051
diff changeset
   253
    #    SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   254
    $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   255
    $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   256
    $(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
   257
18422
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   258
    # To avoid running find over too large sets of files, which causes make to crash
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   259
    # on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   260
    # of directories to run find in, if available.
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   261
    ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   262
	$1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC),\
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   263
		$$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   264
    else
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   265
        $1_FIND_LIST := $$($1_SRC)
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   266
    endif
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   267
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   268
    # Find all files in the source tree.
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   269
    $1_ALL_SRCS := $$(call not-containing,_the.,\
18422
8443ba629f9d 8016605: New files dont apear in src.zip
erikj
parents: 16583
diff changeset
   270
            $$(filter $$(addprefix %,$$($1_SUFFIXES)),$$(call CacheFind,$$($1_FIND_LIST))))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   271
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   272
    ifneq ($$($1_INCLUDES),)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   273
        ifneq ($$($1_SUFFIXES),)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   274
            $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES),\
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   275
		$$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   276
        else
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   277
            $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   278
        endif
15062
0c0ce0e5a112 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15051
diff changeset
   279
    endif
0c0ce0e5a112 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15051
diff changeset
   280
    ifneq ($$($1_INCLUDE_FILES),)
0c0ce0e5a112 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15051
diff changeset
   281
        $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
0c0ce0e5a112 8005654: build-infra: Create sec-bin.zip
erikj
parents: 15051
diff changeset
   282
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   283
    ifneq ($$($1_EXCLUDES),)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   284
        $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   285
        $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   286
        $1_ALL_SRCS     := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   287
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   288
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   289
    # Use a slightly shorter name for logging, but with enough path to identify this zip.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   290
    $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   291
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   292
    # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   293
    # I.e. the zip -i and -x options should match the filtering done in the makefile.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   294
    # Explicitly excluded files can be given with absolute path. The patsubst solution
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   295
    # isn't perfect but the likelyhood of an absolute path to match something in a src
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   296
    # dir is very small.
14613
a29ecb044d0f 8004045: build-infra: Error 12 from zip when updating src.zip
erikj
parents: 14564
diff changeset
   297
    # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
a29ecb044d0f 8004045: build-infra: Error 12 from zip when updating src.zip
erikj
parents: 14564
diff changeset
   298
    # and only fail if it's not.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   299
    $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   300
		$(MKDIR) -p $$(@D)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   301
		$(ECHO) Updating $$($1_NAME)
14613
a29ecb044d0f 8004045: build-infra: Error 12 from zip when updating src.zip
erikj
parents: 14564
diff changeset
   302
		$$(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
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   303
		$(TOUCH) $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   304
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   305
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   306
define add_file_to_copy
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   307
    # param 1 = BUILD_MYPACKAGE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   308
    # parma 2 = The source file to copy.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   309
    $2_TARGET:=$2
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   310
    # Remove the source prefix. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   311
    $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   312
    # Now we can setup the depency that will trigger the copying.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   313
    $$($1_BIN)$$($2_TARGET) : $2
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   314
	$(MKDIR) -p $$(@D)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   315
	$(CP) $$< $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   316
	$(CHMOD) -f ug+w $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   317
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   318
    # And do not forget this target
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   319
    $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   320
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   321
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   322
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   323
# This macro is used only for properties files that are to be
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   324
# copied over to the classes directory in cleaned form:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   325
# Previously this was inconsistently done in different repositories.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   326
# 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
   327
# a standard annotation processor from with sjavac.
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   328
define add_file_to_copy_and_clean
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   329
    # param 1 = BUILD_MYPACKAGE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   330
    # parma 2 = The source file to copy and clean.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   331
    $2_TARGET:=$2
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   332
    # Remove the source prefix. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   333
    $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   334
    # Now we can setup the depency that will trigger the copying.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   335
    $$($1_BIN)$$($2_TARGET) : $2
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   336
	$(MKDIR) -p $$(@D)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   337
	$(CAT) $$< | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e  's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   338
                   | $(SED) -f "$(SRC_ROOT)/common/makefiles/support/unicode2x.sed" \
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   339
		   | $(SED) -e '/^#/d' -e '/^$$$$/d' \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   340
		            -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   341
			    -e 's/^[ \t]*//;s/[ \t]*$$$$//' \
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   342
			    -e 's/\\=/=/' | LANG=C $(SORT) > $$@
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   343
	$(CHMOD) -f ug+w $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   344
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   345
    # And do not forget this target
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   346
    $1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   347
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   348
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   349
define remove_string
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   350
    $2 := $$(subst $1,,$$($2))
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 replace_space_with_pathsep
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   354
    $1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2)))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   355
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   356
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   357
define SetupJavaCompilation
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   358
    # param 1 is for example BUILD_MYPACKAGE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   359
    # param 2,3,4,5,6,7,8 are named args.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   360
    #    SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   361
    #    JVM:=path to ..bin/java
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   362
    #    ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   363
    #    SRC:=one or more directories to search for sources
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   364
    #    BIN:=store classes here
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   365
    #    INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   366
    #    EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   367
    #    COPY:=.prp means copy all prp files to the corresponding package in BIN.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   368
    #    CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   369
    #    COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   370
    #    SRCZIP:=Create a src.zip based on the found sources and copied files.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   371
    #    INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   372
    #    EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   373
    #                   "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   374
    #    JAVAC_SOURCE_PATH_UGLY_OVERRIDE:=Don't use this. This forces an explicit -sourcepath to javac.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   375
    #                                     Its only here until we cleanup some nasty source code pasta in the jdk.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   376
    #    HEADERS:=path to directory where all generated c-headers are written.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   377
    #    DEPENDS:=Extra dependecy
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   378
    $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   379
    $(call LogSetupMacroEntry,SetupJavaCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   380
    $(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
   381
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   382
    # Extract the info from the java compiler setup.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   383
    $1_JVM   := $$($$($1_SETUP)_JVM)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   384
    $1_JAVAC := $$($$($1_SETUP)_JAVAC)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   385
    $1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   386
    ifeq ($$($1_JAVAC),)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   387
        $$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   388
    endif
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   389
    $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   390
    $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   391
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   392
    # Handle addons and overrides.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   393
    $1_SRC:=$$(call ADD_SRCS,$$($1_SRC))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   394
    # Make sure the dirs exist.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   395
    $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d)))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   396
    $$(eval $$(call MakeDir,$$($1_BIN)))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   397
    # Find all files in the source trees.
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14613
diff changeset
   398
    $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC)))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   399
    # Extract the java files.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   400
    ifneq ($$($1_EXCLUDE_FILES),)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   401
        $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   402
    endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   403
    $1_SRCS     := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$(filter %.java,$$($1_ALL_SRCS)))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   404
    ifneq ($$($1_INCLUDE_FILES),)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   405
        $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   406
        $1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   407
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   408
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   409
    # Now we have a list of all java files to compile: $$($1_SRCS)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   410
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   411
    # Create the corresponding smart javac wrapper command line.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   412
    $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix .*,$$(subst /,.,$$($1_EXCLUDES)))) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   413
		$$(addprefix -i ,$$(addsuffix .*,$$(subst /,.,$$($1_INCLUDES)))) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   414
		$$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   415
		$$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   416
		-src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   417
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   418
    # Prepend the source/bin path to the filter expressions.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   419
    ifneq ($$($1_INCLUDES),)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   420
        $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   421
        $1_SRCS     := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   422
    endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   423
    ifneq ($$($1_EXCLUDES),)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   424
        $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   425
        $1_SRCS     := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   426
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   427
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   428
    # Find all files to be copied from source to bin.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   429
    ifneq (,$$($1_COPY))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   430
        # Search for all files to be copied.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   431
        $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   432
        # Copy these explicitly
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   433
        $1_ALL_COPIES += $$($1_COPY_FILES)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   434
        # Copy must also respect filters.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   435
        ifneq (,$$($1_INCLUDES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   436
            $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   437
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   438
        ifneq (,$$($1_EXCLUDES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   439
            $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   440
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   441
        ifneq (,$$($1_EXCLUDE_FILES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   442
            $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   443
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   444
        # All files below META-INF are always copied.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   445
        $1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   446
        ifneq (,$$($1_ALL_COPIES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   447
            # Yep, there are files to be copied!
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   448
            $1_ALL_COPY_TARGETS:=
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   449
            $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   450
            # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   451
        endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   452
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   453
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   454
    # Find all property files to be copied and cleaned from source to bin.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   455
    ifneq (,$$($1_CLEAN))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   456
        # Search for all files to be copied.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   457
        $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   458
        # Copy and clean must also respect filters.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   459
        ifneq (,$$($1_INCLUDES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   460
            $1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   461
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   462
        ifneq (,$$($1_EXCLUDES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   463
            $1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   464
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   465
        ifneq (,$$($1_EXCLUDE_FILES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   466
            $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   467
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   468
        ifneq (,$$($1_ALL_CLEANS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   469
            # Yep, there are files to be copied and cleaned!
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   470
            $1_ALL_COPY_CLEAN_TARGETS:=
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   471
            $$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_copy_and_clean,$1,$$i)))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   472
            # Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files!
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   473
        endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   474
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   475
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   476
    # Prep the source paths.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   477
    ifneq ($$($1_JAVAC_SOURCE_PATH_UGLY_OVERRIDE),)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   478
      $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_UGLY_OVERRIDE)))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   479
    else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   480
      $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   481
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   482
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   483
    # Create a sed expression to remove the source roots and to replace / with .
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   484
    # and remove .java at the end. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   485
    $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   486
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   487
    ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   488
        ifneq (,$$($1_HEADERS))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   489
            $1_HEADERS_ARG := -h $$($1_HEADERS)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   490
        endif
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   491
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   492
        # Using sjavac to compile. 
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   493
        $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   494
15393
e3761cf4e010 8006872: Stop creating four jars with identical content in the new build system.
ohrstrom
parents: 15062
diff changeset
   495
        # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be 
e3761cf4e010 8006872: Stop creating four jars with identical content in the new build system.
ohrstrom
parents: 15062
diff changeset
   496
        # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
e3761cf4e010 8006872: Stop creating four jars with identical content in the new build system.
ohrstrom
parents: 15062
diff changeset
   497
        # and javac is simply replaced with sjavac.
e3761cf4e010 8006872: Stop creating four jars with identical content in the new build system.
ohrstrom
parents: 15062
diff changeset
   498
        $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   499
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   500
        # Set the $1_REMOTE to spawn a background javac server.
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   501
        $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   502
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   503
        $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   504
		$(MKDIR) -p $$(@D)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   505
		$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.batch.tmp)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   506
		$(ECHO) Compiling $1
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   507
		($$($1_JVM) $$($1_SJAVAC) \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   508
			$$($1_REMOTE) \
15790
3a8903868eb2 8004352: build-infra: Limit JOBS on large machines
erikj
parents: 15397
diff changeset
   509
			-j $(JOBS) \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   510
			--permit-unidentified-artifacts \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   511
			--permit-sources-without-package \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   512
			--compare-found-sources $$($1_BIN)/_the.batch.tmp \
16583
f29d60d73e42 8010465: Can't enable sjavac when building in jprt.
erikj
parents: 15790
diff changeset
   513
			--log=$(LOG_LEVEL) \
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   514
			$$($1_SJAVAC_ARGS) \
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   515
			$$($1_FLAGS) \
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   516
			$$($1_HEADERS_ARG) \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   517
			-d $$($1_BIN) && \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   518
			$(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   519
    else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   520
        # Using plain javac to batch compile everything.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   521
        $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.batch
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   522
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   523
        # When buliding in batch, put headers in a temp dir to filter out those that actually
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   524
        # changed before copying them to the real header dir.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   525
        ifneq (,$$($1_HEADERS))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   526
            $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   527
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   528
            $$($1_HEADERS)/_the.headers: $$($1_BIN)/_the.batch
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   529
		$(MKDIR) -p $$(@D)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   530
		for f in `ls $$($1_HEADERS).tmp`; do \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   531
		  if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   532
		    $(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   533
		  fi; \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   534
		done
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   535
		$(RM) -r $$($1_HEADERS).tmp
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   536
		$(TOUCH) $$@
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   537
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   538
            $1 += $$($1_HEADERS)/_the.headers
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   539
        endif
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   540
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   541
        # When not using sjavac, pass along all sources to javac using an @file.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   542
        $$($1_BIN)/_the.batch: $$($1_SRCS) $$($1_DEPENDS)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   543
		$(MKDIR) -p $$(@D)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   544
		$(RM) $$($1_BIN)/_the.batch $$($1_BIN)/_the.batch.tmp
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   545
		$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.batch.tmp)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   546
		$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   547
		($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   548
			-implicit:none -sourcepath "$$($1_SRCROOTSC)" \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   549
			-d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.batch.tmp && \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   550
			$(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   551
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   552
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   553
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   554
    # Check if a jar file was specified, then setup the rules for the jar.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   555
    ifneq (,$$($1_JAR))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   556
        # If no suffixes was explicitly set for this jar file.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   557
        # Use class and the cleaned/copied properties file suffixes as the default
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   558
        # for the types of files to be put into the jar.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   559
        ifeq (,$$($1_SUFFIXES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   560
            $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   561
        endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   562
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   563
        $$(eval $$(call SetupArchive,ARCHIVE_$1,$$($1),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   564
		SRCS:=$$($1_BIN),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   565
		SUFFIXES:=$$($1_SUFFIXES),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   566
		EXCLUDE:=$$($1_EXCLUDES),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   567
		INCLUDES:=$$($1_INCLUDES),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   568
		EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   569
		JAR:=$$($1_JAR),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   570
		JARMAIN:=$$($1_JARMAIN),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   571
		MANIFEST:=$$($1_MANIFEST),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   572
		EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   573
		JARINDEX:=$$($1_JARINDEX),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   574
		HEADERS:=$$($1_HEADERS),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   575
		SETUP:=$$($1_SETUP)))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   576
    endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   577
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   578
    # Check if a srczip was specified, then setup the rules for the srczip.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   579
    ifneq (,$$($1_SRCZIP))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   580
        $$(eval $$(call SetupZipArchive,ARCHIVE_$1,\
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   581
		SRC:=$$($1_SRC),\
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   582
		ZIP:=$$($1_SRCZIP),\
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   583
		INCLUDES:=$$($1_INCLUDES),\
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   584
		EXCLUDES:=$$($1_EXCLUDES),\
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   585
		EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   586
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   587
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   588
endef