common/makefiles/JavaCompilation.gmk
author amurillo
Fri, 30 Nov 2012 16:45:27 -0800
changeset 14592 af8f87762e23
parent 14379 b449aa34783e
child 14564 38b3cbe1fff6
permissions -rw-r--r--
Added tag hs25-b11 for changeset 7236115a66ae
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
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    45
    # param 1 is for example BOOT_JAVAC or NEW_JAVAC
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    46
    # This is the name later used to decide which java compiler to use.
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))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    89
    $(if $(findstring $(LOG),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
14377
2cbe2d7ac4f5 8003161: small fixes to re-enable new build system
ohrstrom
parents: 14280
diff changeset
   114
            $$(shell $(MKDIR) -p $$($1_BIN) && $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   115
            $$(eval $$(call ListPathsSafelyNow,$1_GREP_INCLUDE_PATTERNS,\n, \
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
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
14377
2cbe2d7ac4f5 8003161: small fixes to re-enable new build system
ohrstrom
parents: 14280
diff changeset
   127
            $$(shell $(MKDIR) -p $$($1_BIN) && $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   128
            $$(eval $$(call ListPathsSafelyNow,$1_GREP_EXCLUDE_PATTERNS,\n, \
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
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
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   140
    # When this macro is run in the same makefile as the java compilation, dependencies are transfered
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   141
    # in make variables. When the macro is run in a different makefile than the java compilation, the 
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   142
    # 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
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   146
        # 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
   147
        # lines, but not here for use in make dependencies.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   148
        $1_DEPS:=$$(shell $(FIND) $$($1_SRCS) -type f -a \( $$($1_FIND_PATTERNS) \) \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   149
			  $$($1_GREP_INCLUDES) $$($1_GREP_EXCLUDES)) \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   150
		 $$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   151
        ifeq (,$$($1_SKIP_METAINF))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   152
            $1_DEPS+=$$(shell $(FIND) $$(addsuffix /META-INF,$$($1_SRCS)) -type f 2> /dev/null))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   153
        endif
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   154
    endif
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   155
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   156
    # Utility macros, to make the shell script receipt somewhat easier to dechipher.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   157
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   158
    # The capture contents macro finds all files (matching the patterns, typically
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   159
    # .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
   160
    $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS),\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   161
                   (($(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
   162
                       $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' &&\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   163
                       $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES))) > \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   164
                       $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   165
    # 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
   166
    ifeq (,$$($1_SKIP_METAINF))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   167
        $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
   168
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   169
    # 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
   170
    # tells us what to remove from the jar-file.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   171
    $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
   172
    # 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
   173
    # 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
   174
    $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS),\
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   175
                    (cd $$(src) && \
14379
b449aa34783e 8003274: build-infra: Makefile changes needed for sjavac
tbell
parents: 14377
diff changeset
   176
                     if [ -n "`$(CAT) _the.$$($1_JARNAME)_contents | $(XARGS)`" ]; then \
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   177
                         $(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
   178
                         $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   179
                     fi) $$(NEWLINE))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   180
    # 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
   181
    $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS),\
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   182
                    (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   183
			$$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' &&\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   184
			$$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES))) > \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   185
			$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   186
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   187
    ifeq (,$$($1_SKIP_METAINF))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   188
        $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS),\
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   189
                    ($(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
   190
			$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   191
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   192
    $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS),\
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   193
                    (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
   194
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   195
    # 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
   196
    $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   197
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   198
    ifneq (,$$($1_CHECK_COMPRESS_JAR))
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   199
        $1_JAR_CREATE_OPTIONS := c0fm
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   200
        $1_JAR_UPDATE_OPTIONS := u0f
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   201
        ifeq ($(COMPRESS_JARS), true)
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   202
            $1_JAR_CREATE_OPTIONS := cfm
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   203
            $1_JAR_UPDATE_OPTIONS := uf
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   204
        endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   205
    else
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   206
        $1_JAR_CREATE_OPTIONS := cfm
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   207
        $1_JAR_UPDATE_OPTIONS := uf
13132
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   208
    endif
bd88bb8dd3af 7181504: Update of latest build-infra Makefiles
erikj
parents: 12801
diff changeset
   209
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   210
    # Here is the rule that creates/updates the jar file.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   211
    $$($1_JAR) : $$($1_DEPS)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   212
	$(MKDIR) -p $$($1_BIN)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   213
	$$(if $$($1_MANIFEST),\
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   214
		$(SED) -e "s#@@RELEASE@@#$(RELEASE)#"           \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   215
		       -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   216
	,\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   217
		$(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   218
	$$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   219
	$$(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
   220
	$$(if $$(wildcard $$@),\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   221
		$(ECHO) Modifying $$($1_NAME) $$(NEWLINE)\
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   222
		$$($1_CAPTURE_CONTENTS) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   223
		$$($1_CAPTURE_METAINF) \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   224
		$(RM) $$($1_DELETES_FILE) $$(NEWLINE)\
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   225
		$$($1_CAPTURE_DELETES) \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   226
		$(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE)\
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   227
		if [ -s $$($1_DELETESS_FILE) ]; then \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   228
			$(ECHO) "  deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   229
	                       $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   230
		fi $$(NEWLINE) \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   231
		$$($1_UPDATE_CONTENTS) true $$(NEWLINE) \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   232
		$$($1_JARINDEX) && true \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   233
	,\
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   234
		$(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
   235
	        $$($1_SCAPTURE_CONTENTS) \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   236
		$$($1_SCAPTURE_METAINF) \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   237
		$$($1_SUPDATE_CONTENTS) \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   238
		$$($1_JARINDEX) && true ) 
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   239
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   240
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   241
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   242
define SetupZipArchive
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   243
    # param 1 is for example ZIP_MYSOURCE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   244
    # param 2,3,4,5,6,7,8,9 are named args.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   245
    #    SRC,ZIP,INCLUDES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   246
    $(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
   247
    $(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
   248
    $(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
   249
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   250
    # Find all files in the source tree.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   251
    $1_SUFFIX_FILTER := $$(patsubst %,-o -name $(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   252
    $1_ALL_SRCS := $$(foreach i,$$($1_SRC), $$(shell $(FIND) $$i -type f -a ! -name "_the.*" \( -name FALSE_DUMMY  $$($1_SUFFIX_FILTER) \) ))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   253
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   254
    ifneq ($$($1_INCLUDES),)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   255
        $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   256
        ifneq ($$($1_SUFFIXES),)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   257
            $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES),\
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   258
		$$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   259
        else
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   260
            $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   261
        endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   262
        $1_ALL_SRCS     := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_SRCS))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   263
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   264
    ifneq ($$($1_EXCLUDES),)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   265
        $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   266
        $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   267
        $1_ALL_SRCS     := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   268
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   269
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   270
    # 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
   271
    $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   272
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   273
    # 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
   274
    # 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
   275
    # Explicitly excluded files can be given with absolute path. The patsubst solution
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   276
    # 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
   277
    # dir is very small.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   278
    $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   279
		$(MKDIR) -p $$(@D)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   280
		$(ECHO) Updating $$($1_NAME)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   281
		$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))))$$(NEWLINE)) true
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   282
		$(TOUCH) $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   283
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   284
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   285
define add_file_to_copy
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   286
    # param 1 = BUILD_MYPACKAGE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   287
    # parma 2 = The source file to copy.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   288
    $2_TARGET:=$2
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   289
    # Remove the source prefix. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   290
    $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   291
    # Now we can setup the depency that will trigger the copying.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   292
    $$($1_BIN)$$($2_TARGET) : $2
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   293
	$(MKDIR) -p $$(@D)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   294
	$(CP) $$< $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   295
	$(CHMOD) -f ug+w $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   296
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   297
    # And do not forget this target
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   298
    $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   299
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   300
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   301
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   302
# This macro is used only for properties files that are to be
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   303
# copied over to the classes directory in cleaned form:
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   304
# Previously this was inconsistently done in different repositories.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   305
# 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
   306
# a standard annotation processor from with sjavac.
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   307
define add_file_to_copy_and_clean
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   308
    # param 1 = BUILD_MYPACKAGE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   309
    # parma 2 = The source file to copy and clean.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   310
    $2_TARGET:=$2
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   311
    # Remove the source prefix. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   312
    $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   313
    # Now we can setup the depency that will trigger the copying.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   314
    $$($1_BIN)$$($2_TARGET) : $2
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   315
	$(MKDIR) -p $$(@D)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   316
	$(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
   317
                   | $(SED) -f "$(SRC_ROOT)/common/makefiles/support/unicode2x.sed" \
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   318
		   | $(SED) -e '/^#/d' -e '/^$$$$/d' \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   319
		            -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   320
			    -e 's/^[ \t]*//;s/[ \t]*$$$$//' \
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   321
			    -e 's/\\=/=/' | LANG=C $(SORT) > $$@
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   322
	$(CHMOD) -f ug+w $$@
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   323
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   324
    # And do not forget this target
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   325
    $1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   326
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   327
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   328
define remove_string
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   329
    $2 := $$(subst $1,,$$($2))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   330
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   331
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   332
define replace_space_with_pathsep
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   333
    $1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2)))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   334
endef
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   335
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   336
define SetupJavaCompilation
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   337
    # param 1 is for example BUILD_MYPACKAGE
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   338
    # param 2,3,4,5,6,7,8 are named args.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   339
    #    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
   340
    #    JVM:=path to ..bin/java
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   341
    #    ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   342
    #    SRC:=one or more directories to search for sources
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   343
    #    BIN:=store classes here
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   344
    #    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
   345
    #    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
   346
    #    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
   347
    #    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
   348
    #    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
   349
    #    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
   350
    #    INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   351
    #    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
   352
    #                   "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   353
    #    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
   354
    #                                     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
   355
    #    HEADERS:=path to directory where all generated c-headers are written.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   356
    #    DEPENDS:=Extra dependecy
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   357
    $(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
   358
    $(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
   359
    $(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
   360
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   361
    # Extract the info from the java compiler setup.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   362
    $1_JVM   := $$($$($1_SETUP)_JVM)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   363
    $1_JAVAC := $$($$($1_SETUP)_JAVAC)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   364
    $1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   365
    ifeq ($$($1_JAVAC),)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   366
        $$(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
   367
    endif
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   368
    $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   369
    $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   370
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   371
    # Handle addons and overrides.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   372
    $1_SRC:=$$(call ADD_SRCS,$$($1_SRC))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   373
    # Make sure the dirs exist.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   374
    $$(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
   375
    $$(eval $$(call MakeDir,$$($1_BIN)))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   376
    # Find all files in the source trees.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   377
    $1_ALL_SRCS := $$(filter-out $(OVR_SRCS),$$(shell $(FIND) $$($1_SRC) -type f))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   378
    # Extract the java files.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   379
    ifneq ($$($1_EXCLUDE_FILES),)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   380
        $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   381
    endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   382
    $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
   383
    ifneq ($$($1_INCLUDE_FILES),)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   384
        $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   385
        $1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   386
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   387
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   388
    # 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
   389
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   390
    # Create the corresponding smart javac wrapper command line.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   391
    $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix .*,$$(subst /,.,$$($1_EXCLUDES)))) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   392
		$$(addprefix -i ,$$(addsuffix .*,$$(subst /,.,$$($1_INCLUDES)))) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   393
		$$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   394
		$$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   395
		-src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   396
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   397
    # Prepend the source/bin path to the filter expressions.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   398
    ifneq ($$($1_INCLUDES),)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   399
        $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   400
        $1_SRCS     := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   401
    endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   402
    ifneq ($$($1_EXCLUDES),)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   403
        $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   404
        $1_SRCS     := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   405
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   406
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   407
    # Find all files to be copied from source to bin.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   408
    ifneq (,$$($1_COPY))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   409
        # Rewrite list of patterns into a find statement.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   410
        $1_COPY_PATTERN:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_COPY))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   411
        # Search for all files to be copied.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   412
        $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   413
        # Copy these explicitly
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   414
        $1_ALL_COPIES += $$($1_COPY_FILES)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   415
        # Copy must also respect filters.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   416
        ifneq (,$$($1_INCLUDES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   417
            $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   418
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   419
        ifneq (,$$($1_EXCLUDES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   420
            $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   421
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   422
        ifneq (,$$($1_EXCLUDE_FILES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   423
            $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   424
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   425
        # All files below META-INF are always copied.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   426
        $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
   427
        ifneq (,$$($1_ALL_COPIES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   428
            # Yep, there are files to be copied!
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   429
            $1_ALL_COPY_TARGETS:=
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   430
            $$(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
   431
            # 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
   432
        endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   433
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   434
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   435
    # 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
   436
    ifneq (,$$($1_CLEAN))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   437
        # Rewrite list of patterns into a find statement.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   438
        $1_CLEAN_PATTERN:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_CLEAN))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   439
        # Search for all files to be copied.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   440
        $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   441
        # Copy and clean must also respect filters.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   442
        ifneq (,$$($1_INCLUDES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   443
            $1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   444
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   445
        ifneq (,$$($1_EXCLUDES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   446
            $1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   447
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   448
        ifneq (,$$($1_EXCLUDE_FILES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   449
            $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   450
        endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   451
        ifneq (,$$($1_ALL_CLEANS))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   452
            # Yep, there are files to be copied and cleaned!
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   453
            $1_ALL_COPY_CLEAN_TARGETS:=
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   454
            $$(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
   455
            # 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
   456
        endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   457
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   458
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   459
    # Prep the source paths.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   460
    ifneq ($$($1_JAVAC_SOURCE_PATH_UGLY_OVERRIDE),)
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   461
      $$(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
   462
    else
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   463
      $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   464
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   465
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   466
    # 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
   467
    # and remove .java at the end. 
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   468
    $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
   469
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   470
    ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   471
        ifneq (,$$($1_HEADERS))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   472
            $1_HEADERS_ARG := -h $$($1_HEADERS)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   473
        endif
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   474
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   475
        # Using sjavac to compile. 
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   476
        $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
   477
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   478
        # Create SJAVAC variable,
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   479
        # expects $1_JAVAC to be "bootclasspathprepend -jar ...javac.jar"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   480
        # and it is rewritten into "bootclasspathprepend com.sun.tools.sjavac.Main"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   481
        $1_SJAVAC:=$$(word 1,$$($1_JAVAC)) -cp $$(word 3,$$($1_JAVAC)) com.sun.tools.sjavac.Main
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   482
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   483
        # 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
   484
        $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
   485
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   486
        $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   487
		$(MKDIR) -p $$(@D)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   488
		$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.batch.tmp)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   489
		$(ECHO) Compiling $1
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   490
		($$($1_JVM) $$($1_SJAVAC) \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   491
			$$($1_REMOTE) \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   492
			-j $(NUM_CORES) \
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   493
			--permit-unidentified-artifacts \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   494
			--permit-sources-without-package \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   495
			--compare-found-sources $$($1_BIN)/_the.batch.tmp \
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   496
			--log=$(LOG) \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   497
			$$($1_SJAVAC_ARGS) \
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   498
			$$($1_FLAGS) \
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   499
			$$($1_HEADERS_ARG) \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   500
			-d $$($1_BIN) && \
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14111
diff changeset
   501
			$(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   502
    else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   503
        # Using plain javac to batch compile everything.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   504
        $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
   505
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   506
        # 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
   507
        # changed before copying them to the real header dir.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   508
        ifneq (,$$($1_HEADERS))
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   509
            $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   510
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   511
            $$($1_HEADERS)/_the.headers: $$($1_BIN)/_the.batch
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   512
		$(MKDIR) -p $$(@D)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   513
		for f in `ls $$($1_HEADERS).tmp`; do \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   514
		  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
   515
		    $(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   516
		  fi; \
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   517
		done
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   518
		$(RM) -r $$($1_HEADERS).tmp
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   519
		$(TOUCH) $$@
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   520
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   521
            $1 += $$($1_HEADERS)/_the.headers
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   522
        endif
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   523
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   524
        # 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
   525
        $$($1_BIN)/_the.batch: $$($1_SRCS) $$($1_DEPENDS)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   526
		$(MKDIR) -p $$(@D)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   527
		$(RM) $$($1_BIN)/_the.batch $$($1_BIN)/_the.batch.tmp
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   528
		$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.batch.tmp)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   529
		$(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
   530
		($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   531
			-implicit:none -sourcepath "$$($1_SRCROOTSC)" \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   532
			-d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.batch.tmp && \
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   533
			$(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   534
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   535
    endif
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   536
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   537
    # 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
   538
    ifneq (,$$($1_JAR))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   539
        # If no suffixes was explicitly set for this jar file.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   540
        # Use class and the cleaned/copied properties file suffixes as the default
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   541
        # for the types of files to be put into the jar.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   542
        ifeq (,$$($1_SUFFIXES))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   543
            $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   544
        endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   545
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   546
        $$(eval $$(call SetupArchive,ARCHIVE_$1,$$($1),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   547
		SRCS:=$$($1_BIN),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   548
		SUFFIXES:=$$($1_SUFFIXES),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   549
		EXCLUDE:=$$($1_EXCLUDES),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   550
		INCLUDES:=$$($1_INCLUDES),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   551
		EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   552
		JAR:=$$($1_JAR),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   553
		JARMAIN:=$$($1_JARMAIN),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   554
		MANIFEST:=$$($1_MANIFEST),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   555
		EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   556
		JARINDEX:=$$($1_JARINDEX),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   557
		HEADERS:=$$($1_HEADERS),\
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   558
		SETUP:=$$($1_SETUP)))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   559
    endif
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   560
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   561
    # 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
   562
    ifneq (,$$($1_SRCZIP))
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   563
        $$(eval $$(call SetupZipArchive,ARCHIVE_$1,\
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   564
		SRC:=$$($1_SRC),\
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   565
		ZIP:=$$($1_SRCZIP),\
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   566
		INCLUDES:=$$($1_INCLUDES),\
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   567
		EXCLUDES:=$$($1_EXCLUDES),\
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   568
		EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13132
diff changeset
   569
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   570
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   571
endef