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:
Jesper Wilhelmsson 2016-12-18 15:57:40 +01:00
commit de18583f29
18 changed files with 352 additions and 3858 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -391,3 +391,4 @@ ff98aa9ec9fae991e426ce5926fc9036d25f5562 jdk-9+145
a22e2671d88f6b22a4aa82e3966986542ed2a381 jdk-9+146 a22e2671d88f6b22a4aa82e3966986542ed2a381 jdk-9+146
5f6920274c48eb00d31afee6c034826a754c13d9 jdk-9+147 5f6920274c48eb00d31afee6c034826a754c13d9 jdk-9+147
3ffc3e886c74736e387f3685e86b557cdea706c8 jdk-9+148 3ffc3e886c74736e387f3685e86b557cdea706c8 jdk-9+148
b119012d1c2ab2570fe8718633840d0c1f1f441d jdk-9+149

3605
THIRD_PARTY_README
View File

File diff suppressed because it is too large Load Diff

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

@ -867,6 +867,8 @@ TOOLCHAIN_TYPE
STATIC_BUILD STATIC_BUILD
IMPORT_MODULES_MAKE IMPORT_MODULES_MAKE
IMPORT_MODULES_SRC IMPORT_MODULES_SRC
IMPORT_MODULES_MAN
IMPORT_MODULES_LEGAL
IMPORT_MODULES_CONF IMPORT_MODULES_CONF
IMPORT_MODULES_LIBS IMPORT_MODULES_LIBS
IMPORT_MODULES_CMDS IMPORT_MODULES_CMDS
@ -5142,7 +5144,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=1481496095 DATE_WHEN_GENERATED=1482073038
############################################################################### ###############################################################################
# #
@ -31204,6 +31206,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
@ -31225,6 +31233,8 @@ $as_echo "$as_me: The path of IMPORT_MODULES_TOPDIR, which resolves as \"$path\"
############################################################################### ###############################################################################
# #
# Setup the toolchain (compilers etc), i.e. tools used to compile and process # Setup the toolchain (compilers etc), i.e. tools used to compile and process

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

@ -105,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
@ -122,6 +128,8 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_IMPORT_MODULES],
AC_SUBST(IMPORT_MODULES_CMDS) AC_SUBST(IMPORT_MODULES_CMDS)
AC_SUBST(IMPORT_MODULES_LIBS) AC_SUBST(IMPORT_MODULES_LIBS)
AC_SUBST(IMPORT_MODULES_CONF) AC_SUBST(IMPORT_MODULES_CONF)
AC_SUBST(IMPORT_MODULES_LEGAL)
AC_SUBST(IMPORT_MODULES_MAN)
AC_SUBST(IMPORT_MODULES_SRC) AC_SUBST(IMPORT_MODULES_SRC)
AC_SUBST(IMPORT_MODULES_MAKE) AC_SUBST(IMPORT_MODULES_MAKE)
]) ])

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

@ -143,6 +143,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@

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, \
)) ))

2
make/CompileJavaModules.gmk
View File

@ -344,8 +344,6 @@ jdk.charsets_COPY := .dat
################################################################################ ################################################################################
jdk.accessibility_ADD_JAVAC_FLAGS := -Xlint:-exports
################################################################################ ################################################################################
jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*' \ jdk.compiler_ADD_JAVAC_FLAGS := -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*' \

16
make/CreateJmods.gmk
View File

@ -79,6 +79,21 @@ 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)
ifeq ($(filter-out jdk.incubator.%, $(MODULE)), )
JMOD_FLAGS += --do-not-resolve-by-default
JMOD_FLAGS += --warn-if-resolved=incubating
endif
# 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 +127,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)

52
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)
@ -317,11 +343,11 @@ JDK_TARGETS += $(JDK_DOC_TARGETS)
################################################################################ ################################################################################
# src.zip # src.zip
$(JDK_IMAGE_DIR)/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip $(JDK_IMAGE_DIR)/lib/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
$(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)) $(call LogInfo, Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@))
$(install-file) $(install-file)
JDK_TARGETS += $(JDK_IMAGE_DIR)/src.zip JDK_TARGETS += $(JDK_IMAGE_DIR)/lib/src.zip
################################################################################ ################################################################################
# /demo dir # /demo dir

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))

4
make/Main.gmk
View File

@ -703,6 +703,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))
@ -730,6 +733,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

1
make/ReleaseFile.gmk
View File

@ -47,6 +47,7 @@ define create-info-file
$(if $(JDK_ARCH_ABI_PROP_NAME), \ $(if $(JDK_ARCH_ABI_PROP_NAME), \
$(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)")) $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"))
$(call info-file-item, "SOURCE", "$(strip $(SOURCE_REVISION))") $(call info-file-item, "SOURCE", "$(strip $(SOURCE_REVISION))")
$(call info-file-item, "IMPLEMENTOR", "$(COMPANY_NAME)")
endef endef
# Param 1 - The file containing the MODULES list # Param 1 - The file containing the MODULES list

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 \
# #
@ -300,6 +297,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), )