stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2016-12-14 20:33:31 +00:00
commit df76a8f449
22 changed files with 502 additions and 3964 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3605
THIRD_PARTY_README
View File

File diff suppressed because it is too large Load Diff

3
common/autoconf/bootcycle-spec.gmk.in
View File

@ -50,9 +50,6 @@ BOOT_JDK := $(JDK_IMAGE_DIR)
# The bootcycle build has a different output directory # The bootcycle build has a different output directory
OLD_BUILD_OUTPUT:=@BUILD_OUTPUT@ OLD_BUILD_OUTPUT:=@BUILD_OUTPUT@
BUILD_OUTPUT:=$(OLD_BUILD_OUTPUT)/bootcycle-build BUILD_OUTPUT:=$(OLD_BUILD_OUTPUT)/bootcycle-build
# The HOTSPOT_DIST dir is not defined relative to BUILD_OUTPUT in spec.gmk. Must not
# use space in this patsubst to avoid leading space in HOTSPOT_DIST.
HOTSPOT_DIST:=$(patsubst $(OLD_BUILD_OUTPUT)%,$(BUILD_OUTPUT)%,$(HOTSPOT_DIST))
SJAVAC_SERVER_DIR:=$(patsubst $(OLD_BUILD_OUTPUT)%, $(BUILD_OUTPUT)%, $(SJAVAC_SERVER_DIR)) SJAVAC_SERVER_DIR:=$(patsubst $(OLD_BUILD_OUTPUT)%, $(BUILD_OUTPUT)%, $(SJAVAC_SERVER_DIR))
JAVA_CMD:=$(BOOT_JDK)/bin/java JAVA_CMD:=$(BOOT_JDK)/bin/java

2
common/autoconf/buildjdk-spec.gmk.in
View File

@ -44,7 +44,6 @@ SYSROOT_LDFLAGS := @BUILD_SYSROOT_LDFLAGS@
# These directories should not be moved to BUILDJDK_OUTPUTDIR # These directories should not be moved to BUILDJDK_OUTPUTDIR
HOTSPOT_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(HOTSPOT_OUTPUTDIR)) HOTSPOT_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(HOTSPOT_OUTPUTDIR))
HOTSPOT_DIST := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(HOTSPOT_DIST))
SUPPORT_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(SUPPORT_OUTPUTDIR)) SUPPORT_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(SUPPORT_OUTPUTDIR))
JDK_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(JDK_OUTPUTDIR)) JDK_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(JDK_OUTPUTDIR))
IMAGES_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(IMAGES_OUTPUTDIR)) IMAGES_OUTPUTDIR := $(patsubst $(BUILD_OUTPUT)%,$(BUILDJDK_OUTPUTDIR)%,$(IMAGES_OUTPUTDIR))
@ -90,6 +89,7 @@ ENABLE_DEBUG_SYMBOLS := false
BUILD_GTEST := false BUILD_GTEST := false
JVM_VARIANTS := server JVM_VARIANTS := server
JVM_VARIANT_MAIN := server
# Some users still set EXTRA_*FLAGS on the make command line. Must # Some users still set EXTRA_*FLAGS on the make command line. Must
# make sure to override that when building buildjdk. # make sure to override that when building buildjdk.

25
common/autoconf/flags.m4
View File

@ -1163,19 +1163,18 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)" -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)"
if test "x$1" = "xTARGET"; then if test "x$1" = "xTARGET"; then
# On some platforms (mac) the linker warns about non existing -L dirs. # On some platforms (mac) the linker warns about non existing -L dirs.
# Add server first if available. Linking aginst client does not always produce the same results. # For any of the variants server, client or minimal, the dir matches the
# Only add client/minimal dir if client/minimal is being built. # variant name. The "main" variant should be used for linking. For the
# Default to server for other variants. # rest, the dir is just server.
if HOTSPOT_CHECK_JVM_VARIANT(server); then if HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) \
$2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server" || HOTSPOT_CHECK_JVM_VARIANT(minimal); then
elif HOTSPOT_CHECK_JVM_VARIANT(client); then $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
$2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/client" -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/$JVM_VARIANT_MAIN"
elif HOTSPOT_CHECK_JVM_VARIANT(minimal); then else
$2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/minimal" $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \
else -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server"
$2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server" fi
fi
elif test "x$1" = "xBUILD"; then elif test "x$1" = "xBUILD"; then
# When building a buildjdk, it's always only the server variant # When building a buildjdk, it's always only the server variant
$2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \ $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \

105
common/autoconf/generated-configure.sh
View File

@ -867,8 +867,6 @@ IMPORT_MODULES_CONF
IMPORT_MODULES_LIBS IMPORT_MODULES_LIBS
IMPORT_MODULES_CMDS IMPORT_MODULES_CMDS
IMPORT_MODULES_CLASSES IMPORT_MODULES_CLASSES
BUILD_HOTSPOT
HOTSPOT_DIST
BUILD_OUTPUT BUILD_OUTPUT
JDK_TOPDIR JDK_TOPDIR
NASHORN_TOPDIR NASHORN_TOPDIR
@ -961,6 +959,7 @@ CONF_NAME
SPEC SPEC
SDKROOT SDKROOT
XCODEBUILD XCODEBUILD
JVM_VARIANT_MAIN
VALID_JVM_VARIANTS VALID_JVM_VARIANTS
JVM_VARIANTS JVM_VARIANTS
DEBUG_LEVEL DEBUG_LEVEL
@ -2097,9 +2096,8 @@ Optional Packages:
compatibility and is ignored compatibility and is ignored
--with-override-jdk Deprecated. Option is kept for backwards --with-override-jdk Deprecated. Option is kept for backwards
compatibility and is ignored compatibility and is ignored
--with-import-hotspot import hotspot binaries from this jdk image or --with-import_hotspot Deprecated. Option is kept for backwards
hotspot build dist dir instead of building from compatibility and is ignored
source
--with-import-modules import a set of prebuilt modules either as a zip --with-import-modules import a set of prebuilt modules either as a zip
file or an exploded directory file or an exploded directory
--with-toolchain-type the toolchain type (or family) to use, use '--help' --with-toolchain-type the toolchain type (or family) to use, use '--help'
@ -5088,7 +5086,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1481104795 DATE_WHEN_GENERATED=1481663811
############################################################################### ###############################################################################
# #
@ -16750,6 +16748,21 @@ $as_echo "$as_me: Unknown variant(s) specified: $INVALID_VARIANTS" >&6;}
as_fn_error $? "You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS." "$LINENO" 5 as_fn_error $? "You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS." "$LINENO" 5
fi fi
# The "main" variant is the one used by other libs to link against during the
# build.
if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then
MAIN_VARIANT_PRIO_ORDER="server client minimal"
for variant in $MAIN_VARIANT_PRIO_ORDER; do
if [[ " $JVM_VARIANTS " =~ " $variant " ]] ; then
JVM_VARIANT_MAIN="$variant"
break
fi
done
else
JVM_VARIANT_MAIN="$JVM_VARIANTS"
fi
@ -30992,33 +31005,17 @@ fi
BUILD_OUTPUT="$OUTPUT_ROOT" BUILD_OUTPUT="$OUTPUT_ROOT"
JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
BUILD_HOTSPOT=true
# Check whether --with-import-hotspot was given. # Check whether --with-import_hotspot was given.
if test "${with_import_hotspot+set}" = set; then : if test "${with_import_hotspot+set}" = set; then :
withval=$with_import_hotspot; withval=$with_import_hotspot; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-import_hotspot is deprecated and will be ignored." >&5
$as_echo "$as_me: WARNING: Option --with-import_hotspot is deprecated and will be ignored." >&2;}
fi fi
if test "x$with_import_hotspot" != x; then
CURDIR="$PWD"
cd "$with_import_hotspot"
HOTSPOT_DIST="`pwd`"
cd "$CURDIR"
if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then
as_fn_error $? "You have to import hotspot from a full jdk image or hotspot build dist dir!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be imported" >&5
$as_echo_n "checking if hotspot should be imported... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes from $HOTSPOT_DIST" >&5
$as_echo "yes from $HOTSPOT_DIST" >&6; }
BUILD_HOTSPOT=false
fi
JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
@ -31189,6 +31186,12 @@ $as_echo "$as_me: The path of IMPORT_MODULES_TOPDIR, which resolves as \"$path\"
if test -d "$IMPORT_MODULES_TOPDIR/modules_conf"; then if test -d "$IMPORT_MODULES_TOPDIR/modules_conf"; then
IMPORT_MODULES_CONF="$IMPORT_MODULES_TOPDIR/modules_conf" IMPORT_MODULES_CONF="$IMPORT_MODULES_TOPDIR/modules_conf"
fi fi
if test -d "$IMPORT_MODULES_TOPDIR/modules_legal"; then
IMPORT_MODULES_LEGAL="$IMPORT_MODULES_TOPDIR/modules_legal"
fi
if test -d "$IMPORT_MODULES_TOPDIR/modules_man"; then
IMPORT_MODULES_MAN="$IMPORT_MODULES_TOPDIR/modules_man"
fi
if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then
IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src" IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src"
fi fi
@ -50382,19 +50385,18 @@ $as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLA
-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)" -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)"
if test "xTARGET" = "xTARGET"; then if test "xTARGET" = "xTARGET"; then
# On some platforms (mac) the linker warns about non existing -L dirs. # On some platforms (mac) the linker warns about non existing -L dirs.
# Add server first if available. Linking aginst client does not always produce the same results. # For any of the variants server, client or minimal, the dir matches the
# Only add client/minimal dir if client/minimal is being built. # variant name. The "main" variant should be used for linking. For the
# Default to server for other variants. # rest, the dir is just server.
if [[ " $JVM_VARIANTS " =~ " server " ]] ; then if [[ " $JVM_VARIANTS " =~ " server " ]] || [[ " $JVM_VARIANTS " =~ " client " ]] \
JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server" || [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then
elif [[ " $JVM_VARIANTS " =~ " client " ]] ; then JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \
JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/client" -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/$JVM_VARIANT_MAIN"
elif [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then else
JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/minimal" JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \
else -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server"
JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server" fi
fi
elif test "xTARGET" = "xBUILD"; then elif test "xTARGET" = "xBUILD"; then
# When building a buildjdk, it's always only the server variant # When building a buildjdk, it's always only the server variant
JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \ JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \
@ -51205,19 +51207,18 @@ $as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLA
-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)" -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)"
if test "xBUILD" = "xTARGET"; then if test "xBUILD" = "xTARGET"; then
# On some platforms (mac) the linker warns about non existing -L dirs. # On some platforms (mac) the linker warns about non existing -L dirs.
# Add server first if available. Linking aginst client does not always produce the same results. # For any of the variants server, client or minimal, the dir matches the
# Only add client/minimal dir if client/minimal is being built. # variant name. The "main" variant should be used for linking. For the
# Default to server for other variants. # rest, the dir is just server.
if [[ " $JVM_VARIANTS " =~ " server " ]] ; then if [[ " $JVM_VARIANTS " =~ " server " ]] || [[ " $JVM_VARIANTS " =~ " client " ]] \
OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server" || [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then
elif [[ " $JVM_VARIANTS " =~ " client " ]] ; then OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \
OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/client" -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/$JVM_VARIANT_MAIN"
elif [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then else
OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/minimal" OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \
else -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server"
OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server" fi
fi
elif test "xBUILD" = "xBUILD"; then elif test "xBUILD" = "xBUILD"; then
# When building a buildjdk, it's always only the server variant # When building a buildjdk, it's always only the server variant
OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \ OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \

15
common/autoconf/hotspot.m4
View File

@ -111,8 +111,23 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_VARIANTS],
AC_MSG_ERROR([You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS.]) AC_MSG_ERROR([You cannot build multiple variants with anything else than $VALID_MULTIPLE_JVM_VARIANTS.])
fi fi
# The "main" variant is the one used by other libs to link against during the
# build.
if test "x$BUILDING_MULTIPLE_JVM_VARIANTS" = "xtrue"; then
MAIN_VARIANT_PRIO_ORDER="server client minimal"
for variant in $MAIN_VARIANT_PRIO_ORDER; do
if HOTSPOT_CHECK_JVM_VARIANT($variant); then
JVM_VARIANT_MAIN="$variant"
break
fi
done
else
JVM_VARIANT_MAIN="$JVM_VARIANTS"
fi
AC_SUBST(JVM_VARIANTS) AC_SUBST(JVM_VARIANTS)
AC_SUBST(VALID_JVM_VARIANTS) AC_SUBST(VALID_JVM_VARIANTS)
AC_SUBST(JVM_VARIANT_MAIN)
if HOTSPOT_CHECK_JVM_VARIANT(zero) || HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then if HOTSPOT_CHECK_JVM_VARIANT(zero) || HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then
# zero behaves as a platform and rewrites these values. This is really weird. :( # zero behaves as a platform and rewrites these values. This is really weird. :(

