make/InitSupport.gmk
author jwilhelm
Fri, 10 Feb 2017 15:14:27 +0100
changeset 43946 b683a1f9f2e5
parent 43173 5212680a318b
child 44027 3a3050924db2
permissions -rw-r--r--
Merge
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     1
#
43173
5212680a318b 8173120: Preserve command line at build failure
ihse
parents: 41458
diff changeset
     2
# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     4
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    10
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    15
# accompanied this code).
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    16
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    20
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    23
# questions.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    24
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    25
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    26
################################################################################
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    27
# This file contains helper functions for Init.gmk.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    28
# It is divided in two parts, depending on if a SPEC is present or not
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    29
# (HAS_SPEC is true or not).
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    30
################################################################################
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    31
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    32
ifndef _INITSUPPORT_GMK
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    33
_INITSUPPORT_GMK := 1
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    34
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    35
ifeq ($(HAS_SPEC),)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    36
  ##############################################################################
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    37
  # Helper functions for the initial part of Init.gmk, before the spec file is
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    38
  # loaded. Most of these functions provide parsing and setting up make options
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    39
  # from the command-line.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    40
  ##############################################################################
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    41
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    42
  # Make control variables, handled by Init.gmk
34594
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34491
diff changeset
    43
  INIT_CONTROL_VARIABLES := LOG CONF CONF_NAME SPEC JOBS TEST_JOBS CONF_CHECK \
7e0595aab028 8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents: 34491
diff changeset
    44
      COMPARE_BUILD
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    45
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    46
  # All known make control variables
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    47
  MAKE_CONTROL_VARIABLES := $(INIT_CONTROL_VARIABLES) TEST JDK_FILTER
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    48
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    49
  # Define a simple reverse function.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    50
  # Should maybe move to MakeBase.gmk, but we can't include that file now.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    51
  reverse = \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    52
      $(if $(strip $(1)), $(call reverse, $(wordlist 2, $(words $(1)), $(1)))) \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    53
          $(firstword $(1))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    54
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    55
  # The variable MAKEOVERRIDES contains variable assignments from the command
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    56
  # line, but in reverse order to what the user entered.
