make/common/MakeBase.gmk
author ihse
Tue, 02 Feb 2016 15:02:55 +0100
changeset 35444 4d323e794486
parent 35370 f9b430645a18
child 36169 1613fd93b3f4
permissions -rw-r--r--
8148655: LOG=cmdlines and other build-infra fixes Reviewed-by: erikj
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     1
#
29156
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 28906
diff changeset
     2
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     4
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    10
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    15
# accompanied this code).
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    16
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    20
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    23
# questions.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    24
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    25
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    26
################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    27
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    28
# Setup common utility functions.
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    29
#
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    30
################################################################
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    31
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    32
ifndef _MAKEBASE_GMK
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    33
_MAKEBASE_GMK := 1
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
    34
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    35
ifeq ($(wildcard $(SPEC)),)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    36
  $(error MakeBase.gmk needs SPEC set to a proper spec.gmk)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    37
endif
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    38
29861
cb5d893c3282 8077814: Add .DELETE_ON_ERROR to makefiles
erikj
parents: 29662
diff changeset
    39
# By defining this pseudo target, make will automatically remove targets
cb5d893c3282 8077814: Add .DELETE_ON_ERROR to makefiles
erikj
parents: 29662
diff changeset
    40
# if their recipe fails so that a rebuild is automatically triggered on the
cb5d893c3282 8077814: Add .DELETE_ON_ERROR to makefiles
erikj
parents: 29662
diff changeset
    41
# next make invocation.
cb5d893c3282 8077814: Add .DELETE_ON_ERROR to makefiles
erikj
parents: 29662
diff changeset
    42
.DELETE_ON_ERROR:
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    43
32460
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    44
################################################################################
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    45
# Definitions for special characters
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    46
################################################################################
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    47
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    48
# When calling macros, the spaces between arguments are
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    49
# often semantically important! Sometimes we need to subst
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    50
# spaces and commas, therefore we need the following macros.
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    51
X:=
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    52
SPACE:=$(X) $(X)
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    53
COMMA:=,
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    54
DOLLAR:=$$
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    55
HASH:=\#
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    56
LEFT_PAREN:=(
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    57
RIGHT_PAREN:=)
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    58
SQUOTE:='
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    59
#'
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    60
DQUOTE:="
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    61
#"
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    62
define NEWLINE
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    63
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    64
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    65
endef
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
    66
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
    67
# In GNU Make 4.0 and higher, there is a file function for writing to files.
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
    68
ifeq (4.0, $(firstword $(sort 4.0 $(MAKE_VERSION))))
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
    69
  HAS_FILE_FUNCTION := true
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
    70
endif
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
    71
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    72
##############################
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    73
# Functions
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    74
##############################
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    75
30095
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
    76
### Debug functions
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
    77
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
    78
# Prints the name and value of a variable
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
    79
PrintVar = \
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
    80
    $(info $(strip $1) >$($(strip $1))<)
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    81
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    82
### Functions for timers
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    83
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    84
# Store the build times in this directory.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    85
BUILDTIMESDIR=$(OUTPUT_ROOT)/make-support/build-times
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    86
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    87
# Record starting time for build of a sub repository.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    88
define RecordStartTime
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34596
diff changeset
    89
	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$(strip $1) && \
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    90
	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$(strip $1)_human_readable
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    91
endef
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    92
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    93
# Record ending time and calculate the difference and store it in a
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    94
# easy to read format. Handles builds that cross midnight. Expects
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    95
# that a build will never take 24 hours or more.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    96
define RecordEndTime
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    97
	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    98
	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$(strip $1)_human_readable
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
    99
	$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$(strip $1)` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$(strip $1)` $1 | \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   100
	    $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   101
	    M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   102
	    > $(BUILDTIMESDIR)/build_time_diff_$(strip $1)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   103