28
common/autoconf/source-dirs.m4
View File

@ -62,27 +62,9 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_OUTPUT_DIRS],
[ [
BUILD_OUTPUT="$OUTPUT_ROOT" BUILD_OUTPUT="$OUTPUT_ROOT"
AC_SUBST(BUILD_OUTPUT) AC_SUBST(BUILD_OUTPUT)
HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
BUILD_HOTSPOT=true
AC_SUBST(HOTSPOT_DIST)
AC_SUBST(BUILD_HOTSPOT)
AC_ARG_WITH(import-hotspot, [AS_HELP_STRING([--with-import-hotspot],
[import hotspot binaries from this jdk image or hotspot build dist dir instead of building from source])])
if test "x$with_import_hotspot" != x; then
CURDIR="$PWD"
cd "$with_import_hotspot"
HOTSPOT_DIST="`pwd`"
cd "$CURDIR"
if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then
AC_MSG_ERROR([You have to import hotspot from a full jdk image or hotspot build dist dir!])
fi
AC_MSG_CHECKING([if hotspot should be imported])
AC_MSG_RESULT([yes from $HOTSPOT_DIST])
BUILD_HOTSPOT=false
fi
JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk" JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
BASIC_DEPRECATED_ARG_WITH(import_hotspot)
]) ])
################################################################################ ################################################################################
@ -123,6 +105,12 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_IMPORT_MODULES],
if test -d "$IMPORT_MODULES_TOPDIR/modules_conf"; then if test -d "$IMPORT_MODULES_TOPDIR/modules_conf"; then
IMPORT_MODULES_CONF="$IMPORT_MODULES_TOPDIR/modules_conf" IMPORT_MODULES_CONF="$IMPORT_MODULES_TOPDIR/modules_conf"
fi fi
if test -d "$IMPORT_MODULES_TOPDIR/modules_legal"; then
IMPORT_MODULES_LEGAL="$IMPORT_MODULES_TOPDIR/modules_legal"
fi
if test -d "$IMPORT_MODULES_TOPDIR/modules_man"; then
IMPORT_MODULES_MAN="$IMPORT_MODULES_TOPDIR/modules_man"
fi
if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then
IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src" IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src"
fi fi

5
common/autoconf/spec.gmk.in
View File

@ -145,6 +145,8 @@ IMPORT_MODULES_CLASSES:=@IMPORT_MODULES_CLASSES@
IMPORT_MODULES_CMDS:=@IMPORT_MODULES_CMDS@ IMPORT_MODULES_CMDS:=@IMPORT_MODULES_CMDS@
IMPORT_MODULES_LIBS:=@IMPORT_MODULES_LIBS@ IMPORT_MODULES_LIBS:=@IMPORT_MODULES_LIBS@
IMPORT_MODULES_CONF:=@IMPORT_MODULES_CONF@ IMPORT_MODULES_CONF:=@IMPORT_MODULES_CONF@
IMPORT_MODULES_LEGAL:=@IMPORT_MODULES_LEGAL@
IMPORT_MODULES_MAN:=@IMPORT_MODULES_MAN@
IMPORT_MODULES_SRC:=@IMPORT_MODULES_SRC@ IMPORT_MODULES_SRC:=@IMPORT_MODULES_SRC@
IMPORT_MODULES_MAKE:=@IMPORT_MODULES_MAKE@ IMPORT_MODULES_MAKE:=@IMPORT_MODULES_MAKE@
@ -220,6 +222,7 @@ JDK_VARIANT:=@JDK_VARIANT@
# Which JVM variants to build (space-separated list) # Which JVM variants to build (space-separated list)
JVM_VARIANTS := @JVM_VARIANTS@ JVM_VARIANTS := @JVM_VARIANTS@
JVM_VARIANT_MAIN := @JVM_VARIANT_MAIN@
# Lists of features per variant. Only relevant for the variants listed in # Lists of features per variant. Only relevant for the variants listed in
# JVM_VARIANTS. # JVM_VARIANTS.
@ -273,8 +276,6 @@ JAVADOC_OUTPUTDIR = $(DOCS_IMAGE_DIR)
CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@ CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@
BUILDJDK_OUTPUTDIR=$(BUILD_OUTPUT)/buildjdk BUILDJDK_OUTPUTDIR=$(BUILD_OUTPUT)/buildjdk
HOTSPOT_DIST=@HOTSPOT_DIST@
BUILD_HOTSPOT=@BUILD_HOTSPOT@ BUILD_HOTSPOT=@BUILD_HOTSPOT@
BUILD_FAILURE_HANDLER := @BUILD_FAILURE_HANDLER@ BUILD_FAILURE_HANDLER := @BUILD_FAILURE_HANDLER@

55
common/bin/compare.sh
View File