32715
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
    57
  # The '\#' <=> '\ 'dance is needed to keep values with space in them connected.
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    58
  COMMAND_LINE_VARIABLES := $(subst \#,\ , $(call reverse, $(subst \ ,\#,$(MAKEOVERRIDES))))
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    59
29788
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
    60
  # A list like FOO="val1" BAR="val2" containing all user-supplied make
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
    61
  # variables that we should propagate.
32715
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
    62
  # The '\#' <=> '\ 'dance is needed to keep values with space in them connected.
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
    63
  USER_MAKE_VARS := $(subst \#,\ , $(filter-out $(addsuffix =%, $(INIT_CONTROL_VARIABLES)), \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
    64
      $(subst \ ,\#,$(MAKEOVERRIDES))))
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    65
29788
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
    66
  # Setup information about available configurations, if any.
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
    67
  build_dir=$(topdir)/build
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
    68
  all_spec_files=$(wildcard $(build_dir)/*/spec.gmk)
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
    69
  # Extract the configuration names from the path
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
    70
  all_confs=$(patsubst %/spec.gmk, %, $(patsubst $(build_dir)/%, %, $(all_spec_files)))
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
    71
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    72
  # Check for unknown command-line variables
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    73
  define CheckControlVariables
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    74
    command_line_variables := $$(strip $$(foreach var, \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    75
        $$(subst \ ,_,$$(MAKEOVERRIDES)), \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    76
        $$(firstword $$(subst =, , $$(var)))))
29788
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
    77
    unknown_command_line_variables := $$(strip \
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
    78
        $$(filter-out $$(MAKE_CONTROL_VARIABLES), $$(command_line_variables)))
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    79
    ifneq ($$(unknown_command_line_variables), )
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    80
      $$(info Note: Command line contains non-control variables:)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    81
      $$(foreach var, $$(unknown_command_line_variables), $$(info * $$(var)=$$($$(var))))
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    82
      $$(info Make sure it is not mistyped, and that you intend to override this variable.)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    83
      $$(info 'make help' will list known control variables.)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    84
      $$(info )
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    85
    endif
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    86
  endef
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    87
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    88
  # Check for deprecated ALT_ variables
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    89
  define CheckDeprecatedEnvironment
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    90
    defined_alt_variables := $$(filter ALT_%, $$(.VARIABLES))
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    91
    ifneq ($$(defined_alt_variables), )
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    92
      $$(info Warning: You have the following ALT_ variables set:)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    93
      $$(foreach var, $$(defined_alt_variables), $$(info * $$(var)=$$($$(var))))
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    94
      $$(info ALT_ variables are deprecated, and may result in a failed build.)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    95
      $$(info Please clean your environment.)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    96
      $$(info )
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    97
    endif
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
    98
  endef
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    99
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   100
  # Check for invalid make flags like -j
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   101
  define CheckInvalidMakeFlags
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   102
    # This is a trick to get this rule to execute before any other rules
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   103
    # MAKEFLAGS only indicate -j if read in a recipe (!)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   104
    $$(topdir)/make/Init.gmk: .FORCE
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   105
	$$(if $$(findstring --jobserver, $$(MAKEFLAGS)), \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   106
	    $$(info Error: 'make -jN' is not supported, use 'make JOBS=N') \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   107
	    $$(error Cannot continue) \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   108
	)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   109
    .FORCE:
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   110
    .PHONY: .FORCE
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   111
  endef
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   112
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   113
  # Check that the CONF_CHECK option is valid and set up handling
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   114
  define ParseConfCheckOption
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   115
    ifeq ($$(CONF_CHECK), )
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   116
      # Default behavior is fail
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   117
      CONF_CHECK := fail
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   118
    else ifneq ($$(filter-out auto fail ignore, $$(CONF_CHECK)),)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   119
      $$(info Error: CONF_CHECK must be one of: auto, fail or ignore.)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   120
      $$(error Cannot continue)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   121
    endif
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   122
  endef
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   123
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   124
  # Look for a given option in the LOG variable, and if found, set a variable
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   125
  # and remove the option from the LOG variable
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   126
  # $1: The option to look for
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   127
  # $2: The option to set to "true" if the option is found
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   128
  define ParseLogOption
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   129
    ifneq ($$(findstring $1, $$(LOG)),)
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   130
      $2 := true
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   131
      # COMMA is defined in spec.gmk, but that is not included yet
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   132
      COMMA := ,
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   133
      # First try to remove ",<option>" if it exists, otherwise just remove "<option>"
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   134
      LOG_STRIPPED := $$(subst $1,, $$(subst $$(COMMA)$(strip $1),, $$(LOG)))
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   135
      # We might have ended up with a leading comma. Remove it. Need override
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   136
      # since LOG is set from the command line.
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   137
      override LOG := $$(strip $$(patsubst $$(COMMA)%, %, $$(LOG_STRIPPED)))
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   138
    endif
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   139
  endef
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   140
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   141
  define ParseLogLevel
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   142
    # Catch old-style VERBOSE= command lines.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   143
    ifneq ($$(origin VERBOSE), undefined)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   144
      $$(info Error: VERBOSE is deprecated. Use LOG=<warn|info|debug|trace> instead.)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   145
      $$(error Cannot continue)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   146
    endif
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   147
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   148
    # Setup logging according to LOG
14379
b449aa34783e 8003274: build-infra: Makefile changes needed for sjavac
tbell
parents: 14111
diff changeset
   149
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   150
    # If the "nofile" argument is given, act on it and strip it away
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   151
    $$(eval $$(call ParseLogOption, nofile, LOG_NOFILE))
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   152
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   153
    # If the "cmdline" argument is given, act on it and strip it away
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   154
    $$(eval $$(call ParseLogOption, cmdlines, LOG_CMDLINES))
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   155
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   156
    LOG_LEVEL := $$(LOG)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   157
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   158
    ifeq ($$(LOG_LEVEL),)
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   159
      # Set LOG to "warn" as default if not set
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   160
      LOG_LEVEL := warn
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   161
    endif
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   162
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   163
    ifeq ($$(LOG_LEVEL), warn)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   164
      MAKE_LOG_FLAGS := -s
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   165
    else ifeq ($$(LOG_LEVEL), info)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   166
      MAKE_LOG_FLAGS := -s
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   167
    else ifeq ($$(LOG_LEVEL), debug)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   168
      MAKE_LOG_FLAGS :=
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   169
    else ifeq ($$(LOG_LEVEL), trace)
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   170
      MAKE_LOG_FLAGS :=
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   171
    else
35444
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   172
      $$(info Error: LOG contains unknown option or log level: $$(LOG).)
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   173
      $$(info LOG can be <level>[,<opt>[...]] where <opt> is nofile | cmdlines)
4d323e794486 8148655: LOG=cmdlines and other build-infra fixes
ihse
parents: 35370
diff changeset
   174
      $$(info and <level> is warn | info | debug | trace)
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   175
      $$(error Cannot continue)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   176
    endif
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   177
  endef
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   178
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   179
  define ParseConfAndSpec
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   180
    ifneq ($$(origin SPEC), undefined)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   181
      # We have been given a SPEC, check that it works out properly
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   182
      ifneq ($$(origin CONF), undefined)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   183
        # We also have a CONF argument. We can't have both.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   184
        $$(info Error: Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   185
        $$(error Cannot continue)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   186
      endif
34491
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   187
      ifneq ($$(origin CONF_NAME), undefined)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   188
        # We also have a CONF_NAME argument. We can't have both.
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   189
        $$(info Error: Cannot use CONF_NAME=$$(CONF_NAME) and SPEC=$$(SPEC) at the same time. Choose one.)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   190
        $$(error Cannot continue)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   191
      endif
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27000
diff changeset
   192
      ifeq ($$(wildcard $$(SPEC)),)
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27000
diff changeset
   193
        $$(info Error: Cannot locate spec.gmk, given by SPEC=$$(SPEC).)
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   194
        $$(error Cannot continue)
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27000
diff changeset
   195
      endif
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   196
      ifeq ($$(filter /%, $$(SPEC)),)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   197
        # If given with relative path, make it absolute
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   198
        SPECS := $$(CURDIR)/$$(strip $$(SPEC))
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   199
      else
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   200
        SPECS := $$(SPEC)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   201
      endif
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   202
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   203
      # For now, unset this SPEC variable.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   204
      override SPEC :=
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   205
    else
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   206
      # Use spec.gmk files in the build output directory
29788
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   207
      ifeq ($$(all_spec_files),)
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   208
        $$(info Error: No configurations found for $$(topdir).)
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27000
diff changeset
   209
        $$(info Please run 'bash configure' to create a configuration.)
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   210
        $$(info )
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   211
        $$(error Cannot continue)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   212
      endif
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   213
34491
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   214
      ifneq ($$(origin CONF_NAME), undefined)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   215
        ifneq ($$(origin CONF), undefined)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   216
          # We also have a CONF argument. We can't have both.
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   217
          $$(info Error: Cannot use CONF=$$(CONF) and CONF_NAME=$$(CONF_NAME) at the same time. Choose one.)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   218
          $$(error Cannot continue)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   219
        endif
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   220
        matching_conf := $$(strip $$(filter $$(CONF_NAME), $$(all_confs)))
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   221
        ifeq ($$(matching_conf),)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   222
          $$(info Error: No configurations found matching CONF_NAME=$$(CONF_NAME).)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   223
          $$(info Available configurations in $$(build_dir):)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   224
          $$(foreach var, $$(all_confs), $$(info * $$(var)))
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   225
          $$(error Cannot continue)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   226
        else ifneq ($$(words $$(matching_conf)), 1)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   227
          $$(info Error: Matching more than one configuration CONF_NAME=$$(CONF_NAME).)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   228
          $$(info Available configurations in $$(build_dir):)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   229
          $$(foreach var, $$(all_confs), $$(info * $$(var)))
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   230
          $$(error Cannot continue)
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   231
        else
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   232
          $$(info Building configuration '$$(matching_conf)' (matching CONF_NAME=$$(CONF_NAME)))
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   233
        endif
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   234
        # Create a SPEC definition. This will contain the path to exactly one spec file.
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   235
        SPECS := $$(build_dir)/$$(matching_conf)/spec.gmk
307c28cb36c2 8136782: Introduce a build/configure wrapper
erikj
parents: 34101
diff changeset
   236
      else ifneq ($$(origin CONF), undefined)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   237
        # User have given a CONF= argument.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   238
        ifeq ($$(CONF),)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   239
          # If given CONF=, match all configurations
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   240
          matching_confs := $$(strip $$(all_confs))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   241
        else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   242
          # Otherwise select those that contain the given CONF string
29788
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   243
          matching_confs := $$(strip $$(foreach var, $$(all_confs), \
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   244
              $$(if $$(findstring $$(CONF), $$(var)), $$(var))))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   245
        endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   246
        ifeq ($$(matching_confs),)
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27000
diff changeset
   247
          $$(info Error: No configurations found matching CONF=$$(CONF).)
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   248
          $$(info Available configurations in $$(build_dir):)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   249
          $$(foreach var, $$(all_confs), $$(info * $$(var)))
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   250
          $$(error Cannot continue)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   251
        else
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   252
          # Don't repeat this output on make restarts caused by including
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   253
          # generated files.
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   254
          ifeq ($$(MAKE_RESTARTS),)
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   255
            ifeq ($$(words $$(matching_confs)), 1)
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   256
              $$(info Building configuration '$$(matching_confs)' (matching CONF=$$(CONF)))
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   257
            else
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   258
              $$(info Building these configurations (matching CONF=$$(CONF)):)
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   259
              $$(foreach var, $$(matching_confs), $$(info * $$(var)))
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   260
            endif
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   261
          endif
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   262
        endif
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   263
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   264
        # Create a SPEC definition. This will contain the path to one or more spec.gmk files.
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   265
        SPECS := $$(addsuffix /spec.gmk, $$(addprefix $$(build_dir)/, $$(matching_confs)))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   266
      else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   267
        # No CONF or SPEC given, check the available configurations
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   268
        ifneq ($$(words $$(all_spec_files)), 1)
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27000
diff changeset
   269
          $$(info Error: No CONF given, but more than one configuration found.)
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   270
          $$(info Available configurations in $$(build_dir):)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   271
          $$(foreach var, $$(all_confs), $$(info * $$(var)))
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   272
          $$(info Please retry building with CONF=<config pattern> (or SPEC=<spec file>).)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   273
          $$(info )
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   274
          $$(error Cannot continue)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   275
        endif
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   276
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   277
        # We found exactly one configuration, use it
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   278
        SPECS := $$(strip $$(all_spec_files))
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 16583
diff changeset
   279
      endif
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   280
    endif
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   281
  endef
29156
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 29060
diff changeset
   282
29788
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   283
  # Extract main targets from Main.gmk using the spec provided in $2.
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   284
  #
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   285
  # Param 1: FORCE = force generation of main-targets.gmk or LAZY = do not force.
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   286
  # Param 2: The SPEC file to use.
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   287
  define DefineMainTargets
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   288
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   289
    # We will start by making sure the main-targets.gmk file is removed, if
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   290
    # make has not been restarted. By the -include, we will trigger the
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   291
    # rule for generating the file (which is never there since we removed it),
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   292
    # thus generating it fresh, and make will restart, incrementing the restart
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   293
    # count.
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   294
    main_targets_file := $$(dir $(strip $2))make-support/main-targets.gmk
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   295
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   296
    ifeq ($$(MAKE_RESTARTS),)
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   297
      # Only do this if make has not been restarted, and if we do not force it.
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   298
      ifeq ($(strip $1), FORCE)
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   299
        $$(shell rm -f $$(main_targets_file))
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   300
      endif
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   301
    endif
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   302
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   303
    $$(main_targets_file):
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   304
	@( cd $$(topdir) && \
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   305
	$$(MAKE) $$(MAKE_LOG_FLAGS) -r -R -f $$(topdir)/make/Main.gmk \
29788
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   306
	    -I $$(topdir)/make/common SPEC=$(strip $2) NO_RECIPES=true \
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   307
	    LOG_LEVEL=$$(LOG_LEVEL) \
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   308
	    create-main-targets-include )
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   309
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   310
    # Now include main-targets.gmk. This will define ALL_MAIN_TARGETS.
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   311
    -include $$(main_targets_file)
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   312
  endef
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   313
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   314
  define PrintConfCheckFailed
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   315
	@echo ' '
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   316
	@echo "Please rerun configure! Easiest way to do this is by running"
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   317
	@echo "'make reconfigure'."
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   318
	@echo "This behavior may also be changed using CONF_CHECK=<ignore|auto>."
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   319
	@echo ' '
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   320
  endef
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   321
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   322
else # $(HAS_SPEC)=true
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   323
  ##############################################################################
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   324
  # Helper functions for the 'main' target. These functions assume a single,
29788
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   325
  # proper and existing SPEC is included.
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   326
  ##############################################################################
29156
bd932374081c 8072842: Add support for building native JTReg tests
ihse
parents: 29060
diff changeset
   327
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   328
  include $(SRC_ROOT)/make/common/MakeBase.gmk
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27000
diff changeset
   329
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   330
  # Define basic logging setup
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   331
  BUILD_LOG := $(OUTPUT_ROOT)/build.log
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   332
  BUILD_TRACE_LOG := $(OUTPUT_ROOT)/build-trace-time.log
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   333
37410
fbab762803ef 8154326: bash >(...) construct causes race conditions
erikj
parents: 35744
diff changeset
   334
  BUILD_LOG_PIPE := > >($(TEE) -a $(BUILD_LOG)) 2> >($(TEE) -a $(BUILD_LOG) >&2) && wait
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27000
diff changeset
   335
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   336
  # Sanity check the spec file, so it matches this source code
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   337
  define CheckSpecSanity
29788
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   338
    ifneq ($$(ACTUAL_TOPDIR), $$(TOPDIR))
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   339
      ifneq ($$(ACTUAL_TOPDIR), $$(ORIGINAL_TOPDIR))
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   340
        ifneq ($$(ACTUAL_TOPDIR), $$(CANONICAL_TOPDIR))
29663
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   341
          $$(info Error: SPEC mismatch! Current working directory)
29788
b581a3d9db41 8076465: New Init.gmk needs improvements
ihse
parents: 29663
diff changeset
   342
          $$(info $$(ACTUAL_TOPDIR))
29663
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   343
          $$(info does not match either TOPDIR, ORIGINAL_TOPDIR or CANONICAL_TOPDIR)
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   344
          $$(info $$(TOPDIR))
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   345
          $$(info $$(ORIGINAL_TOPDIR))
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   346
          $$(info $$(CANONICAL_TOPDIR))
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   347
          $$(error Cannot continue)
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   348
        endif
74ff65003536 8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
erikj
parents: 29662
diff changeset
   349
      endif
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   350
    endif
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   351
  endef
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27000
diff changeset
   352
32715
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   353
  # Parse COMPARE_BUILD into COMPARE_BUILD_*
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   354
  # Syntax: COMPARE_BUILD=CONF=<configure options>:PATCH=<patch file>:
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32715
diff changeset
   355
  #         MAKE=<make targets>:COMP_OPTS=<compare script options>:
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   356
  #         COMP_DIR=<compare script base dir>|<default>:
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   357
  #         FAIL=<bool>
32715
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   358
  # If neither CONF or PATCH is given, assume <default> means CONF if it
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   359
  # begins with "--", otherwise assume it means PATCH.
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   360
  # MAKE and COMP_OPTS can only be used with CONF and/or PATCH specified.
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   361
  # If any value contains "+", it will be replaced by space.
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   362
  # FAIL can be set to false to have the return value of compare be ignored.
32715
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   363
  define ParseCompareBuild
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   364
    ifneq ($$(COMPARE_BUILD), )
33572
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   365
      COMPARE_BUILD_OUTPUT_ROOT := $(TOPDIR)/build/compare-build/$(CONF_NAME)
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   366
      COMPARE_BUILD_FAIL := true
33572
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   367
32715
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   368
      ifneq ($$(findstring :, $$(COMPARE_BUILD)), )
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   369
        $$(foreach part, $$(subst :, , $$(COMPARE_BUILD)), \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   370
          $$(if $$(filter PATCH=%, $$(part)), \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   371
            $$(eval COMPARE_BUILD_PATCH=$$(strip $$(patsubst PATCH=%, %, $$(part)))) \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   372
          ) \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   373
          $$(if $$(filter CONF=%, $$(part)), \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   374
            $$(eval COMPARE_BUILD_CONF=$$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(part))))) \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   375
          ) \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   376
          $$(if $$(filter MAKE=%, $$(part)), \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   377
            $$(eval COMPARE_BUILD_MAKE=$$(strip $$(subst +, , $$(patsubst MAKE=%, %, $$(part))))) \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   378
          ) \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   379
          $$(if $$(filter COMP_OPTS=%, $$(part)), \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   380
            $$(eval COMPARE_BUILD_COMP_OPTS=$$(strip $$(subst +, , $$(patsubst COMP_OPTS=%, %, $$(part))))) \
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   381
          ) \
32720
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32715
diff changeset
   382
          $$(if $$(filter COMP_DIR=%, $$(part)), \
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32715
diff changeset
   383
            $$(eval COMPARE_BUILD_COMP_DIR=$$(strip $$(subst +, , $$(patsubst COMP_DIR=%, %, $$(part))))) \
7e0e586a6817 8137014: Various improvements in build infrastructure
ihse
parents: 32715
diff changeset
   384
          ) \
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   385
          $$(if $$(filter FAIL=%, $$(part)), \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   386
            $$(eval COMPARE_BUILD_FAIL=$$(strip $$(subst +, , $$(patsubst FAIL=%, %, $$(part))))) \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   387
          ) \
32715
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   388
        )
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   389
      else
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   390
        # Separate handling for single field case, to allow for spaces in values.
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   391
        ifneq ($$(filter PATCH=%, $$(COMPARE_BUILD)), )
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   392
          COMPARE_BUILD_PATCH=$$(strip $$(patsubst PATCH=%, %, $$(COMPARE_BUILD)))
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   393
        else ifneq ($$(filter CONF=%, $$(COMPARE_BUILD)), )
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   394
          COMPARE_BUILD_CONF=$$(strip $$(subst +, , $$(patsubst CONF=%, %, $$(COMPARE_BUILD))))
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   395
        else ifneq ($$(filter --%, $$(COMPARE_BUILD)), )
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   396
          # Assume CONF if value begins with --
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   397
          COMPARE_BUILD_CONF=$$(strip $$(subst +, , $$(COMPARE_BUILD)))
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   398
        else
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   399
          # Otherwise assume patch file
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   400
          COMPARE_BUILD_PATCH=$$(strip $$(COMPARE_BUILD))
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   401
        endif
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   402
      endif
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   403
      ifneq ($$(COMPARE_BUILD_PATCH), )
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   404
        ifneq ($$(wildcard $$(TOPDIR)/$$(COMPARE_BUILD_PATCH)), )
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   405
          # Assume relative path, if file exists
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   406
          COMPARE_BUILD_PATCH := $$(wildcard $$(TOPDIR)/$$(COMPARE_BUILD_PATCH))
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   407
        else ifeq ($$(wildcard $$(COMPARE_BUILD_PATCH)), )
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   408
          $$(error Patch file $$(COMPARE_BUILD_PATCH) does not exist)
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   409
        endif
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   410
      endif
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   411
      ifneq ($$(COMPARE_BUILD_FAIL), true)
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   412
        COMPARE_BUILD_IGNORE_RESULT := || true
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   413
      endif
32715
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   414
    endif
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   415
  endef
4d558a41a1ec 8136695: Automatic build comparison with COMPARE_BUILD
ihse
parents: 32344
diff changeset
   416
33572
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   417
  # Prepare for a comparison rebuild
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   418
  define PrepareCompareBuild
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   419
	$(ECHO) "Preparing for comparison rebuild"
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   420
        # Apply patch, if any
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   421
	$(if $(COMPARE_BUILD_PATCH), $(PATCH) -p1 < $(COMPARE_BUILD_PATCH))
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   422
        # Move the first build away temporarily
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   423
	$(RM) -r $(TOPDIR)/build/.compare-build-temp
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   424
	$(MKDIR) -p $(TOPDIR)/build/.compare-build-temp
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   425
	$(MV) $(OUTPUT_ROOT) $(TOPDIR)/build/.compare-build-temp
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   426
        # Restore an old compare-build, or create a new compare-build directory.
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   427
	if test -d $(COMPARE_BUILD_OUTPUT_ROOT); then \
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   428
	  $(MV) $(COMPARE_BUILD_OUTPUT_ROOT) $(OUTPUT_ROOT); \
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   429
	else \
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   430
	  $(MKDIR) -p $(OUTPUT_ROOT); \
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   431
	fi
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   432
        # Re-run configure with the same arguments (and possibly some additional),
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   433
        # must be done after patching.
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   434
	( cd $(OUTPUT_ROOT) && PATH="$(ORIGINAL_PATH)" \
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   435
	    $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) $(COMPARE_BUILD_CONF))
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   436
  endef
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   437
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   438
  # Cleanup after a compare build
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   439
  define CleanupCompareBuild
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   440
        # If running with a COMPARE_BUILD patch, reverse-apply it
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   441
	$(if $(COMPARE_BUILD_PATCH), $(PATCH) -R -p1 < $(COMPARE_BUILD_PATCH))
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   442
        # Move this build away and restore the original build
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   443
	$(MKDIR) -p $(TOPDIR)/build/compare-build
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   444
	$(MV) $(OUTPUT_ROOT) $(COMPARE_BUILD_OUTPUT_ROOT)
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   445
	$(MV) $(TOPDIR)/build/.compare-build-temp/$(CONF_NAME) $(OUTPUT_ROOT)
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   446
	$(RM) -r $(TOPDIR)/build/.compare-build-temp
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   447
  endef
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   448
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   449
  # Do the actual comparison of two builds
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   450
  define CompareBuildDoComparison
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   451
        # Compare first and second build. Ignore any error code from compare.sh.
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   452
	$(ECHO) "Comparing between comparison rebuild (this/new) and baseline (other/old)"
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   453
	$(if $(COMPARE_BUILD_COMP_DIR), \
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   454
	  +(cd $(COMPARE_BUILD_OUTPUT_ROOT) && ./compare.sh $(COMPARE_BUILD_COMP_OPTS) \
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   455
	      -2dirs $(COMPARE_BUILD_OUTPUT_ROOT)/$(COMPARE_BUILD_COMP_DIR) \
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   456
	      $(OUTPUT_ROOT)/$(COMPARE_BUILD_COMP_DIR) $(COMPARE_BUILD_IGNORE_RESULT)), \
33572
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   457
	  +(cd $(COMPARE_BUILD_OUTPUT_ROOT) && ./compare.sh $(COMPARE_BUILD_COMP_OPTS) \
35744
4f5e0998b6e9 8149479: Fix compare.sh to have a clean baseline with COMPARE_BUILD
erikj
parents: 35444
diff changeset
   458
	      -o $(OUTPUT_ROOT) $(COMPARE_BUILD_IGNORE_RESULT)) \
33572
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   459
	)
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   460
  endef
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   461
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   462
  define PrintFailureReports
43173
5212680a318b 8173120: Preserve command line at build failure
ihse
parents: 41458
diff changeset
   463
	$(if $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log), \
5212680a318b 8173120: Preserve command line at build failure
ihse
parents: 41458
diff changeset
   464
	  $(PRINTF) "\n=== Output from failing command(s) repeated here ===\n" $(NEWLINE) \
5212680a318b 8173120: Preserve command line at build failure
ihse
parents: 41458
diff changeset
   465
	  $(foreach logfile, $(sort $(wildcard $(MAKESUPPORT_OUTPUTDIR)/failure-logs/*.log)), \
33572
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   466
	      $(PRINTF) "* For target $(notdir $(basename $(logfile))):\n" $(NEWLINE) \
35370
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   467
	      ($(GREP) -v -e "^Note: including file:" <  $(logfile) || true) | $(HEAD) -n 12 $(NEWLINE) \
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   468
	      if test `$(WC) -l < $(logfile)` -gt 12; then \
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   469
	        $(ECHO) "   ... (rest of output omitted)" ; \
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   470
	      fi $(NEWLINE) \
33572
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   471
	  ) \
43173
5212680a318b 8173120: Preserve command line at build failure
ihse
parents: 41458
diff changeset
   472
	  $(PRINTF) "\n* All command lines available in $(MAKESUPPORT_OUTPUTDIR)/failure-logs.\n" $(NEWLINE) \
33572
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   473
	  $(PRINTF) "=== End of repeated output ===\n" \
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   474
	)
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   475
  endef
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   476
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   477
  define PrintBuildLogFailures
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   478
	if $(GREP) -q "recipe for target .* failed" $(BUILD_LOG) 2> /dev/null; then  \
43173
5212680a318b 8173120: Preserve command line at build failure
ihse
parents: 41458
diff changeset
   479
	  $(PRINTF) "\n=== Make failed targets repeated here ===\n" ; \
33572
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   480
	  $(GREP) "recipe for target .* failed" $(BUILD_LOG) ; \
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   481
	  $(PRINTF) "=== End of repeated output ===\n" ; \
43173
5212680a318b 8173120: Preserve command line at build failure
ihse
parents: 41458
diff changeset
   482
	  $(PRINTF) "\nHint: Try searching the build log for the name of the first failed target.\n" ; \
33572
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   483
	else \
43173
5212680a318b 8173120: Preserve command line at build failure
ihse
parents: 41458
diff changeset
   484
	  $(PRINTF) "\nNo indication of failed target found.\n" ; \
33572
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   485
	  $(PRINTF) "Hint: Try searching the build log for '] Error'.\n" ; \
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   486
	fi
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   487
  endef
b74ceb2d2d20 8141696: Improve COMPARE_BUILD
ihse
parents: 32720
diff changeset
   488
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   489
  define RotateLogFiles
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   490
	$(RM) $(BUILD_LOG).old 2> /dev/null && \
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   491
	$(MV) $(BUILD_LOG) $(BUILD_LOG).old 2> /dev/null || true
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   492
	$(if $(findstring trace, $(LOG_LEVEL)), \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   493
	  $(RM) $(BUILD_TRACE_LOG).old 2> /dev/null && \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   494
	  $(MV) $(BUILD_TRACE_LOG) $(BUILD_TRACE_LOG).old 2> /dev/null || true \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   495
	)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   496
  endef
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents: 25854
diff changeset
   497
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 29788
diff changeset
   498
  define PrepareFailureLogs
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   499
	$(RM) -r $(MAKESUPPORT_OUTPUTDIR)/failure-logs 2> /dev/null && \
32344
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 29788
diff changeset
   500
	$(MKDIR) -p $(MAKESUPPORT_OUTPUTDIR)/failure-logs
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 29788
diff changeset
   501
  endef
0b288e0efcfa 8062618: Create a build failure summary at end of build log
ihse
parents: 29788
diff changeset
   502
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   503
  # Remove any javac server logs and port files. This
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   504
  # prevents a new make run to reuse the previous servers.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   505
  define PrepareSmartJavac
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   506
	$(if $(SJAVAC_SERVER_DIR), \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   507
	  $(RM) -r $(SJAVAC_SERVER_DIR) 2> /dev/null && \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   508
	  $(MKDIR) -p $(SJAVAC_SERVER_DIR) \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   509
	)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   510
  endef
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27000
diff changeset
   511
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   512
  define CleanupSmartJavac
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   513
	[ -f $(SJAVAC_SERVER_DIR)/server.port ] && $(ECHO) Stopping sjavac server && \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   514
	    $(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   515
  endef
26116
f051bd253364 8055095: Improve "do nothing" incremental build performance after modularized source code integration
erikj
parents: 25854
diff changeset
   516
35370
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   517
  ifeq ($(OPENJDK_BUILD_OS), windows)
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   518
    # On windows we need to synchronize with the javac server to be able to
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   519
    # move or remove the build output directory. Since we have no proper
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   520
    # synchronization process, wait for a while and hope it helps. This is only
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   521
    # used by build comparisons.
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   522
    define WaitForSmartJavacFinish
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   523
	$(if $(SJAVAC_SERVER_DIR), \
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   524
	  sleep 5\
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   525
	)
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   526
    endef
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   527
  else
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   528
    define WaitForSmartJavacFinish
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   529
    endef
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   530
  endif
f9b430645a18 8148120: Incremental update from build-infra project
ihse
parents: 35008
diff changeset
   531
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   532
  define StartGlobalTimer
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   533
	$(RM) -r $(BUILDTIMESDIR) 2> /dev/null && \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   534
	$(MKDIR) -p $(BUILDTIMESDIR) && \
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   535
	$(call RecordStartTime,TOTAL)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   536
  endef
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27000
diff changeset
   537
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   538
  define StopGlobalTimer
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   539
	$(call RecordEndTime,TOTAL)
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   540
  endef
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27000
diff changeset
   541
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   542
  # Find all build_time_* files and print their contents in a list sorted
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   543
  # on the name of the sub repository.
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   544
  define ReportBuildTimes
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   545
	$(PRINTF) $(LOG_INFO) -- \
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   546
	    "----- Build times -------\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   547
	    "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   548
	    "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   549
	    "`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | \
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   550
	    $(XARGS) $(CAT) | $(SORT) -k 2`" \
35008
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   551
	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`" \
ef0cd710989f 8146403: Windows build can be faster
erikj
parents: 34594
diff changeset
   552
	    $(BUILD_LOG_PIPE)
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   553
  endef
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27000
diff changeset
   554
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   555
endif # HAS_SPEC
27560
adc258b13e2c 8049367: Modular Run-Time Images
chegar
parents: 27000
diff changeset
   556
29662
78c47f0002c3 8076060: Improve make bootstrap process
ihse
parents: 29156
diff changeset
   557
endif # _INITSUPPORT_GMK