make/autoconf/source-dirs.m4
author coleenp
Wed, 13 Nov 2019 08:23:23 -0500
changeset 59056 15936b142f86
parent 47253 92fd0e04e0e1
permissions -rw-r--r--
8233913: Remove implicit conversion from Method* to methodHandle Summary: Fix call sites to use existing THREAD local or pass down THREAD local for shallower callsites. Make linkResolver methods return Method* for caller to handleize if needed. Reviewed-by: iklam, thartmann, hseigel
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
#
47219
fd36993f7bf5 8187542: Remove superfluous *_TOPDIR variables
ihse
parents: 47217
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
47219
fd36993f7bf5 8187542: Remove superfluous *_TOPDIR variables
ihse
parents: 47217
diff changeset
    26
AC_DEFUN_ONCE([SRCDIRS_SETUP_DIRS],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    27
[
47253
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47219
diff changeset
    28
  OUTPUTDIR="$OUTPUTDIR"
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47219
diff changeset
    29
  AC_SUBST(OUTPUTDIR)
92fd0e04e0e1 8187544: Replace BUILD_OUTPUT and OUTPUT_ROOT with OUTPUTDIR
ihse
parents: 47219
diff changeset
    30
  JDK_OUTPUTDIR="$OUTPUTDIR/jdk"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    31
47219
fd36993f7bf5 8187542: Remove superfluous *_TOPDIR variables
ihse
parents: 47217
diff changeset
    32
  # Where are the sources.
fd36993f7bf5 8187542: Remove superfluous *_TOPDIR variables
ihse
parents: 47217
diff changeset
    33
  AC_SUBST(TOPDIR)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    34
])
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    35
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    36
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    37
# Define a mechanism for importing extra prebuilt modules
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    38
#
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    39
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    40
AC_DEFUN_ONCE([SRCDIRS_SETUP_IMPORT_MODULES],
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    41
[
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    42
  AC_ARG_WITH(import-modules, [AS_HELP_STRING([--with-import-modules],
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    43
      [import a set of prebuilt modules either as a zip file or an exploded directory])])
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    44
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    45
  if test "x$with_import_modules" != x \
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    46
      && test "x$with_import_modules" != "xno"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    47
    if test -d "$with_import_modules"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    48
      IMPORT_MODULES_TOPDIR="$with_import_modules"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    49
      BASIC_FIXUP_PATH([IMPORT_MODULES_TOPDIR])
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    50
    elif test -e "$with_import_modules"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    51
      IMPORT_MODULES_TOPDIR="$CONFIGURESUPPORT_OUTPUTDIR/import-modules"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    52
      $RM -rf "$IMPORT_MODULES_TOPDIR"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    53
      $MKDIR -p "$IMPORT_MODULES_TOPDIR"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    54
      if ! $UNZIP -q "$with_import_modules" -d "$IMPORT_MODULES_TOPDIR"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    55
        AC_MSG_ERROR([--with-import-modules="$with_import_modules" must point to a dir or a zip file])
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    56
      fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    57
    else
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    58
      AC_MSG_ERROR([--with-import-modules="$with_import_modules" must point to a dir or a zip file])
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    59
    fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    60
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    61
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    62
  if test -d "$IMPORT_MODULES_TOPDIR/modules"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    63
    IMPORT_MODULES_CLASSES="$IMPORT_MODULES_TOPDIR/modules"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    64
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    65
  if test -d "$IMPORT_MODULES_TOPDIR/modules_cmds"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    66
    IMPORT_MODULES_CMDS="$IMPORT_MODULES_TOPDIR/modules_cmds"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    67
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    68
  if test -d "$IMPORT_MODULES_TOPDIR/modules_libs"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    69
    IMPORT_MODULES_LIBS="$IMPORT_MODULES_TOPDIR/modules_libs"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    70
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    71
  if test -d "$IMPORT_MODULES_TOPDIR/modules_conf"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    72
    IMPORT_MODULES_CONF="$IMPORT_MODULES_TOPDIR/modules_conf"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    73
  fi
42505
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42289
diff changeset
    74
  if test -d "$IMPORT_MODULES_TOPDIR/modules_legal"; then
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42289
diff changeset
    75
    IMPORT_MODULES_LEGAL="$IMPORT_MODULES_TOPDIR/modules_legal"
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42289
diff changeset
    76
  fi
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42289
diff changeset
    77
  if test -d "$IMPORT_MODULES_TOPDIR/modules_man"; then
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42289
diff changeset
    78
    IMPORT_MODULES_MAN="$IMPORT_MODULES_TOPDIR/modules_man"
11439b0c0792 8169925: Organize licenses by module in source, JMOD file, and run-time image
mchung
parents: 42289
diff changeset
    79
  fi
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    80
  if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    81
    IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    82
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    83
  if test -d "$IMPORT_MODULES_TOPDIR/make"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    84
    IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    85
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    86
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    87
  AC_SUBST(IMPORT_MODULES_CLASSES)
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    88
  AC_SUBST(IMPORT_MODULES_CMDS)
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    89
  AC_SUBST(IMPORT_MODULES_LIBS)
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    90
  AC_SUBST(IMPORT_MODULES_CONF)
42519
f67db45ebdbd 8171249: modules_legal from imported modules are not read by the build
erikj
parents: 42513
diff changeset
    91
  AC_SUBST(IMPORT_MODULES_LEGAL)
f67db45ebdbd 8171249: modules_legal from imported modules are not read by the build
erikj
parents: 42513
diff changeset
    92
  AC_SUBST(IMPORT_MODULES_MAN)
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    93
  AC_SUBST(IMPORT_MODULES_SRC)
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    94
  AC_SUBST(IMPORT_MODULES_MAKE)
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    95
])