@ -509,30 +509,32 @@ compare_zip_file() {
| $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g") | $CUT -f 2 -d ' ' | $SED "s|$OTHER_UNZIPDIR/||g")
fi fi
$RM -f $WORK_DIR/$ZIP_FILE.diffs if [ "$CMP_ZIPS_CONTENTS" = "true" ]; then
for file in $DIFFING_FILES; do $RM -f $WORK_DIR/$ZIP_FILE.diffs
if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then for file in $DIFFING_FILES; do
diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs if [[ "$ACCEPTED_JARZIP_CONTENTS $EXCEPTIONS" != *"$file"* ]]; then
fi diff_text $OTHER_UNZIPDIR/$file $THIS_UNZIPDIR/$file >> $WORK_DIR/$ZIP_FILE.diffs
done fi
done
if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then if [ -s "$WORK_DIR/$ZIP_FILE.diffs" ]; then
return_value=1 return_value=1
echo " Differing files in $ZIP_FILE" echo " Differing files in $ZIP_FILE"
$CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP 'differ$' | cut -f 2 -d ' ' | \ $CAT $WORK_DIR/$ZIP_FILE.diffs | $GREP 'differ$' | cut -f 2 -d ' ' | \
$SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist $SED "s|$OTHER_UNZIPDIR| |g" > $WORK_DIR/$ZIP_FILE.difflist
$CAT $WORK_DIR/$ZIP_FILE.difflist $CAT $WORK_DIR/$ZIP_FILE.difflist
if [ -n "$SHOW_DIFFS" ]; then if [ -n "$SHOW_DIFFS" ]; then
for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do for i in $(cat $WORK_DIR/$ZIP_FILE.difflist) ; do
if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then if [ -f "${OTHER_UNZIPDIR}/$i.javap" ]; then
LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.javap ${THIS_UNZIPDIR}/$i.javap
elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then elif [ -f "${OTHER_UNZIPDIR}/$i.cleaned" ]; then
LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i.cleaned ${THIS_UNZIPDIR}/$i
else else
LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i LC_ALL=C $DIFF ${OTHER_UNZIPDIR}/$i ${THIS_UNZIPDIR}/$i
fi fi
done done
fi
fi fi
fi fi
@ -1072,7 +1074,8 @@ if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1
echo "-perms Compare the permission bits on all files and directories" echo "-perms Compare the permission bits on all files and directories"
echo "-types Compare the output of the file command on all files" echo "-types Compare the output of the file command on all files"
echo "-general Compare the files not convered by the specialized comparisons" echo "-general Compare the files not convered by the specialized comparisons"
echo "-zips Compare the contents of all zip files" echo "-zips Compare the contents of all zip files and files in them"
echo "-zips-names Compare the file names inside all zip files"
echo "-jars Compare the contents of all jar files" echo "-jars Compare the contents of all jar files"
echo "-libs Compare all native libraries" echo "-libs Compare all native libraries"
echo "-execs Compare all executables" echo "-execs Compare all executables"
@ -1100,6 +1103,7 @@ CMP_PERMS=false
CMP_TYPES=false CMP_TYPES=false
CMP_GENERAL=false CMP_GENERAL=false
CMP_ZIPS=false CMP_ZIPS=false
CMP_ZIPS_CONTENTS=true
CMP_JARS=false CMP_JARS=false
CMP_LIBS=false CMP_LIBS=false
CMP_EXECS=false CMP_EXECS=false
@ -1143,6 +1147,11 @@ while [ -n "$1" ]; do
;; ;;
-zips) -zips)
CMP_ZIPS=true CMP_ZIPS=true
CMP_ZIPS_CONTENTS=true
;;
-zips-names)
CMP_ZIPS=true
CMP_ZIPS_CONTENTS=false
;; ;;
-jars) -jars)
CMP_JARS=true CMP_JARS=true

94
common/bin/unshuffle_list.txt
View File

@ -1266,33 +1266,33 @@ jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp : jdk/src/share/native/s
jdk/src/jdk.crypto.ec/share/native/libsunec/impl : jdk/src/share/native/sun/security/ec/impl jdk/src/jdk.crypto.ec/share/native/libsunec/impl : jdk/src/share/native/sun/security/ec/impl
jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi : jdk/src/windows/classes/sun/security/mscapi jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi : jdk/src/windows/classes/sun/security/mscapi
jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi : jdk/src/windows/native/sun/security/mscapi jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi : jdk/src/windows/native/sun/security/mscapi
jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11 : jdk/src/share/classes/sun/security/pkcs11 jdk/src/jdk.crypto.token/share/classes/sun/security/pkcs11 : jdk/src/share/classes/sun/security/pkcs11
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c : jdk/src/share/native/sun/security/pkcs11/j2secmod.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c : jdk/src/share/native/sun/security/pkcs11/j2secmod.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.h : jdk/src/share/native/sun/security/pkcs11/j2secmod.h jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.h : jdk/src/share/native/sun/security/pkcs11/j2secmod.h
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11f.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11f.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11t.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11t.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs-11v2-20a3.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs-11v2-20a3.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h
jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/pkcs11wrapper.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h jdk/src/jdk.crypto.token/share/native/libj2pkcs11/pkcs11wrapper.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.h : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.h : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.h : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.h : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h
jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h
jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c
jdk/src/jdk.crypto.pkcs11/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h jdk/src/jdk.crypto.token/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
jdk/src/java.desktop/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m jdk/src/java.desktop/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m
jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m
jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof
@ -1427,26 +1427,26 @@ jdk/src/jdk.naming.dns/share/classes/META-INF/services : jdk/src/share/classes/s
jdk/src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns : jdk/src/share/classes/sun/net/spi/nameservice/dns jdk/src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns : jdk/src/share/classes/sun/net/spi/nameservice/dns
jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry : jdk/src/share/classes/com/sun/jndi/rmi/registry jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry : jdk/src/share/classes/com/sun/jndi/rmi/registry
jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi : jdk/src/share/classes/com/sun/jndi/url/rmi jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi : jdk/src/share/classes/com/sun/jndi/url/rmi
jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp jdk/src/jdk.pack/share/native/common-unpack/bands.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp
jdk/src/jdk.pack200/share/native/common-unpack/bands.h : jdk/src/share/native/com/sun/java/util/jar/pack/bands.h jdk/src/jdk.pack/share/native/common-unpack/bands.h : jdk/src/share/native/com/sun/java/util/jar/pack/bands.h
jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp jdk/src/jdk.pack/share/native/common-unpack/bytes.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp
jdk/src/jdk.pack200/share/native/common-unpack/bytes.h : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h jdk/src/jdk.pack/share/native/common-unpack/bytes.h : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp jdk/src/jdk.pack/share/native/common-unpack/coding.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp
jdk/src/jdk.pack200/share/native/common-unpack/coding.h : jdk/src/share/native/com/sun/java/util/jar/pack/coding.h jdk/src/jdk.pack/share/native/common-unpack/coding.h : jdk/src/share/native/com/sun/java/util/jar/pack/coding.h
jdk/src/jdk.pack200/share/native/common-unpack/constants.h : jdk/src/share/native/com/sun/java/util/jar/pack/constants.h jdk/src/jdk.pack/share/native/common-unpack/constants.h : jdk/src/share/native/com/sun/java/util/jar/pack/constants.h
jdk/src/jdk.pack200/share/native/common-unpack/defines.h : jdk/src/share/native/com/sun/java/util/jar/pack/defines.h jdk/src/jdk.pack/share/native/common-unpack/defines.h : jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp jdk/src/jdk.pack/share/native/common-unpack/unpack.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
jdk/src/jdk.pack200/share/native/common-unpack/unpack.h : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h jdk/src/jdk.pack/share/native/common-unpack/unpack.h : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp jdk/src/jdk.pack/share/native/common-unpack/utils.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
jdk/src/jdk.pack200/share/native/common-unpack/utils.h : jdk/src/share/native/com/sun/java/util/jar/pack/utils.h jdk/src/jdk.pack/share/native/common-unpack/utils.h : jdk/src/share/native/com/sun/java/util/jar/pack/utils.h
jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp jdk/src/jdk.pack/share/native/common-unpack/zip.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
jdk/src/jdk.pack200/share/native/common-unpack/zip.h : jdk/src/share/native/com/sun/java/util/jar/pack/zip.h jdk/src/jdk.pack/share/native/common-unpack/zip.h : jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
jdk/src/jdk.pack200/share/native/libjsdt : jdk/src/share/native/sun/tracing/dtrace jdk/src/jdk.pack/share/native/libjsdt : jdk/src/share/native/sun/tracing/dtrace
jdk/src/jdk.pack200/share/native/libunpack/jni.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp jdk/src/jdk.pack/share/native/libunpack/jni.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
jdk/src/jdk.pack200/share/native/unpack200/main.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp jdk/src/jdk.pack/share/native/unpack200/main.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
jdk/src/jdk.pack200/unix/native/libjsdt/jvm_symbols_md.c : jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c jdk/src/jdk.pack/unix/native/libjsdt/jvm_symbols_md.c : jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c
jdk/src/jdk.pack200/windows/native/libjsdt/jvm_symbols_md.c : jdk/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c jdk/src/jdk.pack/windows/native/libjsdt/jvm_symbols_md.c : jdk/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c
jdk/src/jdk.pack200/windows/native/unpack200/unpack200_proto.exe.manifest : jdk/src/windows/resource/unpack200_proto.exe.manifest jdk/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest : jdk/src/windows/resource/unpack200_proto.exe.manifest
jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool : jdk/src/share/classes/sun/security/tools/policytool jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool : jdk/src/share/classes/sun/security/tools/policytool
jdk/src/jdk.rmic/share/classes/sun/rmi/rmic : jdk/src/share/classes/sun/rmi/rmic jdk/src/jdk.rmic/share/classes/sun/rmi/rmic : jdk/src/share/classes/sun/rmi/rmic
jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic : jdk/src/share/classes/sun/rmi/rmic/newrmic jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic : jdk/src/share/classes/sun/rmi/rmic/newrmic

208
common/nb_native/nbproject/configurations.xml
View File

