common/autoconf/jdk-options.m4
author amurillo
Thu, 04 Jul 2013 14:56:49 -0700
changeset 18679 9e3bf88e1385
parent 17819 cd99349ffc0d
child 19764 345aa6f8d18a
child 22460 0273c023680c
permissions -rw-r--r--
8019934: new hotspot build - hs25-b41 Reviewed-by: jcoomes
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
#
15056
6a7cbe3b0f08 8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents: 15055
diff changeset
     2
# Copyright (c) 2011, 2013, 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([JDKOPT_SETUP_JDK_VARIANT],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    27
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    28
###############################################################################
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    29
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    30
# Check which variant of the JDK that we want to build.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    31
# Currently we have:
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    32
#    normal:   standard edition   
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    33
# but the custom make system may add other variants
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    34
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    35
# Effectively the JDK variant gives a name to a specific set of
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    36
# modules to compile into the JDK. In the future, these modules
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    37
# might even be Jigsaw modules.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    38
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    39
AC_MSG_CHECKING([which variant of the JDK to build])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    40
AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant],
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    41
	[JDK variant to build (normal) @<:@normal@:>@])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    42
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    43
if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    44
    JDK_VARIANT="normal"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    45
else
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    46
    AC_MSG_ERROR([The available JDK variants are: normal])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    47
fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    48
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    49
AC_SUBST(JDK_VARIANT)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    50
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    51
AC_MSG_RESULT([$JDK_VARIANT])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    52
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    53
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    54
AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    55
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    56
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    57
###############################################################################
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    58
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    59
# Check which variants of the JVM that we want to build.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    60
# Currently we have:
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    61
#    server: normal interpreter and a tiered C1/C2 compiler
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    62
#    client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
    63
#    minimal1: reduced form of client with optional VM services and features stripped out
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    64
#    kernel: kernel footprint JVM that passes the TCK without major performance problems,
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    65
#             ie normal interpreter and C1, only the serial GC, kernel jvmti etc
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    66
#    zero: no machine code interpreter, no compiler
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    67
#    zeroshark: zero interpreter and shark/llvm compiler backend
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    68
AC_MSG_CHECKING([which variants of the JVM to build])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    69
AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
    70
	[JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark) @<:@server@:>@])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    71
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    72
if test "x$with_jvm_variants" = x; then
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    73
     with_jvm_variants="server"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    74
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    75
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    76
JVM_VARIANTS=",$with_jvm_variants,"
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
    77
TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//'  -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'`
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    78
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    79
if test "x$TEST_VARIANTS" != "x,"; then
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
    80
   AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    81
fi   
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    82
AC_MSG_RESULT([$with_jvm_variants])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    83
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    84
JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    85
JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'` 
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
    86
JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    87
JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    88
JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    89
JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    90
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    91
if test "x$JVM_VARIANT_CLIENT" = xtrue; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    92
    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    93
        AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    94
    fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    95
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    96
if test "x$JVM_VARIANT_KERNEL" = xtrue; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    97
    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    98
        AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    99
    fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   100
fi
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   101
if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   102
    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   103
        AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.])
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   104
    fi
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   105
fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   106
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   107
# Replace the commas with AND for use in the build directory name.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   108
ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   109
COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'`
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   110
if test "x$COUNT_VARIANTS" != "x,1"; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   111
    BUILDING_MULTIPLE_JVM_VARIANTS=yes
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   112
else
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   113
    BUILDING_MULTIPLE_JVM_VARIANTS=no
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   114
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   115
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   116
AC_SUBST(JVM_VARIANTS)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   117
AC_SUBST(JVM_VARIANT_SERVER)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   118
AC_SUBST(JVM_VARIANT_CLIENT)
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   119
AC_SUBST(JVM_VARIANT_MINIMAL1)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   120
AC_SUBST(JVM_VARIANT_KERNEL)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   121
AC_SUBST(JVM_VARIANT_ZERO)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   122
AC_SUBST(JVM_VARIANT_ZEROSHARK)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   123
16581
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   124
INCLUDE_SA=true
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   125
if test "x$JVM_VARIANT_ZERO" = xtrue ; then
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   126
    INCLUDE_SA=false
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   127
fi
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   128
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   129
    INCLUDE_SA=false
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   130
fi
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   131
AC_SUBST(INCLUDE_SA)
b2cddec593f4 8011388: Support building zero and zeroshark with the new build
omajid
parents: 16423
diff changeset
   132
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   133
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   134
   MACOSX_UNIVERSAL="true"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   135
fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   136
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   137
AC_SUBST(MACOSX_UNIVERSAL)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   138
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   139
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   140
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   141
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_LEVEL],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   142
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   143
###############################################################################
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   144
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   145
# Set the debug level
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   146
#    release: no debug information, all optimizations, no asserts.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   147
#    fastdebug: debug information (-g), all optimizations, all asserts
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   148
#    slowdebug: debug information (-g), no optimizations, all asserts
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   149
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   150
DEBUG_LEVEL="release"              
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   151
AC_MSG_CHECKING([which debug level to use])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   152
AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   153
	[set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   154
	[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   155
        ENABLE_DEBUG="${enableval}"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   156
        DEBUG_LEVEL="fastdebug"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   157
    ], [ENABLE_DEBUG="no"])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   158
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   159
AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   160
	[set the debug level (release, fastdebug, slowdebug) @<:@release@:>@])],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   161
	[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   162
        DEBUG_LEVEL="${withval}"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   163
        if test "x$ENABLE_DEBUG" = xyes; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   164
			AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   165
        fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   166
    ])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   167
AC_MSG_RESULT([$DEBUG_LEVEL])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   168
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   169
if test "x$DEBUG_LEVEL" != xrelease && \
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   170
   test "x$DEBUG_LEVEL" != xfastdebug && \
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   171
   test "x$DEBUG_LEVEL" != xslowdebug; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   172
   AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   173
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   174
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   175
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   176
###############################################################################
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   177
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   178
# Setup legacy vars/targets and new vars to deal with different debug levels.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   179
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   180
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   181
case $DEBUG_LEVEL in
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   182
      release )
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   183
          VARIANT="OPT"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   184
          FASTDEBUG="false"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   185
          DEBUG_CLASSFILES="false"            
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   186
          BUILD_VARIANT_RELEASE=""             
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   187
          HOTSPOT_DEBUG_LEVEL="product"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   188
          HOTSPOT_EXPORT="product"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   189
           ;;
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   190
      fastdebug )
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   191
          VARIANT="DBG"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   192
          FASTDEBUG="true"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   193
          DEBUG_CLASSFILES="true"            
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   194
          BUILD_VARIANT_RELEASE="-fastdebug"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   195
          HOTSPOT_DEBUG_LEVEL="fastdebug"   
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   196
          HOTSPOT_EXPORT="fastdebug"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   197
           ;;
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   198
      slowdebug )
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   199
          VARIANT="DBG"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   200
          FASTDEBUG="false"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   201
          DEBUG_CLASSFILES="true"            
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   202
          BUILD_VARIANT_RELEASE="-debug"             
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   203
          HOTSPOT_DEBUG_LEVEL="jvmg"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   204
          HOTSPOT_EXPORT="debug"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   205
           ;;
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   206
esac
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   207
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   208
#####
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   209
# Generate the legacy makefile targets for hotspot.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   210
# The hotspot api for selecting the build artifacts, really, needs to be improved.
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   211
# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   212
# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   213
# But until then ...
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   214
HOTSPOT_TARGET=""
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   215
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   216
if test "x$JVM_VARIANT_SERVER" = xtrue; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   217
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   218
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   219
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   220
if test "x$JVM_VARIANT_CLIENT" = xtrue; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   221
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   222
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   223
14810
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   224
if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   225
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   226
fi
4e7fee179b4a 7190137: Add support for JVM_VARIANT minimal1
dholmes
parents: 14615
diff changeset
   227
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   228
if test "x$JVM_VARIANT_KERNEL" = xtrue; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   229
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   230
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   231
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   232
if test "x$JVM_VARIANT_ZERO" = xtrue; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   233
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   234
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   235
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   236
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   237
    HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   238
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   239
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   240
HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   241
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   242
# On Macosx universal binaries are produced, but they only contain
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   243
# 64 bit intel. This invalidates control of which jvms are built
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   244
# from configure, but only server is valid anyway. Fix this
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   245
# when hotspot makefiles are rewritten.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   246
if test "x$MACOSX_UNIVERSAL" = xtrue; then
15054
e649ff651503 8004490: build-infra: mac: hotspot is always built in product, regardless of --with-debug-level setting
erikj
parents: 14810
diff changeset
   247
    HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   248
fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   249
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   250
#####
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   251
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   252
AC_SUBST(DEBUG_LEVEL)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   253
AC_SUBST(VARIANT)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   254
AC_SUBST(FASTDEBUG)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   255
AC_SUBST(DEBUG_CLASSFILES)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   256
AC_SUBST(BUILD_VARIANT_RELEASE)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   257
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   258
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   259
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   260
###############################################################################
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   261
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   262
# Should we build only OpenJDK even if closed sources are present?
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   263
#
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   264
AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   265
[
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   266
  AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   267
    [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   268
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   269
  AC_MSG_CHECKING([for presence of closed sources])
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   270
  if test -d "$SRC_ROOT/jdk/src/closed"; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   271
    CLOSED_SOURCE_PRESENT=yes
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   272
  else
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   273
    CLOSED_SOURCE_PRESENT=no
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   274
  fi
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   275
  AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   276
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   277
  AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)])
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   278
  SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   279
  AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   280
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   281
  if test "x$CLOSED_SOURCE_PRESENT" = xno; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   282
    OPENJDK=true
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   283
    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   284
      AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense])
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   285
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   286
  else
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   287
    if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   288
      OPENJDK=true
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   289
    else
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   290
      OPENJDK=false
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   291
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   292
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   293
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   294
  if test "x$OPENJDK" = "xtrue"; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   295
    SET_OPENJDK="OPENJDK=true"
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   296
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   297
15069
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   298
  AC_SUBST(SET_OPENJDK)
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   299
])
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   300
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   301
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
c6dab988d808 8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents: 15067
diff changeset
   302
[
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   303
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   304
###############################################################################
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   305
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   306
# Should we build a JDK/JVM with headful support (ie a graphical ui)?
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   307
# We always build headless support.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   308
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   309
AC_MSG_CHECKING([headful support])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   310
AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful],
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   311
	[disable building headful support (graphical UI support) @<:@enabled@:>@])],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   312
    [SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   313
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   314
SUPPORT_HEADLESS=yes
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   315
BUILD_HEADLESS="BUILD_HEADLESS:=true"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   316
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   317
if test "x$SUPPORT_HEADFUL" = xyes; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   318
    # We are building both headful and headless.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   319
    headful_msg="inlude support for both headful and headless"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   320
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   321
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   322
if test "x$SUPPORT_HEADFUL" = xno; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   323
    # Thus we are building headless only.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   324
    BUILD_HEADLESS="BUILD_HEADLESS:=true"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   325
    headful_msg="headless only"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   326
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   327
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   328
AC_MSG_RESULT([$headful_msg])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   329
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   330
AC_SUBST(SUPPORT_HEADLESS)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   331
AC_SUBST(SUPPORT_HEADFUL)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   332
AC_SUBST(BUILD_HEADLESS)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   333
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   334
# Control wether Hotspot runs Queens test after build.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   335
AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   336
	[run the Queens test after Hotspot build @<:@disabled@:>@])],,
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   337
    [enable_hotspot_test_in_build=no])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   338
if test "x$enable_hotspot_test_in_build" = "xyes"; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   339
    TEST_IN_BUILD=true
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   340
else
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   341
    TEST_IN_BUILD=false
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   342
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   343
AC_SUBST(TEST_IN_BUILD)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   344
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   345
###############################################################################
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   346
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   347
# Choose cacerts source file
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   348
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   349
AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   350
    [specify alternative cacerts file])])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   351
if test "x$with_cacerts_file" != x; then
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   352
    CACERTS_FILE=$with_cacerts_file
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   353
else
17819
cd99349ffc0d 8010785: JDK 8 build on Linux fails with new build mechanism
erikj
parents: 17663
diff changeset
   354
    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   355
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   356
AC_SUBST(CACERTS_FILE)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   357
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   358
###############################################################################
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   359
#
14112
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   360
# Enable or disable unlimited crypto
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   361
#
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   362
AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto],
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   363
        [Enable unlimited crypto policy @<:@disabled@:>@])],,
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   364
    [enable_unlimited_crypto=no])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   365
if test "x$enable_unlimited_crypto" = "xyes"; then
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   366
    UNLIMITED_CRYPTO=true
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   367
else
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   368
    UNLIMITED_CRYPTO=false
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   369
fi
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   370
AC_SUBST(UNLIMITED_CRYPTO)
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   371
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   372
###############################################################################
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   373
#
15914
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   374
# Enable or disable the elliptic curve crypto implementation
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   375
#
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   376
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   377
[
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   378
AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   379
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   380
if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   381
    ENABLE_INTREE_EC=yes
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   382
    AC_MSG_RESULT([yes])
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   383
else
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   384
    ENABLE_INTREE_EC=no
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   385
    AC_MSG_RESULT([no])
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   386
fi
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   387
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   388
AC_SUBST(ENABLE_INTREE_EC)
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   389
])
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   390
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   391
###############################################################################
1338d1e0e058 8010030: Allow configure to detect if EC implementation is present
omajid
parents: 15180
diff changeset
   392