endef
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   104
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   105
# Hook to be called when starting to execute a top-level target
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   106
define TargetEnter
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   107
	$(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   108
	$(call RecordStartTime,$(patsubst %-only,%,$@))
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   109
endef
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   110
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   111
# Hook to be called when finish executing a top-level target
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   112
define TargetExit
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   113
	$(call RecordEndTime,$(patsubst %-only,%,$@))
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   114
	$(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   115
	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`"
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   116
endef
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   117
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   118
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   119
# This macro translates $ into \$ to protect the $ from expansion in the shell.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   120
# To make this macro resilient against already escaped strings, first remove
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   121
# any present escapes before escaping so that no double escapes are added.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   122
EscapeDollar = $(subst $$,\$$,$(subst \$$,$$,$(strip $1)))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   123
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   124
################################################################################
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   125
# This macro translates $ into $$ to protect the string from make itself.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   126
DoubleDollar = $(subst $$,$$$$,$(strip $1))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   127
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   128
################################################################################
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   129
# ListPathsSafely can be used to print command parameters to a file. This is
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   130
# typically done if the command line lenght risk being too long for the
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   131
# OS/shell. In later make versions, the file function can be used for this
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   132
# purpose. For earlier versions, a more complex implementation is provided.
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   133
#
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   134
# The function ListPathsSafely can be called either directly or, more commonly
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   135
# from a recipe line. If called from a recipe, it will be executed in the
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   136
# evaluation phase of that recipe, which means that it will write to the file
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   137
# before any other line in the recipe has been run.
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   138
ifeq ($(HAS_FILE_FUNCTION), true)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   139
  # Param 1 - Name of variable containing paths/arguments to output
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   140
  # Param 2 - File to print to
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   141
  # Param 3 - Set to true to append to file instead of overwriting
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   142
  define ListPathsSafely
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   143
    $$(call MakeDir, $$(dir $$(strip $2)))
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   144
    $$(file $$(if $$(filter true, $$(strip $3)),>>,>) \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   145
        $$(strip $2),$$(subst $$(SPACE),$$(NEWLINE),$$(strip $$($$(strip $1)))))
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   146
  endef
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   147
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   148
else # HAS_FILE_FUNCTION
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   149
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   150
  $(eval compress_paths = \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   151
      $(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-pre-compress.incl)))
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   152
  compress_paths += \
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   153
      $(subst $(SRC_ROOT),X97, \
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   154
      $(subst $(OUTPUT_ROOT),X98, \
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   155
      $(subst X,X00, \
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   156
      $(subst $(SPACE),\n,$(strip $1)))))
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   157
  $(eval compress_paths += \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   158
      $(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-post-compress.incl)))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   159
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   160
  decompress_paths=$(SED) -f $(SRC_ROOT)/make/common/support/ListPathsSafely-uncompress.sed \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   161
      -e 's|X99|\\n|g' \
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   162
      -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   163
      -e 's|X00|X|g'
14279
1c596d0f411c 8002183: Increased max number of paths to list in ListPathsSafely to 16000.
erikj
parents: 14111
diff changeset
   164
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   165
  ListPathsSafely_IfPrintf = \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   166
      $(if $(word $3,$($(strip $1))), \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   167
          $(shell $(PRINTF) -- "$(strip $(call EscapeDollar, \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   168
              $(call compress_paths, $(wordlist $3,$4,$($(strip $1))))))\n" \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   169
              | $(decompress_paths) >> $2))
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   170
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   171
  # Param 1 - Name of variable containing paths/arguments to output
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   172
  # Param 2 - File to print to
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   173
  # Param 3 - Set to true to append to file instead of overwriting
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   174
  define ListPathsSafely
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   175
    ifneq (,$$(word 10001,$$($1)))
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   176
      $$(error Cannot list safely more than 10000 paths. $1 has $$(words $$($1)) paths!)
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   177
    endif
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   178
    $$(call MakeDir, $$(dir $2))
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   179
    ifneq ($$(strip $3), true)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   180
      $$(shell $(RM) $$(strip $2))
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   181
    endif
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   182
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   183
    $$(call ListPathsSafely_IfPrintf,$1,$2,1,250)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   184
    $$(call ListPathsSafely_IfPrintf,$1,$2,251,500)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   185
    $$(call ListPathsSafely_IfPrintf,$1,$2,501,750)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   186
    $$(call ListPathsSafely_IfPrintf,$1,$2,751,1000)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   187
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   188
    $$(call ListPathsSafely_IfPrintf,$1,$2,1001,1250)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   189
    $$(call ListPathsSafely_IfPrintf,$1,$2,1251,1500)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   190
    $$(call ListPathsSafely_IfPrintf,$1,$2,1501,1750)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   191
    $$(call ListPathsSafely_IfPrintf,$1,$2,1751,2000)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   192
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   193
    $$(call ListPathsSafely_IfPrintf,$1,$2,2001,2250)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   194
    $$(call ListPathsSafely_IfPrintf,$1,$2,2251,2500)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   195
    $$(call ListPathsSafely_IfPrintf,$1,$2,2501,2750)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   196
    $$(call ListPathsSafely_IfPrintf,$1,$2,2751,3000)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   197
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   198
    $$(call ListPathsSafely_IfPrintf,$1,$2,3001,3250)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   199
    $$(call ListPathsSafely_IfPrintf,$1,$2,3251,3500)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   200
    $$(call ListPathsSafely_IfPrintf,$1,$2,3501,3750)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   201
    $$(call ListPathsSafely_IfPrintf,$1,$2,3751,4000)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   202
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   203
    $$(call ListPathsSafely_IfPrintf,$1,$2,4001,4250)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   204
    $$(call ListPathsSafely_IfPrintf,$1,$2,4251,4500)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   205
    $$(call ListPathsSafely_IfPrintf,$1,$2,4501,4750)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   206
    $$(call ListPathsSafely_IfPrintf,$1,$2,4751,5000)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   207
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   208
    $$(call ListPathsSafely_IfPrintf,$1,$2,5001,5250)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   209
    $$(call ListPathsSafely_IfPrintf,$1,$2,5251,5500)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   210
    $$(call ListPathsSafely_IfPrintf,$1,$2,5501,5750)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   211
    $$(call ListPathsSafely_IfPrintf,$1,$2,5751,6000)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   212
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   213
    $$(call ListPathsSafely_IfPrintf,$1,$2,6001,6250)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   214
    $$(call ListPathsSafely_IfPrintf,$1,$2,6251,6500)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   215
    $$(call ListPathsSafely_IfPrintf,$1,$2,6501,6750)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   216
    $$(call ListPathsSafely_IfPrintf,$1,$2,6751,7000)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   217
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   218
    $$(call ListPathsSafely_IfPrintf,$1,$2,7001,7250)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   219
    $$(call ListPathsSafely_IfPrintf,$1,$2,7251,7500)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   220
    $$(call ListPathsSafely_IfPrintf,$1,$2,7501,7750)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   221
    $$(call ListPathsSafely_IfPrintf,$1,$2,7751,8000)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   222
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   223
    $$(call ListPathsSafely_IfPrintf,$1,$2,8001,8250)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   224
    $$(call ListPathsSafely_IfPrintf,$1,$2,8251,8500)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   225
    $$(call ListPathsSafely_IfPrintf,$1,$2,8501,8750)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   226
    $$(call ListPathsSafely_IfPrintf,$1,$2,8751,9000)
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   227
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   228
    $$(call ListPathsSafely_IfPrintf,$1,$2,9001,9250)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   229
    $$(call ListPathsSafely_IfPrintf,$1,$2,9251,9500)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   230
    $$(call ListPathsSafely_IfPrintf,$1,$2,9501,9750)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   231
    $$(call ListPathsSafely_IfPrintf,$1,$2,9751,10000)
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   232
  endef
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   233
endif # HAS_FILE_FUNCTION
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   234
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34596
diff changeset
   235
################################################################################
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   236
# The source tips can come from the Mercurial repository, or in the files
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   237
# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   238
# directory as the original $(HGDIR) directory.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   239
# These should not be := assignments, only used from the root Makefile.
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   240
HG_VERSION = $(shell $(HG) version 2> /dev/null)
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   241
HG_DIRECTORY=.hg
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   242
HGTIP_FILENAME=.hgtip
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   243
HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   244
REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
31219
86afedc80683 8129503: The SOURCE value in release file of JDK 9 doesn't contain changesets since b49
erikj
parents: 30095
diff changeset
   245
    $(shell $(CD) $(SRC_ROOT) ; \
86afedc80683 8129503: The SOURCE value in release file of JDK 9 doesn't contain changesets since b49
erikj
parents: 30095
diff changeset
   246
        $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) \
86afedc80683 8129503: The SOURCE value in release file of JDK 9 doesn't contain changesets since b49
erikj
parents: 30095
diff changeset
   247
            $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   248
        2> /dev/null)))))
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   249
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   250
# Emit the repo:tip pairs to $@
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   251
define GetSourceTips
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   252
	$(CD) $(SRC_ROOT) ; \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   253
	for i in $(REPO_LIST) IGNORE ; do \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   254
	  if [ "$${i}" = "IGNORE" ] ; then \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   255
	    continue; \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   256
	  elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   257
	    $(PRINTF) " %s:%s" \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   258
	        "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   259
	  elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   260
	    $(PRINTF) " %s:%s" \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   261
	        "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   262
	  fi; \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   263
	done >> $@
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   264
	$(PRINTF) "\n" >> $@
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   265
endef
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   266
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34596
diff changeset
   267
# Create the HGTIP_FILENAME file. Called from closed/make/SourceBundles.gmk
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   268
define CreateHgTip
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   269
	$(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   270
	$(ECHO) $1/$(HGTIP_FILENAME)
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   271
endef
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   272
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34596
diff changeset
   273
################################################################################
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34596
diff changeset
   274
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   275
define SetupLogging
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   276
  ifeq ($$(LOG_LEVEL), trace)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   277
    # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   278
    # For each target executed, will print
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   279
    # Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   280
    # but with a limit of 20 on <ALL NEWER PREREQUISITES>, to avoid cluttering logs too much
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   281
    # (and causing a crash on Cygwin).
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   282
    # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   283
    # Only use time if it's GNU time which supports format and output file.
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   284
    WRAPPER_SHELL := $$(BASH) $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log $$(SHELL)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   285
    SHELL := $$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   286
  endif
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   287
  # The warn level can never be turned off
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   288
  LogWarn = $$(info $$(strip $$1))
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   289
  LOG_WARN :=
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   290
  ifneq ($$(findstring $$(LOG_LEVEL), info debug trace),)
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   291
    LogInfo = $$(info $$(strip $$1))
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   292
    LOG_INFO :=
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   293
  else
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   294
    LogInfo =
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   295
    LOG_INFO := > /dev/null
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   296
  endif
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   297
  ifneq ($$(findstring $$(LOG_LEVEL), debug trace),)
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   298
    LogDebug = $$(info $$(strip $$1))
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   299
    LOG_DEBUG :=
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   300
  else
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   301
    LogDebug =
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   302
    LOG_DEBUG := > /dev/null
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   303
  endif
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   304
  ifneq ($$(findstring $$(LOG_LEVEL), trace),)
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   305
    LogTrace = $$(info $$(strip $$1))
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   306
    LOG_TRACE :=
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   307
  else
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   308
    LogTrace =
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29312
diff changeset
   309
    LOG_TRACE := > /dev/null
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   310
  endif
12801
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   311
endef
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   312
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   313
# Make sure logging is setup for everyone that includes MakeBase.gmk.
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   314
$(eval $(call SetupLogging))
948f8ad66ee7 7170079: Adjustments to build-infra makefiles
erikj
parents: 12258
diff changeset
   315
29312
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   316
################################################################################
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   317
# Creates a sequence of increasing numbers (inclusive).
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   318
# Param 1 - starting number
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   319
# Param 2 - ending number
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   320
sequence = \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   321
    $(wordlist $1, $2, $(strip \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   322
        $(eval SEQUENCE_COUNT :=) \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   323
        $(call _sequence-do,$(strip $2))))
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   324
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   325
_sequence-do = \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   326
    $(if $(word $1, $(SEQUENCE_COUNT)),, \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   327
      $(eval SEQUENCE_COUNT += .) \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   328
      $(words $(SEQUENCE_COUNT)) \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   329
      $(call _sequence-do,$1))
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   330
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   331
################################################################################
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   332
33394
dbd286b8742f 8140661: Rename LDFLAGS_SUFFIX to LIBS
ihse
parents: 33054
diff changeset
   333
MAX_PARAMS := 35
29312
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   334
PARAM_SEQUENCE := $(call sequence, 2, $(MAX_PARAMS))
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   335
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   336
# Template for creating a macro taking named parameters. To use it, assign the
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   337
# template to a variable with the name you want for your macro, using '='
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   338
# assignment. Then define a macro body with the suffix "Body". The Body macro
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   339
# should take 1 parameter which should be a unique string for that invocation
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   340
# of the macro.
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   341
# Ex:
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   342
# SetupFoo = $(NamedParamsMacroTemplate)
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   343
# define SetupFooBody
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   344
#   # do something
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   345
#   # access parameters as $$($1_BAR)
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   346
# endef
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   347
# Call it like this
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   348
# $(eval $(call SetupFoo, BUILD_SOMETHING, \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   349
#     BAR := some parameter value, \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   350
# ))
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   351
define NamedParamsMacroTemplate
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   352
  $(if $($(MAX_PARAMS)),$(error Internal makefile error: \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   353
      Too many named arguments to macro, please update MAX_PARAMS in MakeBase.gmk))
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   354
  # Iterate over 2 3 4... and evaluate the named parameters with $1_ as prefix
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   355
  $(foreach i,$(PARAM_SEQUENCE), $(if $(strip $($i)),\
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   356
    $(strip $1)_$(strip $($i)))$(NEWLINE))
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   357
  # Debug print all named parameter names and values
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   358
  $(if $(findstring $(LOG_LEVEL),debug trace), \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   359
    $(info $0 $(strip $1) $(foreach i,$(PARAM_SEQUENCE), \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   360
      $(if $(strip $($i)),$(NEWLINE) $(strip [$i] $(if $(filter $(LOG_LEVEL), trace), \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   361
        $($i), $(wordlist 1, 20, $($(i))) $(if $(word 21, $($(i))), ...)))))))
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   362
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   363
  $(if $(DEBUG_$(strip $1)),
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   364
    $(info -------- <<< Begin expansion of $(strip $1)) \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   365
    $(info $(call $(0)Body,$(strip $1))) \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   366
    $(info -------- >>> End expansion of $(strip $1)) \
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   367
  )
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   368
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   369
  $(call $(0)Body,$(strip $1))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   370
endef
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   371
29312
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   372
################################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   373
# Make directory without forking mkdir if not needed
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34596
diff changeset
   374
# 1: List of directories to create
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   375
MakeDir = \
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   376
    $(strip \
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   377
        $(eval MakeDir_dirs_to_make := $(strip $(foreach d, $1, $(if $(wildcard $d), , $d)))) \
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   378
        $(if $(MakeDir_dirs_to_make), $(shell $(MKDIR) -p $(MakeDir_dirs_to_make))) \
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   379
    )
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   380
29312
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   381
################################################################################
29866
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29861
diff changeset
   382
# Assign a variable only if it is empty
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29861
diff changeset
   383
# Param 1 - Variable to assign
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29861
diff changeset
   384
# Param 2 - Value to assign
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29861
diff changeset
   385
SetIfEmpty = \
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29861
diff changeset
   386
    $(if $($(strip $1)),,$(eval $(strip $1) := $2))
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29861
diff changeset
   387
6cecef2d84ab 8077824: Introduce DefineNativeToolchain to handle toolchain configurations
erikj
parents: 29861
diff changeset
   388
################################################################################
29312
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   389
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   390
ifeq ($(OPENJDK_TARGET_OS),solaris)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   391
  # On Solaris, if the target is a symlink and exists, cp won't overwrite.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   392
  # Cp has to operate in recursive mode to allow for -P flag, to preserve soft links. If the
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   393
  # name of the target file differs from the source file, rename after copy.
23168
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   394
  # If the source and target parent directories are the same, recursive copy doesn't work
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   395
  # so we fall back on regular copy, which isn't preserving symlinks.
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   396
  define install-file
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27592
diff changeset
   397
	$(MKDIR) -p '$(@D)'
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   398
	$(RM) '$@'
23168
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   399
	if [ "$(@D)" != "$(<D)" ]; then \
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   400
	  $(CP) -f -r -P '$<' '$(@D)'; \
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   401
	  if [ "$(@F)" != "$(<F)" ]; then \
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   402
	    $(MV) '$(@D)/$(<F)' '$@'; \
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   403
	  fi; \
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   404
	else \
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   405
	  if [ -L '$<' ]; then \
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   406
	    $(ECHO) "Source file is a symlink and target is in the same directory: $< $@" ; \
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   407
	    exit 1; \
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   408
	  fi; \
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   409
	  $(CP) -f '$<' '$@'; \
d20a4165e3d2 8036948: Solaris builds broken by fix for 8036611: Cleanup of handling of properties ...
erikj
parents: 21759
diff changeset
   410
	fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   411
  endef
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   412
else ifeq ($(OPENJDK_TARGET_OS),macosx)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   413
  # On mac, extended attributes sometimes creep into the source files, which may later
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   414
  # cause the creation of ._* files which confuses testing. Clear these with xattr if
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   415
  # set. Some files get their write permissions removed after being copied to the
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   416
  # output dir. When these are copied again to images, xattr would fail. By only clearing
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   417
  # attributes when they are present, failing on this is avoided.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   418
  define install-file
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27592
diff changeset
   419
	$(MKDIR) -p '$(@D)'
16580
6acb502beafa 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16419
diff changeset
   420
	$(CP) -fRP '$<' '$@'
6acb502beafa 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 16419
diff changeset
   421
	if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   422
  endef
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   423
else
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   424
  # Running mkdir and cp in the same shell speeds up copy intensive tasks in Cygwin
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   425
  # significantly.
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   426
  define install-file
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34596
diff changeset
   427
	$(call MakeDir, $(@D))
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34596
diff changeset
   428
	$(CP) -fP '$<' '$@'
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   429
  endef
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   430
endif
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   431
29312
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   432
################################################################################
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   433
# Filter out duplicate sub strings while preserving order. Keeps the first occurance.
29156
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 28906
diff changeset
   434
uniq = \
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 28906
diff changeset
   435
    $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 28906
diff changeset
   436
32553
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   437
# Returns all whitespace-separated words in $2 where at least one of the
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   438
# whitespace-separated words in $1 is a substring.
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   439
containing = \
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   440
    $(strip \
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   441
        $(foreach v,$(strip $2),\
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   442
          $(call uniq,$(foreach p,$(strip $1),$(if $(findstring $p,$v),$v)))))
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   443
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   444
# Returns all whitespace-separated words in $2 where none of the
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   445
# whitespace-separated words in $1 is a substring.
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   446
not-containing = \
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   447
    $(strip $(filter-out $(call containing,$1,$2),$2))
418e3b5ff477 8136383: Improve make utilities containing and not-containing
erikj
parents: 32460
diff changeset
   448
29156
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 28906
diff changeset
   449
# Return a list of all string elements that are duplicated in $1.
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 28906
diff changeset
   450
dups = \
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 28906
diff changeset
   451
    $(strip $(foreach v, $(sort $1), $(if $(filter-out 1, \
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 28906
diff changeset
   452
        $(words $(filter $v, $1))), $v)))
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14279
diff changeset
   453
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   454
# String equals
28607
380f123263d8 8071651: infinite build loops in 9-dev windows platform on Jan 26
erikj
parents: 28606
diff changeset
   455
equals = \
380f123263d8 8071651: infinite build loops in 9-dev windows platform on Jan 26
erikj
parents: 28606
diff changeset
   456
    $(and $(findstring $(strip $1),$(strip $2)),\
380f123263d8 8071651: infinite build loops in 9-dev windows platform on Jan 26
erikj
parents: 28606
diff changeset
   457
        $(findstring $(strip $2),$(strip $1)))
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   458
30095
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
   459
# Remove a whole list of prefixes
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
   460
# $1 - List of prefixes
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
   461
# $2 - List of elements to process
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
   462
remove-prefixes = \
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
   463
    $(strip $(if $1,$(patsubst $(firstword $1)%,%,\
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
   464
      $(call remove-prefixes,$(filter-out $(firstword $1),$1),$2)),$2))
0034766ccb09 8079344: Allow custom or platform specific java source to automatically override shared source
erikj
parents: 29866
diff changeset
   465
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   466
# Convert the string given to upper case, without any $(shell)
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   467
# Inspired by http://lists.gnu.org/archive/html/help-make/2013-09/msg00009.html
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   468
uppercase_table := a,A b,B c,C d,D e,E f,F g,G h,H i,I j,J k,K l,L m,M n,N o,O \
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   469
    p,P q,Q r,R s,S t,T u,U v,V w,W x,X y,Y z,Z
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   470
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   471
uppercase_internal = \
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   472
  $(if $(strip $1), $$(subst $(firstword $1), $(call uppercase_internal, \
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   473
      $(wordlist 2, $(words $1), $1), $2)), $2)
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   474
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   475
# Convert a string to upper case. Works only on a-z.
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   476
# $1 - The string to convert
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   477
uppercase = \
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   478
  $(strip \
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   479
    $(eval uppercase_result := $(call uppercase_internal, $(uppercase_table), $1)) \
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   480
    $(uppercase_result) \
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   481
  )
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   482
29312
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   483
################################################################################
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   484
23170
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   485
ifneq ($(DISABLE_CACHE_FIND), true)
23984
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   486
  # In Cygwin, finds are very costly, both because of expensive forks and because
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   487
  # of bad file system caching. Find is used extensively in $(shell) commands to
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   488
  # find source files. This makes rerunning make with no or few changes rather
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   489
  # expensive. To speed this up, these two macros are used to cache the results
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   490
  # of simple find commands for reuse.
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   491
  #
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   492
  # Runs a find and stores both the directories where it was run and the results.
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   493
  # This macro can be called multiple times to add to the cache. Only finds files
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   494
  # with no filters.
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   495
  #
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   496
  # Needs to be called with $(eval )
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   497
  #
23170
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   498
  # Even if the performance benifit is negligible on other platforms, keep the
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   499
  # functionality active unless explicitly disabled to exercise it more.
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   500
  #
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   501
  # Initialize FIND_CACHE_DIRS with := to make it a non recursively-expanded variable
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   502
  FIND_CACHE_DIRS :=
23984
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   503
  # Param 1 - Dirs to find in
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   504
  # Param 2 - (optional) specialization. Normally "-a \( ... \)" expression.
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   505
  define FillCacheFind
23984
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   506
    # Filter out already cached dirs. The - is needed when FIND_CACHE_DIRS is empty
23170
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   507
    # since filter out will then return empty.
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   508
    FIND_CACHE_NEW_DIRS := $$(filter-out $$(addsuffix /%,\
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   509
        - $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS), $1)
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   510
    ifneq ($$(FIND_CACHE_NEW_DIRS), )
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   511
      # Remove any trailing slash from dirs in the cache dir list
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   512
      FIND_CACHE_DIRS += $$(patsubst %/,%, $$(FIND_CACHE_NEW_DIRS))
23984
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   513
      FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $$(FIND_CACHE_NEW_DIRS) \( -type f -o -type l \) $2))
23170
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   514
    endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 18425
diff changeset
   515
  endef
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14279
diff changeset
   516
23984
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   517
  # Mimics find by looking in the cache if all of the directories have been cached.
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   518
  # Otherwise reverts to shell find. This is safe to call on all platforms, even if
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   519
  # cache is deactivated.
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   520
  #
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   521
  # $1 can be either a directory or a file. If it's a directory, make
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   522
  # sure we have exactly one trailing slash before the wildcard.
23984
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   523
  # The extra - is needed when FIND_CACHE_DIRS is empty but should be harmless.
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   524
  #
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   525
  # Param 1 - Dirs to find in
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   526
  # Param 2 - (optional) specialization. Normally "-a \( ... \)" expression.
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   527
  define CacheFind
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34596
diff changeset
   528
      $(if $(filter-out $(addsuffix /%,- $(FIND_CACHE_DIRS)) $(FIND_CACHE_DIRS),$1), \
23984
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   529
    $(shell $(FIND) $1 \( -type f -o -type l \) $2), \
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34596
diff changeset
   530
        $(filter $(addsuffix /%,$(patsubst %/,%,$1)) $1,$(FIND_CACHE)))
23984
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   531
  endef
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   532
23170
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   533
else
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   534
  # If CacheFind is disabled, just run the find command.
23984
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   535
  # Param 1 - Dirs to find in
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   536
  # Param 2 - (optional) specialization. Normally "-a \( ... \)" expression.
23170
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   537
  define CacheFind
23984
e3e90595a176 8041267: Add filtering capability to CacheFind
mduigou
parents: 23170
diff changeset
   538
    $(shell $(FIND) $1 \( -type f -o -type l \) $2)
23170
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   539
  endef
51e606ecede5 8037281: Improve CacheFind and enable on all platforms
erikj
parents: 23169
diff changeset
   540
endif
15051
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14279
diff changeset
   541
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14279
diff changeset
   542
################################################################################
d32ad37472e6 8005540: build-infra: Improve incremental build speed on windows by caching find results
erikj
parents: 14279
diff changeset
   543
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   544
define AddFileToCopy
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   545
  # Helper macro for SetupCopyFiles
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   546
  # 1 : Source file
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   547
  # 2 : Dest file
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   548
  # 3 : Variable to add targets to
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   549
  # 4 : Macro to call for copy operation
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   550
  $2: $1
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34596
diff changeset
   551
	$$(call LogInfo, Copying $$(patsubst $(OUTPUT_ROOT)/%,%,$$@))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   552
	$$($$(strip $4))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   553
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   554
  $3 += $2
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   555
endef
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   556
32811
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   557
# Returns the value of the first argument
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   558
identity = \
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   559
    $(strip $1)
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   560
28902
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   561
# Setup make rules for copying files, with an option to do more complex
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   562
# processing instead of copying.
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   563
#
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   564
# Parameter 1 is the name of the rule. This name is used as variable prefix,
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   565
# and the targets generated are listed in a variable by that name.
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   566
#
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   567
# Remaining parameters are named arguments. These include:
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   568
#   SRC     : Source root dir (defaults to dir of first file)
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   569
#   DEST    : Dest root dir
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   570
#   FILES   : List of files to copy with absolute paths, or path relative to SRC.
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   571
#             Must be in SRC.
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   572
#   FLATTEN : Set to flatten the directory structure in the DEST dir.
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   573
#   MACRO   : Optionally override the default macro used for making the copy.
0c09b47449c8 8069064: Various improvements and fixes in build system
ihse
parents: 28901
diff changeset
   574
#             Default is 'install-file'
32811
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   575
#   NAME_MACRO : Optionally supply a macro that rewrites the target file name
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   576
#                based on the source file name
29312
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   577
SetupCopyFiles = $(NamedParamsMacroTemplate)
f3f859137ce6 8074988: Reduce boilerplate in Setup* macro definitions
erikj
parents: 29304
diff changeset
   578
define SetupCopyFilesBody
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   579
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   580
  ifeq ($$($1_MACRO), )
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   581
    $1_MACRO := install-file
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   582
  endif
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   583
28901
5acc0ec03d06 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27595
diff changeset
   584
  # Default SRC to the dir of the first file.
5acc0ec03d06 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27595
diff changeset
   585
  ifeq ($$($1_SRC), )
5acc0ec03d06 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27595
diff changeset
   586
    $1_SRC := $$(dir $$(firstword $$($1_FILES)))
5acc0ec03d06 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27595
diff changeset
   587
  endif
5acc0ec03d06 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27595
diff changeset
   588
32811
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   589
  ifeq ($$($1_NAME_MACRO), )
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   590
    $1_NAME_MACRO := identity
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   591
  endif
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   592
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   593
  # Remove any trailing slash from SRC and DEST
28901
5acc0ec03d06 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27595
diff changeset
   594
  $1_SRC := $$(patsubst %/,%,$$($1_SRC))
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   595
  $1_DEST := $$(patsubst %/,%,$$($1_DEST))
28901
5acc0ec03d06 8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents: 27595
diff changeset
   596
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   597
  $$(foreach f, $$(patsubst $$($1_SRC)/%,%,$$($1_FILES)), \
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   598
      $$(eval $$(call AddFileToCopy, $$($1_SRC)/$$f, \
32811
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   599
      $$($1_DEST)/$$(call $$(strip $$($1_NAME_MACRO)),$$(if $$($1_FLATTEN),$$(notdir $$f),$$f)), \
df82db312e58 8135060: Stop building Xcode projects in install build
erikj
parents: 32553
diff changeset
   600
      $1, $$($1_MACRO))))
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   601
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   602
endef
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   603
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   604
################################################################################
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   605
# ShellQuote
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   606
#
29156
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 28906
diff changeset
   607
# Quotes a string with single quotes and replaces single quotes with '\'' so
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   608
# that the contents survives being given to the shell.
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   609
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   610
ShellQuote = \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   611
    $(SQUOTE)$(subst $(SQUOTE),$(SQUOTE)\$(SQUOTE)$(SQUOTE),$(strip $1))$(SQUOTE)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   612
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   613
################################################################################
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   614
# Write to and read from file
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   615
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   616
# Param 1 - File to read
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   617
ReadFile = \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   618
    $(shell $(CAT) $1)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   619
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   620
# Param 1 - Text to write
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   621
# Param 2 - File to write to
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   622
ifeq ($(HAS_FILE_FUNCTION), true)
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   623
  WriteFile = \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   624
      $(file >$2,$(strip $1))
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   625
else
34596
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   626
  # Use printf to get consistent behavior on all platforms.
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   627
  WriteFile = \
e8328ce5b64e 8142907: Integration of minor fixes from the build-infra project
ihse
parents: 33394
diff changeset
   628
      $(shell $(PRINTF) "%s" $(call ShellQuote, $1) > $2)
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   629
endif
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   630
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   631
################################################################################
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   632
# DependOnVariable
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   633
#
29156
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 28906
diff changeset
   634
# This macro takes a variable name and puts the value in a file only if the
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 28906
diff changeset
   635
# value has changed since last. The name of the file is returned. This can be
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   636
# used to create rule dependencies on make variable values. The following
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   637
# example would get rebuilt if the value of SOME_VAR was changed:
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   638
#
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   639
# path/to/some-file: $(call DependOnVariable, SOME_VAR)
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   640
#         echo $(SOME_VAR) > $@
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   641
#
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   642
# Note that leading and trailing white space in the value is ignored.
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   643
#
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   644
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   645
# Defines the sub directory structure to store variable value file in
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   646
DependOnVariableDirName = \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   647
    $(strip $(subst $(SRC_ROOT)/,,\
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   648
        $(if $(filter /%, $(firstword $(MAKEFILE_LIST))), \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   649
          $(firstword $(MAKEFILE_LIST)), \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   650
          $(CURDIR)/$(firstword $(MAKEFILE_LIST)))))
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   651
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   652
# Defines the name of the file to store variable value in. Generates a name
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   653
# unless parameter 2 is given.
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   654
# Param 1 - Name of variable
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   655
# Param 2 - (optional) name of file to store value in
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   656
DependOnVariableFileName = \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   657
    $(strip $(if $(strip $2), $2, \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   658
      $(MAKESUPPORT_OUTPUTDIR)/vardeps/$(DependOnVariableDirName)/$(strip $1).vardeps))
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   659
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   660
# Does the actual work with parameters stripped.
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   661
# If the file exists AND the contents is the same as the variable, do nothing
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   662
# else print a new file.
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   663
# Always returns the name of the file where the value was printed.
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   664
# Param 1 - Name of variable
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   665
# Param 2 - (optional) name of file to store value in
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   666
DependOnVariableHelper = \
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   667
    $(strip \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   668
        $(eval -include $(call DependOnVariableFileName, $1, $2)) \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   669
        $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   670
          $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   671
          $(if $(findstring $(LOG_LEVEL), trace), \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   672
              $(info NewVariable $1: >$(strip $($1))<) \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   673
              $(info OldVariable $1: >$(strip $($1_old))<)) \
33054
bcb9f5ea5761 8140484: Vardeps broken when variable value contains '$'
erikj
parents: 32812
diff changeset
   674
          $(call WriteFile, $1_old:=$(call DoubleDollar,$($1)), \
bcb9f5ea5761 8140484: Vardeps broken when variable value contains '$'
erikj
parents: 32812
diff changeset
   675
              $(call DependOnVariableFileName, $1, $2))) \
32807
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   676
        $(call DependOnVariableFileName, $1, $2) \
20386e6d858f 8136385: Various build speed improvements for windows
erikj
parents: 32553
diff changeset
   677
    )
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   678
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   679
# Main macro
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   680
# Param 1 - Name of variable
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   681
# Param 2 - (optional) name of file to store value in
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   682
DependOnVariable = \
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   683
    $(call DependOnVariableHelper,$(strip $1),$(strip $2))
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   684
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   685
# LogCmdlines is only intended to be used by ExecuteWithLog
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   686
ifeq ($(LOG_CMDLINES), true)
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   687
  LogCmdlines = $(info $(strip $1))
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   688
else
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   689
  LogCmdlines =
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   690
endif
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   691
28600
09dd1740f176 8069261: Create make dependencies on make variable values
erikj
parents: 27595
diff changeset
   692
################################################################################
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   693
# ExecuteWithLog will run a command and log the output appropriately. This is
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   694
# meant to be used by commands that do "real" work, like a compilation.
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   695
# The output is stored in a specified log file, which is displayed at the end
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   696
# of the build in case of failure. The  command line itself is stored in a file,
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   697
# and also logged to stdout if the LOG=cmdlines option has been given.
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31312
diff changeset
   698
#
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   699
# Param 1 - The path to base the name of the log file / command line file on
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   700
# Param 2 - The command to run
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   701
ExecuteWithLog = \
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   702
  $(call LogCmdlines, Exececuting: [$(strip $2)]) \
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   703
  $(call WriteFile, $2, $(strip $1).cmdline) \
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   704
  ( $(strip $2) > >($(TEE) $(strip $1).log) 2> >($(TEE) $(strip $1).log >&2) || \
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   705
      ( exitcode=$(DOLLAR)? && \
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   706
      $(CP) $(strip $1).log $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(BUILD_OUTPUT)/%,%,$(strip $1))).log && \
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   707
      exit $(DOLLAR)exitcode ) )
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31312
diff changeset
   708
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 31312
diff changeset
   709
################################################################################
31310
481585782338 8081814: Modularize the deploy build
erikj
parents: 30095
diff changeset
   710
# Find lib dir for module
481585782338 8081814: Modularize the deploy build
erikj
parents: 30095
diff changeset
   711
# Param 1 - module name
481585782338 8081814: Modularize the deploy build
erikj
parents: 30095
diff changeset
   712
ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
481585782338 8081814: Modularize the deploy build
erikj
parents: 30095
diff changeset
   713
  FindLibDirForModule = \
481585782338 8081814: Modularize the deploy build
erikj
parents: 30095
diff changeset
   714
      $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)$(OPENJDK_TARGET_CPU_LIBDIR)
481585782338 8081814: Modularize the deploy build
erikj
parents: 30095
diff changeset
   715
else
481585782338 8081814: Modularize the deploy build
erikj
parents: 30095
diff changeset
   716
  FindLibDirForModule = \
481585782338 8081814: Modularize the deploy build
erikj
parents: 30095
diff changeset
   717
      $(SUPPORT_OUTPUTDIR)/modules_libs/$(strip $1)
481585782338 8081814: Modularize the deploy build
erikj
parents: 30095
diff changeset
   718
endif
481585782338 8081814: Modularize the deploy build
erikj
parents: 30095
diff changeset
   719
481585782338 8081814: Modularize the deploy build
erikj
parents: 30095
diff changeset
   720
################################################################################
32460
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   721
# Return a string suitable for use after a -classpath option. It will correct and safe to use
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   722
# on all platforms. Arguments are given as space separate classpath entries.
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   723
# param 1 : A space separated list of classpath entries
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   724
# The surrounding strip is needed to keep additional whitespace out
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   725
PathList = \
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   726
  "$(subst $(SPACE),$(PATH_SEP),$(strip $1))"
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   727
9e9bffb3029a 8065912: Better handling of classpath in build-infra
ihse
parents: 32344
diff changeset
   728
################################################################################
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   729
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   730
# Hook to include the corresponding custom file, if present.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   731
$(eval $(call IncludeCustomExtension, , common/MakeBase.gmk))
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 23984
diff changeset
   732
12258
6ec26f6cc53e 7074397: Build infrastructure changes (makefile re-write)
ohair
parents:
diff changeset
   733
endif # _MAKEBASE_GMK