@ -2166,7 +2166,7 @@
</df> </df>
</df> </df>
</df> </df>
<df name="jdk.crypto.pkcs11"> <df name="jdk.crypto.token">
<df name="share"> <df name="share">
<df name="native"> <df name="native">
<df name="libj2pkcs11"> <df name="libj2pkcs11">
@ -2318,7 +2318,7 @@
</df> </df>
</df> </df>
</df> </df>
<df name="jdk.pack200"> <df name="jdk.pack">
<df name="share"> <df name="share">
<df name="native"> <df name="native">
<df name="common-unpack"> <df name="common-unpack">
@ -29422,35 +29422,35 @@
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="2"> flavor2="2">
@ -29460,63 +29460,63 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c" <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
<cTool flags="5"> <cTool flags="5">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c" <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="3"> flavor2="3">
@ -30022,12 +30022,12 @@
<cTool flags="2"> <cTool flags="2">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/bands.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="4"> flavor2="4">
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/bytes.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="4"> flavor2="4">
@ -30037,7 +30037,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/coding.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="4"> flavor2="4">
@ -30047,7 +30047,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/unpack.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="4"> flavor2="4">
@ -30057,7 +30057,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/utils.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="4"> flavor2="4">
@ -30067,7 +30067,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/zip.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="4"> flavor2="4">
@ -30077,12 +30077,12 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/libunpack/jni.cpp" <item path="../../jdk/src/jdk.pack/share/native/libunpack/jni.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="4"> flavor2="4">
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/unpack200/main.cpp" <item path="../../jdk/src/jdk.pack/share/native/unpack200/main.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="4"> flavor2="4">
@ -31752,7 +31752,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.pkcs11"> <folder path="0/jdk/src/jdk.crypto.token">
<cTool> <cTool>
<incDir> <incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
@ -31760,10 +31760,10 @@
<pElem>../../jdk/src/java.base/unix/native/include</pElem> <pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11</pElem> <pElem>../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11</pElem> <pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/java.base/macosx/native/libjava</pElem> <pElem>../../jdk/src/java.base/macosx/native/libjava</pElem>
<pElem>../../build/support/headers/jdk.crypto.pkcs11</pElem> <pElem>../../build/support/headers/jdk.crypto.token</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
<preprocessorList> <preprocessorList>
@ -31772,7 +31772,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.pkcs11/unix"> <folder path="0/jdk/src/jdk.crypto.token/unix">
<cTool> <cTool>
<preprocessorList> <preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem> <Elem>THIS_FILE="j2secmod_md.c"</Elem>
@ -31899,7 +31899,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200"> <folder path="0/jdk/src/jdk.pack">
<ccTool> <ccTool>
<preprocessorList> <preprocessorList>
<Elem>DEBUG</Elem> <Elem>DEBUG</Elem>
@ -31908,7 +31908,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200/share/native/common-unpack"> <folder path="0/jdk/src/jdk.pack/share/native/common-unpack">
<ccTool> <ccTool>
<incDir> <incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
@ -31917,7 +31917,7 @@
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../build/support/headers/java.base</pElem> <pElem>../../build/support/headers/java.base</pElem>
<pElem>../../jdk/src/jdk.pack200/share/native/common-unpack</pElem> <pElem>../../jdk/src/jdk.pack/share/native/common-unpack</pElem>
<pElem>../../jdk/src/java.base/macosx/native/libjava</pElem> <pElem>../../jdk/src/java.base/macosx/native/libjava</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
@ -31927,7 +31927,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200/share/native/libunpack"> <folder path="0/jdk/src/jdk.pack/share/native/libunpack">
<ccTool> <ccTool>
<incDir> <incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
@ -31936,7 +31936,7 @@
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../build/support/headers/java.base</pElem> <pElem>../../build/support/headers/java.base</pElem>
<pElem>../../jdk/src/jdk.pack200/share/native/common-unpack</pElem> <pElem>../../jdk/src/jdk.pack/share/native/common-unpack</pElem>
<pElem>../../jdk/src/java.base/macosx/native/libjava</pElem> <pElem>../../jdk/src/java.base/macosx/native/libjava</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
@ -31947,10 +31947,10 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200/share/native/unpack200"> <folder path="0/jdk/src/jdk.pack/share/native/unpack200">
<ccTool> <ccTool>
<incDir> <incDir>
<pElem>../../jdk/src/jdk.pack200/share/native/common-unpack</pElem> <pElem>../../jdk/src/jdk.pack/share/native/common-unpack</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
@ -44741,14 +44741,14 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
<cTool flags="4"> <cTool flags="4">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44758,7 +44758,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44768,7 +44768,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44778,7 +44778,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44788,7 +44788,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44798,7 +44798,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44808,7 +44808,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44818,7 +44818,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44828,7 +44828,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44838,7 +44838,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44848,7 +44848,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -44858,14 +44858,14 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c" <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
<cTool flags="4"> <cTool flags="4">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c" <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -45364,14 +45364,14 @@
<cTool flags="4"> <cTool flags="4">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/bands.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
<ccTool flags="2"> <ccTool flags="2">
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/bytes.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -45381,7 +45381,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/coding.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -45391,7 +45391,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/unpack.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -45401,7 +45401,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/utils.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -45411,7 +45411,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/zip.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -45421,14 +45421,14 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/libunpack/jni.cpp" <item path="../../jdk/src/jdk.pack/share/native/libunpack/jni.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
<ccTool flags="2"> <ccTool flags="2">
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/unpack200/main.cpp" <item path="../../jdk/src/jdk.pack/share/native/unpack200/main.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -47795,7 +47795,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.pkcs11"> <folder path="0/jdk/src/jdk.crypto.token">
<cTool> <cTool>
<incDir> <incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
@ -47803,10 +47803,10 @@
<pElem>../../jdk/src/java.base/unix/native/include</pElem> <pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11</pElem> <pElem>../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11</pElem> <pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../build/support/headers/jdk.crypto.pkcs11</pElem> <pElem>../../build/support/headers/jdk.crypto.token</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
<preprocessorList> <preprocessorList>
@ -47815,7 +47815,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.pkcs11/unix"> <folder path="0/jdk/src/jdk.crypto.token/unix">
<cTool> <cTool>
<preprocessorList> <preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem> <Elem>THIS_FILE="j2secmod_md.c"</Elem>
@ -47942,7 +47942,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200"> <folder path="0/jdk/src/jdk.pack">
<ccTool> <ccTool>
<preprocessorList> <preprocessorList>
<Elem>DEBUG</Elem> <Elem>DEBUG</Elem>
@ -47951,7 +47951,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200/share/native/common-unpack"> <folder path="0/jdk/src/jdk.pack/share/native/common-unpack">
<ccTool> <ccTool>
<incDir> <incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
@ -47960,7 +47960,7 @@
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../build/support/headers/java.base</pElem> <pElem>../../build/support/headers/java.base</pElem>
<pElem>../../jdk/src/jdk.pack200/share/native/common-unpack</pElem> <pElem>../../jdk/src/jdk.pack/share/native/common-unpack</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
@ -47970,7 +47970,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200/share/native/libunpack"> <folder path="0/jdk/src/jdk.pack/share/native/libunpack">
<ccTool> <ccTool>
<incDir> <incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
@ -47979,7 +47979,7 @@
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../build/support/headers/java.base</pElem> <pElem>../../build/support/headers/java.base</pElem>
<pElem>../../jdk/src/jdk.pack200/share/native/common-unpack</pElem> <pElem>../../jdk/src/jdk.pack/share/native/common-unpack</pElem>
<pElem>../../jdk/src/java.base/linux/native/libjava</pElem> <pElem>../../jdk/src/java.base/linux/native/libjava</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
@ -47990,10 +47990,10 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200/share/native/unpack200"> <folder path="0/jdk/src/jdk.pack/share/native/unpack200">
<ccTool> <ccTool>
<incDir> <incDir>
<pElem>../../jdk/src/jdk.pack200/share/native/common-unpack</pElem> <pElem>../../jdk/src/jdk.pack/share/native/common-unpack</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem> <pElem>../../jdk/src/java.base/share/native/libzip/zlib-1.2.8</pElem>
@ -62728,14 +62728,14 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/j2secmod.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/j2secmod.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
<cTool flags="2"> <cTool flags="2">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_convert.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62745,7 +62745,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_crypt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_crypt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62755,7 +62755,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_digest.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_digest.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62765,7 +62765,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_dual.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_dual.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62775,7 +62775,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_general.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_general.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62785,7 +62785,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_keymgmt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_keymgmt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62795,7 +62795,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_mutex.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_mutex.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62805,7 +62805,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_objmgmt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_objmgmt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62815,7 +62815,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sessmgmt.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sessmgmt.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62825,7 +62825,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_sign.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_sign.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62835,7 +62835,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_util.c" <item path="../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11/p11_util.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -62845,14 +62845,14 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/j2secmod_md.c" <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/j2secmod_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
<cTool flags="2"> <cTool flags="2">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11/p11_md.c" <item path="../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11/p11_md.c"
ex="false" ex="false"
tool="0" tool="0"
flavor2="0"> flavor2="0">
@ -63395,14 +63395,14 @@
<cTool flags="2"> <cTool flags="2">
</cTool> </cTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/bands.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/bands.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
<ccTool flags="0"> <ccTool flags="0">
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/bytes.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/bytes.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -63412,7 +63412,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/coding.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/coding.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -63422,7 +63422,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/unpack.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -63432,7 +63432,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/utils.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -63442,7 +63442,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp" <item path="../../jdk/src/jdk.pack/share/native/common-unpack/zip.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -63452,14 +63452,14 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/libunpack/jni.cpp" <item path="../../jdk/src/jdk.pack/share/native/libunpack/jni.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
<ccTool flags="0"> <ccTool flags="0">
</ccTool> </ccTool>
</item> </item>
<item path="../../jdk/src/jdk.pack200/share/native/unpack200/main.cpp" <item path="../../jdk/src/jdk.pack/share/native/unpack200/main.cpp"
ex="false" ex="false"
tool="1" tool="1"
flavor2="0"> flavor2="0">
@ -66281,7 +66281,7 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.pkcs11"> <folder path="0/jdk/src/jdk.crypto.token">
<cTool> <cTool>
<incDir> <incDir>
<pElem>../../jdk/src/java.base/share/native/include</pElem> <pElem>../../jdk/src/java.base/share/native/include</pElem>
@ -66289,10 +66289,10 @@
<pElem>../../jdk/src/java.base/unix/native/include</pElem> <pElem>../../jdk/src/java.base/unix/native/include</pElem>
<pElem>../../jdk/src/java.base/share/native/libjava</pElem> <pElem>../../jdk/src/java.base/share/native/libjava</pElem>
<pElem>../../jdk/src/java.base/unix/native/libjava</pElem> <pElem>../../jdk/src/java.base/unix/native/libjava</pElem>
<pElem>../../jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11</pElem> <pElem>../../jdk/src/jdk.crypto.token/share/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/jdk.crypto.pkcs11/unix/native/libj2pkcs11</pElem> <pElem>../../jdk/src/jdk.crypto.token/unix/native/libj2pkcs11</pElem>
<pElem>../../jdk/src/java.base/solaris/native/libjava</pElem> <pElem>../../jdk/src/java.base/solaris/native/libjava</pElem>
<pElem>../../build/support/headers/jdk.crypto.pkcs11</pElem> <pElem>../../build/support/headers/jdk.crypto.token</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
<preprocessorList> <preprocessorList>
@ -66301,7 +66301,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.crypto.pkcs11/unix"> <folder path="0/jdk/src/jdk.crypto.token/unix">
<cTool> <cTool>
<preprocessorList> <preprocessorList>
<Elem>THIS_FILE="j2secmod_md.c"</Elem> <Elem>THIS_FILE="j2secmod_md.c"</Elem>
@ -66462,7 +66462,7 @@
</preprocessorList> </preprocessorList>
</cTool> </cTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200"> <folder path="0/jdk/src/jdk.pack">
<ccTool> <ccTool>
<preprocessorList> <preprocessorList>
<Elem>DEBUG</Elem> <Elem>DEBUG</Elem>
@ -66471,11 +66471,11 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200/share/native/common-unpack"> <folder path="0/jdk/src/jdk.pack/share/native/common-unpack">
<ccTool> <ccTool>
<incDir> <incDir>
<pElem>../../build/support/headers/java.base</pElem> <pElem>../../build/support/headers/java.base</pElem>
<pElem>../../jdk/src/jdk.pack200/share/native/common-unpack</pElem> <pElem>../../jdk/src/jdk.pack/share/native/common-unpack</pElem>
<pElem>../../jdk/src/java.base/solaris/native/libjava</pElem> <pElem>../../jdk/src/java.base/solaris/native/libjava</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
@ -66485,11 +66485,11 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200/share/native/libunpack"> <folder path="0/jdk/src/jdk.pack/share/native/libunpack">
<ccTool> <ccTool>
<incDir> <incDir>
<pElem>../../build/support/headers/java.base</pElem> <pElem>../../build/support/headers/java.base</pElem>
<pElem>../../jdk/src/jdk.pack200/share/native/common-unpack</pElem> <pElem>../../jdk/src/jdk.pack/share/native/common-unpack</pElem>
<pElem>../../jdk/src/java.base/solaris/native/libjava</pElem> <pElem>../../jdk/src/java.base/solaris/native/libjava</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
@ -66500,10 +66500,10 @@
</preprocessorList> </preprocessorList>
</ccTool> </ccTool>
</folder> </folder>
<folder path="0/jdk/src/jdk.pack200/share/native/unpack200"> <folder path="0/jdk/src/jdk.pack/share/native/unpack200">
<ccTool> <ccTool>
<incDir> <incDir>
<pElem>../../jdk/src/jdk.pack200/share/native/common-unpack</pElem> <pElem>../../jdk/src/jdk.pack/share/native/common-unpack</pElem>
<pElem>../../make</pElem> <pElem>../../make</pElem>
</incDir> </incDir>
<preprocessorList> <preprocessorList>