#
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   393
# Compress jars
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   394
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   395
COMPRESS_JARS=false
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   396
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   397
AC_SUBST(COMPRESS_JARS)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   398
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   399
15056
6a7cbe3b0f08 8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents: 15055
diff changeset
   400
###############################################################################
6a7cbe3b0f08 8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents: 15055
diff changeset
   401
#
6a7cbe3b0f08 8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents: 15055
diff changeset
   402
# Setup version numbers
6a7cbe3b0f08 8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents: 15055
diff changeset
   403
#
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   404
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   405
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   406
# Source the version numbers
15056
6a7cbe3b0f08 8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents: 15055
diff changeset
   407
. $AUTOCONF_DIR/version-numbers
15055
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   408
15056
6a7cbe3b0f08 8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents: 15055
diff changeset
   409
# Get the settings from parameters
15055
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   410
AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone], 
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   411
                       [Set milestone value for build @<:@internal@:>@])])
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   412
if test "x$with_milestone" = xyes; then
15067
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   413
  AC_MSG_ERROR([Milestone must have a value])
15055
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   414
elif test "x$with_milestone" != x; then
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   415
    MILESTONE="$with_milestone"
15180
ec560ee3d64c 8006658: build-infra: Make MILESTONE behave the same as JDK_BUILD_NUMBER
erikj
parents: 15069
diff changeset
   416
fi
ec560ee3d64c 8006658: build-infra: Make MILESTONE behave the same as JDK_BUILD_NUMBER
erikj
parents: 15069
diff changeset
   417
if test "x$MILESTONE" = x; then
15067
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   418
  MILESTONE=internal
15055
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   419
fi
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   420
17663
d2ae6f7a7e7b 8015784: Add configure parameter --with-update-version
erikj
parents: 16581
diff changeset
   421
AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version], 
d2ae6f7a7e7b 8015784: Add configure parameter --with-update-version
erikj
parents: 16581
diff changeset
   422
                          [Set update version value for build @<:@b00@:>@])])
d2ae6f7a7e7b 8015784: Add configure parameter --with-update-version
erikj
parents: 16581
diff changeset
   423
if test "x$with_update_version" = xyes; then
d2ae6f7a7e7b 8015784: Add configure parameter --with-update-version
erikj
parents: 16581
diff changeset
   424
  AC_MSG_ERROR([Update version must have a value])
d2ae6f7a7e7b 8015784: Add configure parameter --with-update-version
erikj
parents: 16581
diff changeset
   425
elif test "x$with_update_version" != x; then
d2ae6f7a7e7b 8015784: Add configure parameter --with-update-version
erikj
parents: 16581
diff changeset
   426
  JDK_UPDATE_VERSION="$with_update_version"
d2ae6f7a7e7b 8015784: Add configure parameter --with-update-version
erikj
parents: 16581
diff changeset
   427
fi
d2ae6f7a7e7b 8015784: Add configure parameter --with-update-version
erikj
parents: 16581
diff changeset
   428
15055
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   429
AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], 
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   430
                          [Set build number value for build @<:@b00@:>@])])
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   431
if test "x$with_build_number" = xyes; then
15067
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   432
  AC_MSG_ERROR([Build number must have a value])
15055
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   433
elif test "x$with_build_number" != x; then
15067
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   434
  JDK_BUILD_NUMBER="$with_build_number"
15055
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   435
fi
15056
6a7cbe3b0f08 8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents: 15055
diff changeset
   436
if test "x$JDK_BUILD_NUMBER" = x; then
15067
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   437
  JDK_BUILD_NUMBER=b00
15056
6a7cbe3b0f08 8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents: 15055
diff changeset
   438
fi
15055
25fc052ccadd 8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents: 15054
diff changeset
   439
