common/autoconf/source-dirs.m4
author alanb
Fri, 28 Oct 2016 10:18:07 +0100
changeset 41817 b90ad1de93ea
parent 41458 f285e333e8db
child 42510 406dfb60de57
child 42289 08548fd6e608
permissions -rw-r--r--
8168789: ModuleReader.list and ModuleFinder.of update Reviewed-by: mchung
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
#
41458
f285e333e8db 8167424: Various trivial fixes in build system
ihse
parents: 36506
diff changeset
     2
# Copyright (c) 2011, 2016, 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
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    26
AC_DEFUN_ONCE([SRCDIRS_SETUP_TOPDIRS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    27
[
33442
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    28
  # Where are the sources.
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    29
  LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    30
  CORBA_TOPDIR="$SRC_ROOT/corba"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    31
  JAXP_TOPDIR="$SRC_ROOT/jaxp"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    32
  JAXWS_TOPDIR="$SRC_ROOT/jaxws"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    33
  HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    34
  NASHORN_TOPDIR="$SRC_ROOT/nashorn"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    35
  JDK_TOPDIR="$SRC_ROOT/jdk"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    36
  AC_SUBST(LANGTOOLS_TOPDIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    37
  AC_SUBST(CORBA_TOPDIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    38
  AC_SUBST(JAXP_TOPDIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    39
  AC_SUBST(JAXWS_TOPDIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    40
  AC_SUBST(HOTSPOT_TOPDIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    41
  AC_SUBST(NASHORN_TOPDIR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    42
  AC_SUBST(JDK_TOPDIR)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    43
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    44
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    45
AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    46
[
33442
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    47
  # This feature is no longer supported.
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    48
33442
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    49
  BASIC_DEPRECATED_ARG_WITH(add-source-root)
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    50
  BASIC_DEPRECATED_ARG_WITH(override-source-root)
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    51
  BASIC_DEPRECATED_ARG_WITH(adds-and-overrides)
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    52
  BASIC_DEPRECATED_ARG_WITH(override-langtools)
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    53
  BASIC_DEPRECATED_ARG_WITH(override-corba)
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    54
  BASIC_DEPRECATED_ARG_WITH(override-jaxp)
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    55
  BASIC_DEPRECATED_ARG_WITH(override-jaxws)
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    56
  BASIC_DEPRECATED_ARG_WITH(override-hotspot)
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    57
  BASIC_DEPRECATED_ARG_WITH(override-nashorn)
f75b19e407af 8141414: Deprecate configure source overriding
ihse
parents: 21759
diff changeset
    58
  BASIC_DEPRECATED_ARG_WITH(override-jdk)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    59
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    60
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    61
AC_DEFUN_ONCE([SRCDIRS_SETUP_OUTPUT_DIRS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    62
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    63
  BUILD_OUTPUT="$OUTPUT_ROOT"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    64
  AC_SUBST(BUILD_OUTPUT)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    65
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    66
  HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    67
  BUILD_HOTSPOT=true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    68
  AC_SUBST(HOTSPOT_DIST)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    69
  AC_SUBST(BUILD_HOTSPOT)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    70
  AC_ARG_WITH(import-hotspot, [AS_HELP_STRING([--with-import-hotspot],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    71
  [import hotspot binaries from this jdk image or hotspot build dist dir instead of building from source])])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    72
  if test "x$with_import_hotspot" != x; then
14378
0ef5d942b98e 8002028: build-infra: need no-hotspot partial build
tbell
parents: 13697
diff changeset
    73
    CURDIR="$PWD"
0ef5d942b98e 8002028: build-infra: need no-hotspot partial build
tbell
parents: 13697
diff changeset
    74
    cd "$with_import_hotspot"
0ef5d942b98e 8002028: build-infra: need no-hotspot partial build
tbell
parents: 13697
diff changeset
    75
    HOTSPOT_DIST="`pwd`"
0ef5d942b98e 8002028: build-infra: need no-hotspot partial build
tbell
parents: 13697
diff changeset
    76
    cd "$CURDIR"
0ef5d942b98e 8002028: build-infra: need no-hotspot partial build
tbell
parents: 13697
diff changeset
    77
    if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    78
      AC_MSG_ERROR([You have to import hotspot from a full jdk image or hotspot build dist dir!])
14378
0ef5d942b98e 8002028: build-infra: need no-hotspot partial build
tbell
parents: 13697
diff changeset
    79
    fi
0ef5d942b98e 8002028: build-infra: need no-hotspot partial build
tbell
parents: 13697
diff changeset
    80
    AC_MSG_CHECKING([if hotspot should be imported])
0ef5d942b98e 8002028: build-infra: need no-hotspot partial build
tbell
parents: 13697
diff changeset
    81
    AC_MSG_RESULT([yes from $HOTSPOT_DIST])
0ef5d942b98e 8002028: build-infra: need no-hotspot partial build
tbell
parents: 13697
diff changeset
    82
    BUILD_HOTSPOT=false
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    83
  fi
14378
0ef5d942b98e 8002028: build-infra: need no-hotspot partial build
tbell
parents: 13697
diff changeset
    84
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19757
diff changeset
    85
  JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    86
])
36506
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    87
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    88
################################################################################
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    89
# Define a mechanism for importing extra prebuilt modules
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    90
#
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    91
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    92
AC_DEFUN_ONCE([SRCDIRS_SETUP_IMPORT_MODULES],
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    93
[
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    94
  AC_ARG_WITH(import-modules, [AS_HELP_STRING([--with-import-modules],
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    95
      [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
    96
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    97
  if test "x$with_import_modules" != x \
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    98
      && test "x$with_import_modules" != "xno"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
    99
    if test -d "$with_import_modules"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   100
      IMPORT_MODULES_TOPDIR="$with_import_modules"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   101
      BASIC_FIXUP_PATH([IMPORT_MODULES_TOPDIR])
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   102
    elif test -e "$with_import_modules"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   103
      IMPORT_MODULES_TOPDIR="$CONFIGURESUPPORT_OUTPUTDIR/import-modules"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   104
      $RM -rf "$IMPORT_MODULES_TOPDIR"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   105
      $MKDIR -p "$IMPORT_MODULES_TOPDIR"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   106
      if ! $UNZIP -q "$with_import_modules" -d "$IMPORT_MODULES_TOPDIR"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   107
        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
   108
      fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   109
    else
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   110
      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
   111
    fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   112
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   113
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   114
  if test -d "$IMPORT_MODULES_TOPDIR/modules"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   115
    IMPORT_MODULES_CLASSES="$IMPORT_MODULES_TOPDIR/modules"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   116
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   117
  if test -d "$IMPORT_MODULES_TOPDIR/modules_cmds"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   118
    IMPORT_MODULES_CMDS="$IMPORT_MODULES_TOPDIR/modules_cmds"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   119
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   120
  if test -d "$IMPORT_MODULES_TOPDIR/modules_libs"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   121
    IMPORT_MODULES_LIBS="$IMPORT_MODULES_TOPDIR/modules_libs"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   122
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   123
  if test -d "$IMPORT_MODULES_TOPDIR/modules_conf"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   124
    IMPORT_MODULES_CONF="$IMPORT_MODULES_TOPDIR/modules_conf"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   125
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   126
  if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   127
    IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   128
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   129
  if test -d "$IMPORT_MODULES_TOPDIR/make"; then
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   130
    IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make"
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   131
  fi
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   132
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   133
  AC_SUBST(IMPORT_MODULES_CLASSES)
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   134
  AC_SUBST(IMPORT_MODULES_CMDS)
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   135
  AC_SUBST(IMPORT_MODULES_LIBS)
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   136
  AC_SUBST(IMPORT_MODULES_CONF)
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   137
  AC_SUBST(IMPORT_MODULES_SRC)
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   138
  AC_SUBST(IMPORT_MODULES_MAKE)
17612cee3530 8142968: Module System implementation
alanb
parents: 33442
diff changeset
   139
])