121
make/Bundles.gmk
View File

@ -43,16 +43,21 @@ endif
$(eval $(call IncludeCustomExtension, , Bundles-pre.gmk)) $(eval $(call IncludeCustomExtension, , Bundles-pre.gmk))
################################################################################ ################################################################################
# BUNDLE : Name of bundle to create # BUNDLE : Name of bundle to create
# FILES : Files in BASE_DIR to add to bundle # FILES : Files in BASE_DIRS to add to bundle
# SPECIAL_INCLUDES : List of directories inside BASE_DIR to look for additional # SPECIAL_INCLUDES : List of directories inside BASE_DIRS to look for additional
# files in. These files will not get proper dependency handling. Use when # files in. These files will not get proper dependency handling. Use when
# files or directories may contain spaces. # files or directories may contain spaces.
# BASE_DIR : Base directory for the root dir in the bundle. # BASE_DIRS : Base directories for the root dir in the bundle.
# SUBDIR : Optional name of root dir in bundle. # SUBDIR : Optional name of root dir in bundle.
SetupBundleFile = $(NamedParamsMacroTemplate) SetupBundleFile = $(NamedParamsMacroTemplate)
define SetupBundleFileBody define SetupBundleFileBody
$1_RELATIVE_FILES := $$(patsubst $$($1_BASE_DIR)/%, %, $$($1_FILES)) $$(foreach d, $$($1_BASE_DIRS), \
$$(eval $1_$$d_RELATIVE_FILES := $$$$(patsubst $$d/%, %, \
$$$$(filter $$d/%, $$$$($1_FILES)))) \
$$(eval $1_$$d_LIST_FILE := \
$(SUPPORT_OUTPUTDIR)/bundles/_$1_$$$$(subst /,_,$$$$(patsubst $(TOPDIR)/%,%,$$d)_files)) \
)
ifneq ($$(filter %.tar.gz, $$($1_BUNDLE_NAME)), ) ifneq ($$(filter %.tar.gz, $$($1_BUNDLE_NAME)), )
$1_TYPE := tar.gz $1_TYPE := tar.gz
@ -65,55 +70,65 @@ define SetupBundleFileBody
$$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false) $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false)
$(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES) $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
$$(eval $$(call ListPathsSafely, \ $$(foreach d, $$($1_BASE_DIRS), \
$1_RELATIVE_FILES, \ $$(eval $$(call ListPathsSafely, \
$(SUPPORT_OUTPUTDIR)/bundles/_$1_files)) $1_$$d_RELATIVE_FILES, $$($1_$$d_LIST_FILE))) \
)
$$(call MakeDir, $$(@D)) $$(call MakeDir, $$(@D))
ifneq ($$($1_SPECIAL_INCLUDES), ) ifneq ($$($1_SPECIAL_INCLUDES), )
$$(foreach i, $$($1_SPECIAL_INCLUDES), \ $$(foreach i, $$($1_SPECIAL_INCLUDES), \
($(CD) $$($1_BASE_DIR) && $(FIND) $$i \ $$(foreach d, $$d, \
>> $(SUPPORT_OUTPUTDIR)/bundles/_$1_files ) ; ) ($(CD) $$d && $(FIND) $$i \
>> $(SUPPORT_OUTPUTDIR)/bundles/_$1_files ) ; ))
endif endif
ifneq ($$($1_SUBDIR), ) ifeq ($$($1_SUBDIR)-$$($1_TYPE)-$$($1_UNZIP_DEBUGINFO), .-zip-false)
ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO), tar.gz-true-false) # If no subdir is specified, zip can be done directly from BASE_DIRS.
$(CD) $$($1_BASE_DIR) \ $$(foreach d, $$($1_BASE_DIRS), \
&& ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \ ( $(CD) $$d \
-$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \ && $(ZIPEXE) -qru $$@ . -i@$$($1_$$d_LIST_FILE) \
--transform 's|^|$$($1_SUBDIR)/|' $(TAR_IGNORE_EXIT_VALUE) ) \ || test "$$$$?" = "12" )$$(NEWLINE))
| $(GZIP) > $$@ else ifeq ($$($1_SUBDIR)-$$($1_TYPE)-$$($1_UNZIP_DEBUGINFO)-$$(words $$($1_BASE_DIRS)), \
else .-tar.gz-false-1)
# If a subdir has been specified, copy all files into a temporary # If no subdir is specified and only one BASE_DIR, tar.gz can be done
# location with this subdir before creating the tar file # directly from BASE_DIR.
$(RM) -r $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) $(CD) $$($1_BASE_DIRS) \
$(MKDIR) -p $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
( $(CD) $$($1_BASE_DIR) \ -$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
&& $(TAR) cf - -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \ $(TAR_IGNORE_EXIT_VALUE) ) \
$(TAR_IGNORE_EXIT_VALUE) ) \ | $(GZIP) > $$@
| ( $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) && $(TAR) xf - ) else ifeq ($$($1_TYPE)-$(TAR_SUPPORTS_TRANSFORM)-$$($1_UNZIP_DEBUGINFO)-$$(words $$($1_BASE_DIRS)), \
# Unzip any zipped debuginfo files tar.gz-true-false-1)
ifeq ($$($1_UNZIP_DEBUGINFO), true) # If only one BASE_DIR, but with a SUBDIR set, tar.gz can use the
for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.diz"`; do \ # transform option to create bundle directly from the BASE_DIR.
$(CD) $$$${f%/*} && $(UNZIP) -q $$$${f} && $(RM) $$$${f}; \ $(CD) $$($1_BASE_DIRS) \
done && ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
endif -$(TAR_INCLUDE_PARAM) $$($1_$$($1_BASE_DIRS)_LIST_FILE) \
ifeq ($$($1_TYPE), tar.gz) $$(if $$($1_SUBDIR), --transform 's|^|$$($1_SUBDIR)/|') \
$(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \ $(TAR_IGNORE_EXIT_VALUE) ) \
( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) $$($1_SUBDIR) $(TAR_IGNORE_EXIT_VALUE) ) \ | $(GZIP) > $$@
| $(GZIP) > $$@
else ifeq ($$($1_TYPE), zip)
$(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIPEXE) -qr $$@ .
endif
endif
else else
# In all other cases, need to copy all files into a temporary location
# before creation bundle.
$(RM) -r $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR)
$(MKDIR) -p $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR)
$$(foreach d, $$($1_BASE_DIRS), \
( $(CD) $$d \
&& $(TAR) cf - -$(TAR_INCLUDE_PARAM) $$($1_$$d_LIST_FILE) \
$(TAR_IGNORE_EXIT_VALUE) ) \
| ( $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) && $(TAR) xf - )$$(NEWLINE) )
# Unzip any zipped debuginfo files
ifeq ($$($1_UNZIP_DEBUGINFO), true)
for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.diz"`; do \
$(CD) $$$${f%/*} && $(UNZIP) -q $$$${f} && $(RM) $$$${f}; \
done
endif
ifeq ($$($1_TYPE), tar.gz) ifeq ($$($1_TYPE), tar.gz)
$(CD) $$($1_BASE_DIR) \ $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && \
&& ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \ ( $(TAR) cf - $(TAR_CREATE_EXTRA_PARAM) \
-$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \ $$(if $$($1_SUBDIR), $$($1_SUBDIR), .) $(TAR_IGNORE_EXIT_VALUE) ) \
$(TAR_IGNORE_EXIT_VALUE) ) \ | $(GZIP) > $$@
| $(GZIP) > $$@
else ifeq ($$($1_TYPE), zip) else ifeq ($$($1_TYPE), zip)
$(CD) $$($1_BASE_DIR) \ $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1 && $(ZIPEXE) -qr $$@ .
&& $(ZIPEXE) -qr $$@ . -i@$(SUPPORT_OUTPUTDIR)/bundles/_$1_files
endif endif
endif endif
@ -219,7 +234,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
BUNDLE_NAME := $(JDK_BUNDLE_NAME), \ BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
FILES := $(JDK_BUNDLE_FILES), \ FILES := $(JDK_BUNDLE_FILES), \
SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \ SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \
BASE_DIR := $(JDK_IMAGE_DIR), \ BASE_DIRS := $(JDK_IMAGE_DIR), \
SUBDIR := $(JDK_BUNDLE_SUBDIR), \ SUBDIR := $(JDK_BUNDLE_SUBDIR), \
)) ))
@ -228,7 +243,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
$(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \ $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
BUNDLE_NAME := $(JRE_BUNDLE_NAME), \ BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
FILES := $(JRE_BUNDLE_FILES), \ FILES := $(JRE_BUNDLE_FILES), \
BASE_DIR := $(JRE_IMAGE_DIR), \ BASE_DIRS := $(JRE_IMAGE_DIR), \
SUBDIR := $(JRE_BUNDLE_SUBDIR), \ SUBDIR := $(JRE_BUNDLE_SUBDIR), \
)) ))
@ -237,7 +252,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
$(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \ $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \ BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \ FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
BASE_DIR := $(JDK_IMAGE_DIR), \ BASE_DIRS := $(JDK_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \
SUBDIR := $(JDK_BUNDLE_SUBDIR), \ SUBDIR := $(JDK_BUNDLE_SUBDIR), \
UNZIP_DEBUGINFO := true, \ UNZIP_DEBUGINFO := true, \
)) ))
@ -247,7 +262,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
$(eval $(call SetupBundleFile, BUILD_JRE_SYMBOLS_BUNDLE, \ $(eval $(call SetupBundleFile, BUILD_JRE_SYMBOLS_BUNDLE, \
BUNDLE_NAME := $(JRE_SYMBOLS_BUNDLE_NAME), \ BUNDLE_NAME := $(JRE_SYMBOLS_BUNDLE_NAME), \
FILES := $(JRE_SYMBOLS_BUNDLE_FILES), \ FILES := $(JRE_SYMBOLS_BUNDLE_FILES), \
BASE_DIR := $(JRE_IMAGE_DIR), \ BASE_DIRS := $(JRE_IMAGE_DIR), \
SUBDIR := $(JRE_BUNDLE_SUBDIR), \ SUBDIR := $(JRE_BUNDLE_SUBDIR), \
UNZIP_DEBUGINFO := true, \ UNZIP_DEBUGINFO := true, \
)) ))
@ -257,7 +272,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
$(eval $(call SetupBundleFile, BUILD_DEMOS_BUNDLE, \ $(eval $(call SetupBundleFile, BUILD_DEMOS_BUNDLE, \
BUNDLE_NAME := $(DEMOS_BUNDLE_NAME), \ BUNDLE_NAME := $(DEMOS_BUNDLE_NAME), \
FILES := $(DEMOS_BUNDLE_FILES), \ FILES := $(DEMOS_BUNDLE_FILES), \
BASE_DIR := $(JDK_IMAGE_DIR), \ BASE_DIRS := $(JDK_IMAGE_DIR), \
SUBDIR := $(JDK_BUNDLE_SUBDIR), \ SUBDIR := $(JDK_BUNDLE_SUBDIR), \
)) ))
@ -272,7 +287,7 @@ ifneq ($(filter test-bundles, $(MAKECMDGOALS)), )
$(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \ $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \
BUNDLE_NAME := $(TEST_BUNDLE_NAME), \ BUNDLE_NAME := $(TEST_BUNDLE_NAME), \
FILES := $(TEST_BUNDLE_FILES), \ FILES := $(TEST_BUNDLE_FILES), \
BASE_DIR := $(TEST_IMAGE_DIR), \ BASE_DIRS := $(TEST_IMAGE_DIR), \
)) ))
TEST_TARGETS += $(BUILD_TEST_BUNDLE) TEST_TARGETS += $(BUILD_TEST_BUNDLE)
@ -286,7 +301,7 @@ ifneq ($(filter docs-bundles, $(MAKECMDGOALS)), )
$(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \ $(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \
BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \ BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \
FILES := $(DOCS_BUNDLE_FILES), \ FILES := $(DOCS_BUNDLE_FILES), \
BASE_DIR := $(DOCS_IMAGE_DIR), \ BASE_DIRS := $(DOCS_IMAGE_DIR), \
SUBDIR := docs, \ SUBDIR := docs, \
)) ))

11
make/CreateJmods.gmk
View File

@ -79,6 +79,16 @@ ifneq ($(MAN_DIR), )
DEPS += $(call CacheFind, $(MAN_DIR)) DEPS += $(call CacheFind, $(MAN_DIR))
endif endif
LEGAL_NOTICES := \
$(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
$(call FindModuleLegalDirs, $(MODULE)) \
#
LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))
DEPS += $(call CacheFind, $(LEGAL_NOTICES))
JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH)
# Add dependencies on other jmod files. Only java.base needs access to other # Add dependencies on other jmod files. Only java.base needs access to other
# jmods. # jmods.
ifeq ($(MODULE), java.base) ifeq ($(MODULE), java.base)
@ -112,7 +122,6 @@ ifeq ($(INTERIM_JMOD), true)
DEPS := $(filter-out $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist, $(DEPS)) DEPS := $(filter-out $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist, $(DEPS))
endif endif
# TODO: What about headers?
# Create jmods in a temp dir and then move them into place to keep the # Create jmods in a temp dir and then move them into place to keep the
# module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times. # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.
$(JMODS_DIR)/$(MODULE).jmod: $(DEPS) $(JMODS_DIR)/$(MODULE).jmod: $(DEPS)

6
make/Help.gmk
View File

@ -66,6 +66,12 @@ help:
$(info $(_) make clean-<module>-<phase> # Remove all build results related to a certain) $(info $(_) make clean-<module>-<phase> # Remove all build results related to a certain)
$(info $(_) # module and phase) $(info $(_) # module and phase)
$(info ) $(info )
$(info Targets for Hotspot)
$(info $(_) make hotspot # Build all of hotspot)
$(info $(_) make hotspot-<variant> # Build just the specified jvm variant)
$(info $(_) make hotspot-gensrc # Only build the gensrc part of hotspot)
$(info $(_) make hotspot-<variant>-<phase> # Build the specified phase for the specified module)
$(info )
$(info Targets for specific modules) $(info Targets for specific modules)
$(info $(_) make <module> # Build <module> and everything it depends on) $(info $(_) make <module> # Build <module> and everything it depends on)
$(info $(_) make <module>-<phase> # Compile the specified phase for the specified module) $(info $(_) make <module>-<phase> # Compile the specified phase for the specified module)

48
make/Images.gmk
View File

@ -47,16 +47,43 @@ JRE_MODULES += $(filter $(ALL_MODULES), $(BOOT_MODULES) \
$(PLATFORM_MODULES) $(JRE_TOOL_MODULES)) $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
JDK_MODULES += $(ALL_MODULES) JDK_MODULES += $(ALL_MODULES)
# Compact builds have additional modules # Modules list for compact builds
COMPACT1_EXTRA_MODULES := jdk.localedata jdk.crypto.pkcs11 jdk.crypto.ec \ JRE_COMPACT1_MODULES := \
jdk.unsupported java.logging \
COMPACT2_EXTRA_MODULES := jdk.xml.dom jdk.httpserver java.scripting \
COMPACT3_EXTRA_MODULES := java.smartcardio jdk.management \ jdk.localedata \
jdk.naming.dns jdk.naming.rmi jdk.sctp jdk.security.auth jdk.crypto.token \
jdk.crypto.ec \
jdk.unsupported \
#
JRE_COMPACT1_MODULES := java.compact1 $(COMPACT1_EXTRA_MODULES) JRE_COMPACT2_MODULES := \
JRE_COMPACT2_MODULES := $(JRE_COMPACT1_MODULES) java.compact2 $(COMPACT2_EXTRA_MODULES) $(JRE_COMPACT1_MODULES) \
JRE_COMPACT3_MODULES := $(JRE_COMPACT2_MODULES) java.compact3 $(COMPACT3_EXTRA_MODULES) java.rmi \
java.sql \
java.xml \
jdk.xml.dom \
jdk.httpserver \
#
JRE_COMPACT3_MODULES := \
$(JRE_COMPACT2_MODULES) \
java.smartcardio \
java.compiler \
java.instrument \
java.management \
java.naming \
java.prefs \
java.security.jgss \
java.security.sasl \
java.sql.rowset \
java.xml.crypto \
jdk.management \
jdk.naming.dns \
jdk.naming.rmi \
jdk.sctp \
jdk.security.auth \
#
JRE_MODULES_LIST := $(call CommaList, $(JRE_MODULES)) JRE_MODULES_LIST := $(call CommaList, $(JRE_MODULES))
JDK_MODULES_LIST := $(call CommaList, $(JDK_MODULES)) JDK_MODULES_LIST := $(call CommaList, $(JDK_MODULES))
@ -92,6 +119,7 @@ JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
--endian $(OPENJDK_BUILD_CPU_ENDIAN) \ --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
--release-info $(BASE_RELEASE_FILE) \ --release-info $(BASE_RELEASE_FILE) \
--order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \ --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
--dedup-legal-notices=error-if-not-same-content \
$(JLINK_JLI_CLASSES) \ $(JLINK_JLI_CLASSES) \
# #
@ -287,8 +315,6 @@ endif # Windows
################################################################################ ################################################################################
# doc files # doc files
JRE_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
JDK_DOC_FILES ?= LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
JRE_DOC_LOCATION ?= $(JDK_TOPDIR) JRE_DOC_LOCATION ?= $(JDK_TOPDIR)
JDK_DOC_LOCATION ?= $(JDK_TOPDIR) JDK_DOC_LOCATION ?= $(JDK_TOPDIR)

2
make/InterimImage.gmk
View File

@ -38,7 +38,7 @@ INTERIM_MODULES_LIST := $(call CommaList, $(INTERIM_IMAGE_MODULES))
JMODS := $(patsubst %, $(INTERIM_JMODS_DIR)/%.jmod, $(INTERIM_IMAGE_MODULES)) JMODS := $(patsubst %, $(INTERIM_JMODS_DIR)/%.jmod, $(INTERIM_IMAGE_MODULES))
JLINK_TOOL := $(JLINK) \ JLINK_TOOL := $(JLINK) -J-Djlink.debug=true \
--module-path $(INTERIM_JMODS_DIR) \ --module-path $(INTERIM_JMODS_DIR) \
--endian $(OPENJDK_BUILD_CPU_ENDIAN) --endian $(OPENJDK_BUILD_CPU_ENDIAN)

1
make/Jprt.gmk
View File

@ -81,7 +81,6 @@ ifeq ($(JPRT_TARGET), $(DEFAULT_MAKE_TARGET))
# Optional symbols bundle # Optional symbols bundle
ifeq ($(GCOV_ENABLED), true) ifeq ($(GCOV_ENABLED), true)
jprt_bundle: $(JPRT_ARCHIVE_SYMBOLS_BUNDLE) jprt_bundle: $(JPRT_ARCHIVE_SYMBOLS_BUNDLE)
zip-bundles: $(SYMBOLS_ZIP_BUNDLE)
$(JPRT_ARCHIVE_SYMBOLS_BUNDLE): product-images $(JPRT_ARCHIVE_SYMBOLS_BUNDLE): product-images
$(call MakeDir, $(@D)) $(call MakeDir, $(@D))

68
make/Main.gmk
View File

@ -236,15 +236,35 @@ ALL_TARGETS += $(LAUNCHER_TARGETS)
################################################################################ ################################################################################
# Build hotspot target # Build hotspot target
ifeq ($(BUILD_HOTSPOT),true) HOTSPOT_VARIANT_TARGETS := $(addprefix hotspot-, $(JVM_VARIANTS))
hotspot: HOTSPOT_VARIANT_GENSRC_TARGETS := $(addsuffix -gensrc, $(HOTSPOT_VARIANT_TARGETS))
+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildHotspot.gmk) HOTSPOT_VARIANT_LIBS_TARGETS := $(addsuffix -libs, $(HOTSPOT_VARIANT_TARGETS))
endif
define DeclareHotspotGensrcRecipe
hotspot-$1-gensrc:
$$(call LogInfo, Building JVM variant '$1' with features '$(JVM_FEATURES_$1)')
+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f gensrc/GenerateSources.gmk \
JVM_VARIANT=$1)
endef
$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotGensrcRecipe,$v)))
define DeclareHotspotLibsRecipe
hotspot-$1-libs:
+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibraries.gmk \
JVM_VARIANT=$1)
endef
$(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
hotspot-jsig:
+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -f lib/CompileLibjsig.gmk)
hotspot-ide-project: hotspot-ide-project:
+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk) +($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
ALL_TARGETS += hotspot hotspot-ide-project ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
$(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-jsig hotspot-ide-project
################################################################################ ################################################################################
# Build demos and samples targets # Build demos and samples targets
@ -545,11 +565,18 @@ else
$(JAVA_TARGETS): interim-langtools $(JAVA_TARGETS): interim-langtools
# Declare dependencies between hotspot-<variant>* targets
$(foreach v, $(JVM_VARIANTS), \
$(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \
$(eval hotspot-$v-libs: hotspot-$v-gensrc) \
)
hotspot-ide-project: hotspot exploded-image hotspot-ide-project: hotspot exploded-image
generate-exported-symbols: java.base-libs jdk.jdwp.agent-libs generate-exported-symbols: java.base-libs jdk.jdwp.agent-libs
$(LIBS_TARGETS): hotspot # Building one JVM variant is enough to start building the other libs
$(LIBS_TARGETS): hotspot-$(JVM_VARIANT_MAIN)-libs
$(LAUNCHER_TARGETS): java.base-libs $(LAUNCHER_TARGETS): java.base-libs
@ -615,6 +642,9 @@ else
$(addsuffix -jmod, $(call FindAllUpgradeableModules)), $(JMOD_TARGETS)) $(addsuffix -jmod, $(call FindAllUpgradeableModules)), $(JMOD_TARGETS))
endif endif
# Building java.base-jmod requires all of hotspot to be built.
java.base-jmod: hotspot
# Declare dependencies from <module>-jmod to all other module targets # Declare dependencies from <module>-jmod to all other module targets
# When creating a BUILDJDK, the java compilation has already been done by the # When creating a BUILDJDK, the java compilation has already been done by the
# normal build and copied in. # normal build and copied in.
@ -659,6 +689,9 @@ else
exploded-image-optimize exploded-image-optimize
endif endif
# All modules include the main license files from java.base.
$(JMOD_TARGETS): java.base-copy
zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \ zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \
$(filter jdk.crypto%, $(JAVA_TARGETS)) $(filter jdk.crypto%, $(JAVA_TARGETS))
@ -686,6 +719,7 @@ else
jdk-image: jmods zip-source demos samples release-file jdk-image: jmods zip-source demos samples release-file
jre-image: jmods release-file jre-image: jmods release-file
symbols-image: $(LIBS_TARGETS) $(LAUNCHER_TARGETS)
profiles: jmods release-file profiles: jmods release-file
@ -702,7 +736,7 @@ else
docs-javadoc: $(GENSRC_TARGETS) rmic docs-javadoc: $(GENSRC_TARGETS) rmic
# The gensrc step for jdk.jdi creates an html file that is used by docs-copy. # The gensrc step for jdk.jdi creates an html file that is used by docs-copy.
docs-copy: hotspot jdk.jdi-gensrc docs-copy: hotspot-$(JVM_VARIANT_MAIN)-gensrc jdk.jdi-gensrc
docs-zip: docs-javadoc docs-copy docs-zip: docs-javadoc docs-copy
@ -725,7 +759,8 @@ else
test-image-failure-handler: build-test-failure-handler test-image-failure-handler: build-test-failure-handler
build-test-hotspot-jtreg-native: buildtools-jdk hotspot build-test-hotspot-jtreg-native: buildtools-jdk \
hotspot-$(JVM_VARIANT_MAIN)-libs
build-test-jdk-jtreg-native: buildtools-jdk build-test-jdk-jtreg-native: buildtools-jdk
@ -759,6 +794,16 @@ endif
buildtools: buildtools-langtools interim-langtools interim-rmic \ buildtools: buildtools-langtools interim-langtools interim-rmic \
buildtools-jdk buildtools-jdk
hotspot: $(HOTSPOT_VARIANT_TARGETS) hotspot-jsig
hotspot-libs: hotspot-jsig
# Create targets hotspot-libs and hotspot-gensrc.
$(foreach v, $(JVM_VARIANTS), \
$(eval hotspot-libs: hotspot-$v-libs) \
$(eval hotspot-gensrc: hotspot-$v-gensrc) \
)
gensrc: $(GENSRC_TARGETS) gensrc: $(GENSRC_TARGETS)
gendata: $(GENDATA_TARGETS) gendata: $(GENDATA_TARGETS)
@ -788,6 +833,10 @@ $(foreach m, $(RMIC_MODULES), $(eval $m: $m-rmic))
$(foreach m, $(LIBS_MODULES), $(eval $m: $m-libs)) $(foreach m, $(LIBS_MODULES), $(eval $m: $m-libs))
$(foreach m, $(LAUNCHER_MODULES), $(eval $m: $m-launchers)) $(foreach m, $(LAUNCHER_MODULES), $(eval $m: $m-launchers))
$(foreach m, $(ALL_COPY_MODULES), $(eval $m: $m-copy)) $(foreach m, $(ALL_COPY_MODULES), $(eval $m: $m-copy))
# Building java.base includes building all of hotspot.
java.base: hotspot
demos: demos-jdk demos: demos-jdk
samples: samples-jdk samples: samples-jdk
@ -843,7 +892,8 @@ all-images: product-images test-image docs-image
# all-bundles packages all our deliverables as tar.gz bundles. # all-bundles packages all our deliverables as tar.gz bundles.
all-bundles: product-bundles test-bundles docs-bundles all-bundles: product-bundles test-bundles docs-bundles
ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers jmods \ ALL_TARGETS += buildtools hotspot hotspot-libs hotspot-gensrc gensrc gendata \
copy java rmic libs launchers jmods \
jdk.jdwp.agent-gensrc $(ALL_MODULES) demos samples \ jdk.jdwp.agent-gensrc $(ALL_MODULES) demos samples \
exploded-image-base exploded-image \ exploded-image-base exploded-image \
create-buildjdk mac-bundles product-images docs-image test-image all-images \ create-buildjdk mac-bundles product-images docs-image test-image all-images \

4
make/ZipSecurity.gmk
View File

@ -43,8 +43,8 @@ $(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \
modules/java.base/com/sun/crypto/provider \ modules/java.base/com/sun/crypto/provider \
modules/jdk.crypto.ec/sun/security/ec \ modules/jdk.crypto.ec/sun/security/ec \
modules/jdk.crypto.mscapi/sun/security/mscapi \ modules/jdk.crypto.mscapi/sun/security/mscapi \
modules/jdk.crypto.pkcs11/sun/security/pkcs11 \ modules/jdk.crypto.token/sun/security/pkcs11 \
modules/jdk.crypto.pkcs11/sun/security/pkcs11/wrapper \ modules/jdk.crypto.token/sun/security/pkcs11/wrapper \
modules/jdk.crypto.ucrypto/com/oracle/security/ucrypto \ modules/jdk.crypto.ucrypto/com/oracle/security/ucrypto \
modules/java.base/javax/net \ modules/java.base/javax/net \
modules/java.base/javax/security/cert \ modules/java.base/javax/security/cert \

22
make/common/Modules.gmk
View File

@ -83,9 +83,6 @@ UPGRADEABLE_MODULES += \
NON_UPGRADEABLE_MODULES += NON_UPGRADEABLE_MODULES +=
AGGREGATOR_MODULES += \ AGGREGATOR_MODULES += \
java.compact1 \
java.compact2 \
java.compact3 \
java.se \ java.se \
java.se.ee \ java.se.ee \
# #
@ -107,7 +104,7 @@ PLATFORM_MODULES += \
jdk.accessibility \ jdk.accessibility \
jdk.charsets \ jdk.charsets \
jdk.crypto.ec \ jdk.crypto.ec \
jdk.crypto.pkcs11 \ jdk.crypto.token \
jdk.desktop \ jdk.desktop \
jdk.dynalink \ jdk.dynalink \
jdk.jsobject \ jdk.jsobject \
@ -122,7 +119,7 @@ PLATFORM_MODULES += \
JRE_TOOL_MODULES += \ JRE_TOOL_MODULES += \
jdk.jdwp.agent \ jdk.jdwp.agent \
jdk.pack200 \ jdk.pack \
jdk.scripting.nashorn.shell \ jdk.scripting.nashorn.shell \
# #
@ -286,6 +283,21 @@ FindAllUpgradeableModules = \
################################################################################ ################################################################################
LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS)/legal
ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/legal
endif
LEGAL_SUBDIRS += share/legal
# Find all legal dirs for a particular module
# $1 - Module to find legal dirs for
FindModuleLegalDirs = \
$(strip $(wildcard \
$(addsuffix /$(strip $1), $(IMPORT_MODULES_LEGAL)) \
$(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
################################################################################
# Param 1 - Name of module # Param 1 - Name of module
define ReadSingleImportMetaData define ReadSingleImportMetaData
ifneq ($$(wildcard $(IMPORT_MODULES_MAKE)/$$(strip $1)/build.properties), ) ifneq ($$(wildcard $(IMPORT_MODULES_MAKE)/$$(strip $1)/build.properties), )

16
test/jtreg-ext/requires/VMProps.java
View File

@ -25,6 +25,7 @@ package requires;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -60,9 +61,10 @@ public class VMProps implements Callable<Map<String, String>> {
map.put("vm.flightRecorder", vmFlightRecorder()); map.put("vm.flightRecorder", vmFlightRecorder());
map.put("vm.simpleArch", vmArch()); map.put("vm.simpleArch", vmArch());
map.put("vm.debug", vmDebug()); map.put("vm.debug", vmDebug());
map.put("vm.jvmci", vmJvmci());
vmGC(map); // vm.gc.X = true/false vmGC(map); // vm.gc.X = true/false
dump(map); VMProps.dump(map);
return map; return map;
} }
@ -155,6 +157,14 @@ public class VMProps implements Callable<Map<String, String>> {
return "" + System.getProperty("jdk.debug").contains("debug"); return "" + System.getProperty("jdk.debug").contains("debug");
} }
/**
* @return true if VM supports JVMCI and false otherwise
*/
protected String vmJvmci() {
// builds with jvmci have this flag
return "" + (WB.getBooleanVMFlag("EnableJVMCI") != null);
}
/** /**
* For all existing GC sets vm.gc.X property. * For all existing GC sets vm.gc.X property.
* Example vm.gc.G1=true means: * Example vm.gc.G1=true means:
@ -180,7 +190,7 @@ public class VMProps implements Callable<Map<String, String>> {
* *
* @param map * @param map
*/ */
protected void dump(Map<String, String> map) { protected static void dump(Map<String, String> map) {
String dumpFileName = System.getProperty("vmprops.dump"); String dumpFileName = System.getProperty("vmprops.dump");
if (dumpFileName == null) { if (dumpFileName == null) {
return; return;
@ -188,7 +198,7 @@ public class VMProps implements Callable<Map<String, String>> {
List<String> lines = new ArrayList<>(); List<String> lines = new ArrayList<>();
map.forEach((k, v) -> lines.add(k + ":" + v)); map.forEach((k, v) -> lines.add(k + ":" + v));
try { try {
Files.write(Paths.get(dumpFileName), lines); Files.write(Paths.get(dumpFileName), lines, StandardOpenOption.APPEND);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException("Failed to dump properties into '" throw new RuntimeException("Failed to dump properties into '"
+ dumpFileName + "'", e); + dumpFileName + "'", e);

22
test/lib/jdk/test/lib/Platform.java
View File

@ -160,9 +160,8 @@ public class Platform {
return vmVersion; return vmVersion;
} }
// Returns true for sparc and sparcv9. public static boolean isAArch64() {
public static boolean isSparc() { return isArch("aarch64");
return isArch("sparc.*");
} }
public static boolean isARM() { public static boolean isARM() {
@ -173,9 +172,14 @@ public class Platform {
return isArch("ppc.*"); return isArch("ppc.*");
} }
public static boolean isX86() { // Returns true for IBM z System running linux.
// On Linux it's 'i386', Windows 'x86' without '_64' suffix. public static boolean isS390x() {
return isArch("(i386)|(x86(?!_64))"); return isArch("s390.*") || isArch("s/390.*") || isArch("zArch_64");
}
// Returns true for sparc and sparcv9.
public static boolean isSparc() {
return isArch("sparc.*");
} }
public static boolean isX64() { public static boolean isX64() {
@ -183,8 +187,9 @@ public class Platform {
return isArch("(amd64)|(x86_64)"); return isArch("(amd64)|(x86_64)");
} }
public static boolean isAArch64() { public static boolean isX86() {
return isArch("aarch64"); // On Linux it's 'i386', Windows 'x86' without '_64' suffix.
return isArch("(i386)|(x86(?!_64))");
} }
public static String getOsArch() { public static String getOsArch() {
@ -200,6 +205,7 @@ public class Platform {
if (isAix()) { if (isAix()) {
return false; // SA not implemented. return false; // SA not implemented.
} else if (isLinux()) { } else if (isLinux()) {
if (isS390x()) { return false; } // SA not implemented.
return canPtraceAttachLinux(); return canPtraceAttachLinux();
} else if (isOSX()) { } else if (isOSX()) {
return canAttachOSX(); return canAttachOSX();