15067
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   440
AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], 
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   441
        [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   442
if test "x$with_user_release_suffix" = xyes; then
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   443
  AC_MSG_ERROR([Release suffix must have a value])
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   444
elif test "x$with_user_release_suffix" != x; then
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   445
  USER_RELEASE_SUFFIX="$with_user_release_suffix"
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   446
else
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   447
  BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   448
  # Avoid [:alnum:] since it depends on the locale.
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   449
  CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   450
  USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   451
fi
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   452
AC_SUBST(USER_RELEASE_SUFFIX)
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   453
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   454
# Now set the JDK version, milestone, build number etc.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   455
AC_SUBST(JDK_MAJOR_VERSION)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   456
AC_SUBST(JDK_MINOR_VERSION)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   457
AC_SUBST(JDK_MICRO_VERSION)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   458
AC_SUBST(JDK_UPDATE_VERSION)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   459
AC_SUBST(JDK_BUILD_NUMBER)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   460
AC_SUBST(MILESTONE)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   461
AC_SUBST(LAUNCHER_NAME)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   462
AC_SUBST(PRODUCT_NAME)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   463
AC_SUBST(PRODUCT_SUFFIX)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   464
AC_SUBST(JDK_RC_PLATFORM_NAME)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   465
AC_SUBST(COMPANY_NAME)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   466
AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   467
AC_SUBST(MACOSX_BUNDLE_ID_BASE)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   468
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   469
COPYRIGHT_YEAR=`date +'%Y'`
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   470
AC_SUBST(COPYRIGHT_YEAR)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   471
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   472
if test "x$JDK_UPDATE_VERSION" != x; then
15067
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   473
  JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   474
else
15067
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   475
  JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   476
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   477
AC_SUBST(JDK_VERSION)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   478
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   479
COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   480
AC_SUBST(COOKED_BUILD_NUMBER)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   481
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   482
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   483
AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   484
[
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   485
HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   486
AC_SUBST(HOTSPOT_MAKE_ARGS)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   487
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   488
# The name of the Service Agent jar.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   489
SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   490
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
15067
1c9e1fa29ee9 8005794: in new infra, how do we change java -version?
tbell
parents: 15056
diff changeset
   491
  SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   492
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   493
AC_SUBST(SALIB_NAME)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   494
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   495
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   496
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   497
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   498
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   499
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   500
# ENABLE_DEBUG_SYMBOLS
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   501
# This must be done after the toolchain is setup, since we're looking at objcopy.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   502
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   503
AC_ARG_ENABLE([debug-symbols],
14615
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   504
              [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   505
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   506
AC_MSG_CHECKING([if we should generate debug symbols])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   507
14615
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   508
if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   509
   # explicit enabling of enable-debug-symbols and can't find objcopy
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   510
   #   this is an error
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   511
   AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   512
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   513
14615
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   514
if test "x$enable_debug_symbols" = "xyes"; then
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   515
  ENABLE_DEBUG_SYMBOLS=true
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   516
elif test "x$enable_debug_symbols" = "xno"; then
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   517
  ENABLE_DEBUG_SYMBOLS=false
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   518
else
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   519
  # default on macosx is false
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   520
  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   521
    ENABLE_DEBUG_SYMBOLS=false
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   522
  # Default is on if objcopy is found, otherwise off
14615
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   523
  elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   524
    ENABLE_DEBUG_SYMBOLS=true
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   525
  else
14615
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   526
    ENABLE_DEBUG_SYMBOLS=false
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   527
  fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   528
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   529
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   530
AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   531
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   532
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   533
# ZIP_DEBUGINFO_FILES
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   534
#
16423
b4a3277b3c5f 8009988: build-infra: Fix configure output for zip debuginfo check
andrew
parents: 15914
diff changeset
   535
AC_MSG_CHECKING([if we should zip debug-info files])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   536
AC_ARG_ENABLE([zip-debug-info],
16423
b4a3277b3c5f 8009988: build-infra: Fix configure output for zip debuginfo check
andrew
parents: 15914
diff changeset
   537
              [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
b4a3277b3c5f 8009988: build-infra: Fix configure output for zip debuginfo check
andrew
parents: 15914
diff changeset
   538
	      [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"])
14615
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   539
AC_MSG_RESULT([${enable_zip_debug_info}])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   540
14615
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   541
if test "x${enable_zip_debug_info}" = "xno"; then
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   542
   ZIP_DEBUGINFO_FILES=false
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   543
else
14615
2616975e69d3 8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents: 14112
diff changeset
   544
   ZIP_DEBUGINFO_FILES=true
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   545
fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   546
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   547
AC_SUBST(ENABLE_DEBUG_SYMBOLS)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   548
AC_SUBST(ZIP_DEBUGINFO_FILES)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   549
AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   550
AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   551
])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   552
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   553
# Support for customization of the build process. Some build files
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   554
# will include counterparts from this location, if they exist. This allows
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   555
# for a degree of customization of the build targets and the rules/recipes
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   556
# to create them
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   557
AC_ARG_WITH([custom-make-dir], [AS_HELP_STRING([--with-custom-make-dir],
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   558
    [use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   559
AC_SUBST(CUSTOM_MAKE_DIR)