diff --git a/.hgtags b/.hgtags index bd28104aa70..d2e004fa3cb 100644 --- a/.hgtags +++ b/.hgtags @@ -163,3 +163,5 @@ b3a91113026c99b0da010d41055719ab0d8938f0 jdk8-b37 35a5397278779a2f8f3013f81586dc8f30cb149d jdk8-b39 6e4e654931b976304bf6e7b4d0d6db8f75bac5d9 jdk8-b40 c029c972396cea042a0dc67c0f7ccf2fe68007d4 jdk8-b41 +5c5a64ec0839df5affe9394b99ff338c363acbca jdk8-b42 +69d8a827cdf9236be9694a46d75c710d71dac7d7 jdk8-b43 diff --git a/.hgtags-top-repo b/.hgtags-top-repo index b322fa51d81..cda4949ebf7 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -163,3 +163,5 @@ d939bd0ab13c16647ffa38cc4b64fb31b7d44e10 jdk8-b38 8927dd68aee3fa54a1a698e2980e1b2f6c7c12c1 jdk8-b39 a2b2d435f1d275fa8010774c653197c64e326d3a jdk8-b40 1a8c7c530f8a9b7f5bdb9b0693b2f5435ca5205e jdk8-b41 +1ce5dc16416611c58b7480ca67a2eee5153498a6 jdk8-b42 +661c9aae602bbd9766d12590800c90f1edd1d8dd jdk8-b43 diff --git a/README-builds.html b/README-builds.html index 5e8d86af449..57ded784f9a 100644 --- a/README-builds.html +++ b/README-builds.html @@ -108,6 +108,7 @@
  • Testing the Build
  • Environment/Make Variables
  • Troubleshooting
    • +
  • The New Build
    • @@ -2120,6 +2121,16 @@ + +
    +

    The New Build

    +
    + The + Build Infrastructure project is working on a new + build. For information on how to try it out, please see the + + Build Infra User Guide +
    diff --git a/common/autoconf/autogen.sh b/common/autoconf/autogen.sh index 7e4c3b0ea57..5f6937c52f7 100644 --- a/common/autoconf/autogen.sh +++ b/common/autoconf/autogen.sh @@ -22,5 +22,5 @@ # questions. # -autoconf configure.ac > configure +autoconf -W all configure.ac > configure rm -rf config.status config.log autom4te.cache diff --git a/common/autoconf/builddeps.m4 b/common/autoconf/builddeps.m4 index 55e132e1c8b..1be92ecf870 100644 --- a/common/autoconf/builddeps.m4 +++ b/common/autoconf/builddeps.m4 @@ -34,7 +34,7 @@ AC_DEFUN([BDEPS_SCAN_FOR_BUILDDEPS], . $builddepsfile AC_MSG_RESULT([loaded!]) else - AC_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!]) + AC_MSG_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!]) fi else AC_MSG_CHECKING([for builddeps.conf files in sources...]) @@ -47,7 +47,7 @@ AC_DEFUN([BDEPS_SCAN_FOR_BUILDDEPS], . $builddepsfile AC_MSG_RESULT([found at least one!]) else - AC_ERROR([Could not find any builddeps.conf at all!]) + AC_MSG_ERROR([Could not find any builddeps.conf at all!]) fi fi # Create build and host names that use _ instead of "-" and ".". @@ -117,7 +117,7 @@ AC_DEFUN([BDEPS_FTPGET], ) | ftp -in $FTPSERVER fi if test "x$VALID_TOOL" != xyes; then - AC_ERROR([I do not know how to use the tool: $BDEPS_FTP]) + AC_MSG_ERROR([I do not know how to use the tool: $BDEPS_FTP]) fi ]) @@ -159,7 +159,7 @@ AC_DEFUN([BDEPS_CHECK_MODULE], thecflags=${builddep_$2_CFLAGS} thelibs=${builddep_$2_LIBS} if test "x$depdir" = x; then - AC_ERROR([Could not download build dependency $2]) + AC_MSG_ERROR([Could not download build dependency $2]) fi $1=$depdir if test "x$theroot" != x; then @@ -198,17 +198,17 @@ AC_DEFUN([BDEPS_FETCH], mkdir -p $installdir fi if test ! -d $installdir; then - AC_ERROR([Could not create directory $installdir]) + AC_MSG_ERROR([Could not create directory $installdir]) fi tmpfile=`mktemp $installdir/$1.XXXXXXXXX` touch $tmpfile if test ! -f $tmpfile; then - AC_ERROR([Could not create files in directory $installdir]) + AC_MSG_ERROR([Could not create files in directory $installdir]) fi BDEPS_FTPGET([$3/$2] , [$tmpfile]) mv $tmpfile $installdir/$filename if test ! -s $installdir/$filename; then - AC_ERROR([Could not download $3/$2]) + AC_MSG_ERROR([Could not download $3/$2]) fi case "$extension" in zip) echo "Unzipping $installdir/$filename..." @@ -220,7 +220,7 @@ AC_DEFUN([BDEPS_FETCH], tgz) echo "Untaring $installdir/$filename..." (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked) ;; - *) AC_ERROR([Cannot handle build depency archive with extension $extension]) + *) AC_MSG_ERROR([Cannot handle build depency archive with extension $extension]) ;; esac fi @@ -228,4 +228,3 @@ AC_DEFUN([BDEPS_FETCH], $5=$installdir fi ]) - diff --git a/common/autoconf/configure b/common/autoconf/configure index 13630cca07d..68f93765ea6 100644 --- a/common/autoconf/configure +++ b/common/autoconf/configure @@ -595,7 +595,12 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS +CACERTS_FILE TEST_IN_BUILD +SALIB_NAME +OS_VERSION_MICRO +OS_VERSION_MINOR +OS_VERSION_MAJOR LIBCXX LDFLAGS_JDKEXE_SUFFIX LDFLAGS_JDKLIB_SUFFIX @@ -625,15 +630,20 @@ CORBA_OUTPUTDIR LANGTOOLS_MAKE_ARGS LANGTOOLS_DIST LANGTOOLS_OUTPUTDIR +CXX_FLAG_DEPS +C_FLAG_DEPS CXX_O_FLAG_NONE CXX_O_FLAG_NORM CXX_O_FLAG_HI +CXX_O_FLAG_HIGHEST C_O_FLAG_NONE C_O_FLAG_NORM C_O_FLAG_HI +C_O_FLAG_HIGHEST DISABLE_NIMBUS GENERATE_DOCS ENABLE_DOCS +LIBDL LIBM USE_EXTERNAL_LIBZ USE_EXTERNAL_LIBGIF @@ -665,6 +675,7 @@ SERVER_JAVA BOOT_JDK_JVMARGS OVERRIDE_SRC_ROOT ADD_SRC_ROOT +NATIVE2ASCII RMIC JAR JAVAH @@ -678,7 +689,11 @@ BOOT_JDK JAVA_CHECK JAVAC_CHECK ENDIAN +POST_MCS_CMD +POST_STRIP_CMD SET_SHARED_LIBRARY_ORIGIN +CXX_FLAG_REORDER +C_FLAG_REORDER SET_SHARED_LIBRARY_MAPFILE SET_SHARED_LIBRARY_NAME SHARED_LIBRARY_FLAGS @@ -749,6 +764,7 @@ JAXP_TOPDIR CORBA_TOPDIR LANGTOOLS_TOPDIR OUTPUT_ROOT +CONF_NAME SPEC MSVCR100DLL CHECK_FOR_VCINSTALLDIR @@ -797,6 +813,8 @@ MEMORY_SIZE CONCURRENT_BUILD_JOBS NUM_CORES DATE_WHEN_CONFIGURED +REQUIRED_OS_VERSION +REQUIRED_OS_NAME LEGACY_BUILD_CPU3 LEGACY_BUILD_CPU2 LEGACY_BUILD_CPU1 @@ -829,6 +847,7 @@ build_os build_vendor build_cpu build +HG FILE EXPR READELF @@ -918,7 +937,7 @@ enable_option_checking with_data_model with_num_cores with_memory_size -enable_openjdk +enable_openjdk_only enable_jigsaw with_jdk_variant enable_headful @@ -967,6 +986,7 @@ enable_docs enable_nimbus enable_static_link_stdc__ enable_hotspot_test_in_build +with_cacerts_file ' ac_precious_vars='build_alias host_alias @@ -1610,7 +1630,7 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-openjdk build OpenJDK regardless of the presence of closed + --enable-openjdk-only build OpenJDK regardless of the presence of closed repositories [disabled] --enable-jigsaw build Jigsaw images (not yet available) [disabled] --disable-headful build headful support (graphical UI support) @@ -1718,6 +1738,7 @@ Optional Packages: headers under PATH/include) --with-pulse-include specify directory for the pulseaudio include files --with-pulse-lib specify directory for the pulseaudio library + --with-cacerts-file specify alternative cacerts file Some influential environment variables: PKG_CONFIG path to pkg-config utility @@ -3036,7 +3057,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - # # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -3095,6 +3115,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # Fixes paths on windows hosts to be mixed mode short. + + # # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -3149,12 +3171,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # questions. # -function help_on_build_dependency { - # Print a helpful message on how to acquire the necessary build dependency. - # $1 is the help tag: freetyp2, cups, pulse, alsa etc - MISSING_DEPENDENCY=$1 - PKGHANDLER_COMMAND= - +function prepare_help_system { for ac_prog in apt-get yum port pkgutil pkgadd do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -3197,11 +3214,18 @@ fi test -n "$PKGHANDLER" && break done +} + +function help_on_build_dependency { + # Print a helpful message on how to acquire the necessary build dependency. + # $1 is the help tag: freetyp2, cups, pulse, alsa etc + MISSING_DEPENDENCY=$1 + PKGHANDLER_COMMAND= case $PKGHANDLER in apt-get) apt_help $MISSING_DEPENDENCY ;; - yum) + yum) yum_help $MISSING_DEPENDENCY ;; port) port_help $MISSING_DEPENDENCY ;; @@ -3214,7 +3238,7 @@ done esac if test "x$PKGHANDLER_COMMAND" != x; then - HELP_MSG="Try running '$PKGHANDLER_COMMAND'." + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." fi } @@ -5384,6 +5408,47 @@ fi # Test that variable FILE is not empty. if test "" = "$FILE"; then as_fn_error $? "Could not find file !" "$LINENO" 5 ; fi +# Extract the first word of "hg", so it can be a program name with args. +set dummy hg; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_HG+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $HG in + [\\/]* | ?:[\\/]*) + ac_cv_path_HG="$HG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_HG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +HG=$ac_cv_path_HG +if test -n "$HG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HG" >&5 +$as_echo "$HG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Figure out the build and host system. # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -5491,7 +5556,7 @@ fi # The same values are setup for BUILD_... # # And the legacy variables, for controlling the old makefiles. - # LEGACY_HOST_CPU1=i586,amd64,sparc,sparcv9,arm,arm64... + # LEGACY_HOST_CPU1=i586,amd64/x86_64,sparc,sparcv9,arm,arm64... # LEGACY_HOST_CPU2=i386,amd64,sparc,sparcv9,arm,arm64... # LEGACY_HOST_CPU3=sparcv9,amd64 (but only on solaris) # LEGACY_HOST_OS_API=solaris,windows @@ -5918,6 +5983,33 @@ fi LEGACY_BUILD_CPU3="" fi + # On MacOSX and MacOSX only, we have a different name for the x64 CPU in ARCH (LEGACY_HOST_CPU1) ... + if test "x$HOST_OS" = xmacosx && test "x$HOST_CPU" = xx64; then + LEGACY_HOST_CPU1="x86_64" + fi + + + if test "x$HOST_OS" = "xsolaris"; then + REQUIRED_OS_NAME=SunOS + REQUIRED_OS_VERSION=5.10 + fi + if test "x$HOST_OS" = "xlinux"; then + REQUIRED_OS_NAME=Linux + REQUIRED_OS_VERSION=2.6 + fi + if test "x$HOST_OS" = "xwindows"; then + REQUIRED_OS_NAME=Windows + REQUIRED_OS_VERSION=5.1 + fi + if test "x$HOST_OS" = "xmacosx"; then + REQUIRED_OS_NAME=Darwin + REQUIRED_OS_VERSION=11.2 + fi + + + + + # Now the following vars are defined. # HOST_OS=aix,bsd,hpux,linux,macosx,solaris,windows # HOST_OS_FAMILY=bsd,gnu,sysv,win32,wince @@ -6143,15 +6235,15 @@ fi # # OpenJDK or closed # -# Check whether --enable-openjdk was given. -if test "${enable_openjdk+set}" = set; then : - enableval=$enable_openjdk; +# Check whether --enable-openjdk-only was given. +if test "${enable_openjdk_only+set}" = set; then : + enableval=$enable_openjdk_only; fi -if test "x$enable_openjdk" = "xyes"; then +if test "x$enable_openjdk_only" = "xyes"; then OPENJDK=true -elif test "x$enable_openjdk" = "xno"; then +elif test "x$enable_openjdk_only" = "xno"; then OPENJDK=false elif test -d "$SRC_ROOT/jdk/src/closed"; then OPENJDK=false @@ -6458,7 +6550,8 @@ COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then # We are running configure from the src root. # Create a default ./build/host-variant-debuglevel output root. - OUTPUT_ROOT="$SRC_ROOT/build/${HOST_OS}-${HOST_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}" + CONF_NAME="${HOST_OS}-${HOST_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}" + OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}" mkdir -p "$OUTPUT_ROOT" if test ! -d "$OUTPUT_ROOT"; then as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5 @@ -6466,6 +6559,9 @@ if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" || te else # We are running configure from outside of the src dir. # Then use the current directory as output dir! + # If configuration is situated in normal build directory, just use the build + # directory name as configuration name, otherwise use the complete path. + CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"` OUTPUT_ROOT="$CURDIR" fi @@ -6531,7 +6627,7 @@ $as_echo "no" >&6; } esac # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat cd $OUTPUT_ROOT - $SRC_ROOT/common/bin/extractvcvars.sh "$VARSBAT" "$VARSBAT_ARCH" + bash $SRC_ROOT/common/bin/extractvcvars.sh "$VARSBAT" "$VARSBAT_ARCH" cd $CURDIR if test ! -s $OUTPUT_ROOT/localdevenv.sh || test ! -s $OUTPUT_ROOT/localdevenv.gmk; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can extract the needed env variables" >&5 @@ -6618,6 +6714,8 @@ ac_config_files="$ac_config_files $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.i SPEC=$OUTPUT_ROOT/spec.gmk +CONF_NAME=$CONF_NAME + OUTPUT_ROOT=$OUTPUT_ROOT @@ -7362,6 +7460,8 @@ ORG_CFLAGS="$CFLAGS" ORG_CXXFLAGS="$CXXFLAGS" ORG_OBJCFLAGS="$OBJCFLAGS" +prepare_help_system + # gcc is almost always present, but on Windows we # prefer cl.exe and on Solaris we prefer CC. # Thus test for them in this order. @@ -8769,9 +8869,10 @@ fi LD="$car" fi -LDEXE="$LD" -LDCXX="$LD" -LDEXECXX="$LD" +LD="$CC" +LDEXE="$CC" +LDCXX="$CXX" +LDEXECXX="$CXX" # LDEXE is the linker to use, when creating executables. # Linking C++ libraries. @@ -8926,7 +9027,7 @@ if test "x$BUILD_OS" = xwindows; then : # For now, assume that we are always compiling using cl.exe. CC_OUT_OPTION=-Fo - EXE_OUT_OPTION=-Fe + EXE_OUT_OPTION=-out: LD_OUT_OPTION=-out: AR_OUT_OPTION=-out: # On Windows, reject /usr/bin/link, which is a cygwin @@ -9008,10 +9109,9 @@ fi WINLD="$tmp" LD="$WINLD" - # However creating executables can only be done with cl.exe. - LDEXE="$CC" + LDEXE="$WINLD" LDCXX="$WINLD" - LDEXECXX="$CC" + LDEXECXX="$WINLD" # Extract the first word of "mt", so it can be a program name with args. set dummy mt; ac_word=$2 @@ -9163,7 +9263,7 @@ fi RC="$tmp" - RC_FLAGS="/l 0x409 /r" + RC_FLAGS="-nologo /l 0x409 /r" if test "x$VARIANT" = xOPT; then : RC_FLAGS="$RC_FLAGS -d NDEBUG" @@ -9303,14 +9403,13 @@ fi COMPILER_TYPE=CL - CFLAGS="$CFLAGS -nologo" - LDFLAGS="$LDFLAGS -nologo -dll -opt:ref -incremental:no " + CCXXFLAGS="$CCXXFLAGS -nologo" + LDFLAGS="$LDFLAGS -nologo -opt:ref -incremental:no" if test "x$LEGACY_HOST_CPU1" = xi586; then LDFLAGS="$LDFLAGS -safeseh" fi - if test "x$DEBUG_LEVEL" != xrelease; then - LDFLAGS="$LDFLAGS -debug" - fi + # TODO: make -debug optional "--disable-full-debug-symbols" + LDFLAGS="$LDFLAGS -debug" fi @@ -9764,7 +9863,7 @@ fi -if test "x$HOST_CPU_BITS" = x32 && test "x$HOST_OS" = macosx; then +if test "x$HOST_CPU_BITS" = x32 && test "x$HOST_OS" = xmacosx; then # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned. # While waiting for a better solution, the current workaround is to use -mstackrealign. CFLAGS="$CFLAGS -mstackrealign" @@ -10499,6 +10598,16 @@ BUILD_LOG_WRAPPER='$(SH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' # (The JVM can use 32 or 64 bit Java pointers but that decision # is made at runtime.) # +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +OLD_CXXFLAGS="$CXXFLAGS" +if test "x$HOST_OS" = xsolaris && test "x$with_data_model" != x; then + CXXFLAGS="-m{$with_data_model} $CXXFLAGS" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } @@ -10662,6 +10771,14 @@ cat >>confdefs.h <<_ACEOF _ACEOF +CXXFLAGS="$OLD_CXXFLAGS" +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + if test "x$ac_cv_sizeof_int_p" = x0; then # The test failed, lets pick the assumed value. ARCH_DATA_MODEL=$HOST_CPU_BITS @@ -10741,12 +10858,16 @@ if test "x$GCC" = xyes; then OBJ_SUFFIX='.o' EXE_SUFFIX='' SET_SHARED_LIBRARY_NAME='-Xlinker -soname=$1' - SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$(JDK_TOPDIR)/$1' + SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$1' + C_FLAG_REORDER='' + CXX_FLAG_REORDER='' SET_SHARED_LIBRARY_ORIGIN='-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$$$ORIGIN/$1' LD="$CC" LDEXE="$CC" LDCXX="$CXX" LDEXECXX="$CXX" + # TODO: for embedded set --strip-unneeded + POST_STRIP_CMD="$STRIP -g" # Linking is different on MacOSX if test "x$BUILD_OS" = xmacosx; then @@ -10759,6 +10880,7 @@ if test "x$GCC" = xyes; then SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' SET_SHARED_LIBRARY_MAPFILE='' SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.' + POST_STRIP_CMD="$STRIP -S" fi else if test "x$BUILD_OS" = xsolaris; then @@ -10774,9 +10896,13 @@ else OBJ_SUFFIX='.o' EXE_SUFFIX='' SET_SHARED_LIBRARY_NAME='' - SET_SHARED_LIBRARY_MAPFILE='-M $(JDK_TOPDIR)/$1' + SET_SHARED_LIBRARY_MAPFILE='-M $1' + C_FLAG_REORDER='-xF' + CXX_FLAG_REORDER='-xF' SET_SHARED_LIBRARY_ORIGIN='-R \$$$$ORIGIN/$1' CFLAGS_JDKLIB_EXTRA='-xstrconst -D__solaris__' + POST_STRIP_CMD="$STRIP -x" + POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\"" fi if test "x$BUILD_OS" = xwindows; then # If it is not gcc, then assume it is the MS Visual Studio compiler @@ -10808,6 +10934,10 @@ fi + + + + # The (cross) compiler is now configured, we can now test capabilities # of the host platform. @@ -11072,30 +11202,30 @@ if test "x$BOOT_JDK_FOUND" = xno; then # Source the builddeps file again, to make sure it uses the latest variables! . $builddepsfile # Look for a host and build machine specific resource! - eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}_HOST_${rewritten_host_var}} + eval resource=\${builddep_boot-jdk_BUILD_${rewritten_build_var}_HOST_${rewritten_host_var}} if test "x$resource" = x; then # Ok, lets instead look for a host specific resource - eval resource=\${builddep_bootjdk_HOST_${rewritten_host_var}} + eval resource=\${builddep_boot-jdk_HOST_${rewritten_host_var}} fi if test "x$resource" = x; then # Ok, lets instead look for a build specific resource - eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}} + eval resource=\${builddep_boot-jdk_BUILD_${rewritten_build_var}} fi if test "x$resource" = x; then # Ok, lets instead look for a generic resource - # (The bootjdk comes from M4 and not the shell, thus no need for eval here.) - resource=${builddep_bootjdk} + # (The boot-jdk comes from M4 and not the shell, thus no need for eval here.) + resource=${builddep_boot-jdk} fi if test "x$resource" != x; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for bootjdk" >&5 -$as_echo "$as_me: Using builddeps $resource for bootjdk" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for boot-jdk" >&5 +$as_echo "$as_me: Using builddeps $resource for boot-jdk" >&6;} # If the resource in the builddeps.conf file is an existing directory, # for example /java/linux/cups if test -d ${resource}; then depdir=${resource} else -# bootjdk is for example mymodule +# boot-jdk is for example mymodule # $resource is for example libs/general/libmymod_1_2_3.zip # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps # $with_builddeps_dir is for example /localhome/builddeps @@ -11108,15 +11238,15 @@ $as_echo "$as_me: Using builddeps $resource for bootjdk" >&6;} extension=${filename#*.} installdir=$with_builddeps_dir/$filebase if test ! -f $installdir/$filename.unpacked; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&5 -$as_echo "$as_me: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency boot-jdk from $with_builddeps_server/$resource and installing into $installdir" >&5 +$as_echo "$as_me: Downloading build dependency boot-jdk from $with_builddeps_server/$resource and installing into $installdir" >&6;} if test ! -d $installdir; then mkdir -p $installdir fi if test ! -d $installdir; then as_fn_error $? "Could not create directory $installdir" "$LINENO" 5 fi - tmpfile=`mktemp $installdir/bootjdk.XXXXXXXXX` + tmpfile=`mktemp $installdir/boot-jdk.XXXXXXXXX` touch $tmpfile if test ! -f $tmpfile; then as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5 @@ -11187,11 +11317,11 @@ $as_echo "$as_me: Downloading build dependency bootjdk from $with_builddeps_serv # was updated to point at the current build dependency install directory. . $builddepsfile # Now extract variables from the builddeps.conf files. - theroot=${builddep_bootjdk_ROOT} - thecflags=${builddep_bootjdk_CFLAGS} - thelibs=${builddep_bootjdk_LIBS} + theroot=${builddep_boot-jdk_ROOT} + thecflags=${builddep_boot-jdk_CFLAGS} + thelibs=${builddep_boot-jdk_LIBS} if test "x$depdir" = x; then - as_fn_error $? "Could not download build dependency bootjdk" "$LINENO" 5 + as_fn_error $? "Could not download build dependency boot-jdk" "$LINENO" 5 fi BOOT_JDK=$depdir if test "x$theroot" != x; then @@ -11220,15 +11350,15 @@ if test "x$BOOT_JDK_FOUND" = xno; then fi # Aha, the user has set a JAVA_HOME # let us use that as the Boot JDK. - BOOT_JDK=$JAVA_HOME + BOOT_JDK="$JAVA_HOME" BOOT_JDK_FOUND=yes # To be on the safe side, lets check that it is a JDK. - if test -x $BOOT_JDK/bin/javac && test -x $BOOT_JDK/bin/java; then - JAVAC=$BOOT_JDK/bin/javac - JAVA=$BOOT_JDK/bin/java + if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then + JAVAC="$BOOT_JDK/bin/javac" + JAVA="$BOOT_JDK/bin/java" BOOT_JDK_FOUND=yes else - as_fn_error $? "Your JAVA_HOME points to a JRE! The build needs a JDK! Please point JAVA_HOME to a JDK." "$LINENO" 5 + as_fn_error $? "Your JAVA_HOME points to a JRE! The build needs a JDK! Please point JAVA_HOME to a JDK. JAVA_HOME=$JAVA_HOME" "$LINENO" 5 fi fi fi @@ -11634,7 +11764,7 @@ $as_echo "yes $BOOT_JDK_VERSION" >&6; } FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'` if test "x$FOUND_VERSION_78" = x; then help_on_build_dependency openjdk - as_fn_error $? "Your bootjdk must be version 7 or 8. $HELP_MSG" "$LINENO" 5 + as_fn_error $? "Your boot-jdk must be version 7 or 8. $HELP_MSG" "$LINENO" 5 fi # When compiling code to be executed by the Boot JDK, force jdk7 compatibility. @@ -11653,7 +11783,7 @@ $as_echo "yes" >&6; } -# Use the javac tool from the Boot JDK. +# Use the javah tool from the Boot JDK. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for javah in Boot JDK" >&5 $as_echo_n "checking for javah in Boot JDK... " >&6; } JAVAH=$BOOT_JDK/bin/javah @@ -11686,6 +11816,17 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# Use the native2ascii tool from the Boot JDK. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native2ascii in Boot JDK" >&5 +$as_echo_n "checking for native2ascii in Boot JDK... " >&6; } +NATIVE2ASCII=$BOOT_JDK/bin/native2ascii +if test ! -x $NATIVE2ASCII; then + as_fn_error $? "Could not find a working native2ascii" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + ############################################################################### # # Pickup additional source for a component from outside of the source root @@ -13135,9 +13276,6 @@ if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then as_fn_error $? "Could not find X11 libraries. $HELP_MSG" "$LINENO" 5 fi - - - # Some of the old makefiles require a setting of OPENWIN_HOME # Since the X11R6 directory has disappeared on later Linuxes, # we need to probe for it. @@ -13154,6 +13292,18 @@ if test "x$HOST_OS" = xsolaris; then fi + +# +# Weird Sol10 something check...TODO change to try compile +# +if test "x${HOST_OS}" = xsolaris; then + if test "`uname -r`" = "5.10"; then + if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then + X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS" + fi + fi +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -13192,6 +13342,9 @@ if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG" "$LINENO" 5 fi + + + ############################################################################### # # The common unix printing system cups is used to print from java. @@ -13216,7 +13369,7 @@ fi if test "x$CUPS_NOT_NEEDED" = xyes; then - if test "x$with_cups" != x || test "x$with_cups-include" != x || test "x$with_cups-lib" != x; then + if test "x${with_cups}" != x || test "x${with_cups_include}" != x || test "x${with_cups_lib}" != x; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cups not used, so --with-cups is ignored" >&5 $as_echo "$as_me: WARNING: cups not used, so --with-cups is ignored" >&2;} fi @@ -13225,21 +13378,21 @@ $as_echo "$as_me: WARNING: cups not used, so --with-cups is ignored" >&2;} else CUPS_FOUND=no - if test "x$with_cups" = xno || test "x$with_cups-include" = xno || test "x$with_cups-lib" = xno; then + if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno || test "x${with_cups_lib}" = xno; then as_fn_error $? "It is not possible to disable the use of cups. Remove the --without-cups option." "$LINENO" 5 fi - if test "x$with_cups" != x; then - CUPS_LIBS="-L$with_cups/lib -lcups" - CUPS_CFLAGS="-I$with_cups/include" + if test "x${with_cups}" != x; then + CUPS_LIBS="-L${with_cups}/lib -lcups" + CUPS_CFLAGS="-I${with_cups}/include" CUPS_FOUND=yes fi - if test "x$with_cups-include" != x; then - CUPS_CFLAGS="-I$with_cups-include" + if test "x${with_cups_include}" != x; then + CUPS_CFLAGS="-I${with_cups_include}" CUPS_FOUND=yes fi - if test "x$with_cups-lib" != x; then - CUPS_LIBS="-L$with_cups-lib -lcups" + if test "x${with_cups_lib}" != x; then + CUPS_LIBS="-L${with_cups_lib} -lcups" CUPS_FOUND=yes fi if test "x$CUPS_FOUND" = xno; then @@ -13796,7 +13949,7 @@ fi if test "x$ALSA_NOT_NEEDED" = xyes; then - if test "x$with_alsa" != x || test "x$with_alsa-include" != x || test "x$with_alsa-lib" != x; then + if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: alsa not used, so --with-alsa is ignored" >&5 $as_echo "$as_me: WARNING: alsa not used, so --with-alsa is ignored" >&2;} fi @@ -13805,21 +13958,21 @@ $as_echo "$as_me: WARNING: alsa not used, so --with-alsa is ignored" >&2;} else ALSA_FOUND=no - if test "x$with_alsa" = xno || test "x$with_alsa-include" = xno || test "x$with_alsa-lib" = xno; then + if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then as_fn_error $? "It is not possible to disable the use of alsa. Remove the --without-alsa option." "$LINENO" 5 fi - if test "x$with_alsa" != x; then - ALSA_LIBS="-L$with_alsa/lib -lalsa" - ALSA_CFLAGS="-I$with_alsa/include" + if test "x${with_alsa}" != x; then + ALSA_LIBS="-L${with_alsa}/lib -lalsa" + ALSA_CFLAGS="-I${with_alsa}/include" ALSA_FOUND=yes fi - if test "x$with_alsa-include" != x; then - ALSA_CFLAGS="-I$with_alsa/include" + if test "x${with_alsa_include}" != x; then + ALSA_CFLAGS="-I${with_alsa_include}" ALSA_FOUND=yes fi - if test "x$with_alsa-lib" != x; then - ALSA_LIBS="-L$with_alsa/lib -lalsa" + if test "x${with_alsa_lib}" != x; then + ALSA_LIBS="-L${with_alsa_lib} -lalsa" ALSA_FOUND=yes fi if test "x$ALSA_FOUND" = xno; then @@ -14090,17 +14243,17 @@ if test "${with_pulse_lib+set}" = set; then : fi -if test "x$with_pulse" != x; then - PULSE_LIBS="-L$with_pulse/lib -lfreetype" - PULSE_CFLAGS="-I$with_pulse/include" +if test "x${with_pulse}" != x; then + PULSE_LIBS="-L${with_pulse}/lib -lfreetype" + PULSE_CFLAGS="-I${with_pulse}/include" PULSE_FOUND=yes fi -if test "x$with_pulse-include" != x; then - PULSE_CFLAGS="-I$with_pulse/include" +if test "x${with_pulse_include}" != x; then + PULSE_CFLAGS="-I${with_pulse_include}" PULSE_FOUND=yes fi -if test "x$with_pulse-lib" != x; then - PULSE_LIBS="-L$with_pulse/lib -lfreetype" +if test "x${with_pulse_lib}" != x; then + PULSE_LIBS="-L${with_pulse_lib} -lpulse" PULSE_FOUND=yes fi if test "x$PULSE_FOUND" = xno; then @@ -14537,9 +14690,9 @@ fi # Check the maths library # -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5 -$as_echo_n "checking for main in -lm... " >&6; } -if test "${ac_cv_lib_m_main+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 +$as_echo_n "checking for cos in -lm... " >&6; } +if test "${ac_cv_lib_m_cos+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14547,27 +14700,33 @@ LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char cos (); int main () { -return main (); +return cos (); ; return 0; } _ACEOF if ac_fn_cxx_try_link "$LINENO"; then : - ac_cv_lib_m_main=yes + ac_cv_lib_m_cos=yes else - ac_cv_lib_m_main=no + ac_cv_lib_m_cos=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_main" >&5 -$as_echo "$ac_cv_lib_m_main" >&6; } -if test "x$ac_cv_lib_m_main" = x""yes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 +$as_echo "$ac_cv_lib_m_cos" >&6; } +if test "x$ac_cv_lib_m_cos" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 _ACEOF @@ -14583,6 +14742,61 @@ fi +############################################################################### +# +# Check for libdl.so + +save_LIBS="$LIBS" +LIBS="" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBDL 1 +_ACEOF + + LIBS="-ldl $LIBS" + +fi + +LIBDL="$LIBS" + +LIBS="$save_LIBS" + ############################################################################### # # Should we run the painfully slow javadoc tool? @@ -14632,6 +14846,9 @@ fi # Setup the opt flags for different compilers # and different operating systems. # +C_FLAG_DEPS="-MMD -MF" +CXX_FLAG_DEPS="-MMD -MF" + case $COMPILER_TYPE in CC ) D_FLAG="-g" @@ -14641,9 +14858,9 @@ case $COMPILER_TYPE in macosx ) # On MacOSX we optimize for size, something # we should do for all platforms? - C_O_FLAG_HI="-O3" + C_O_FLAG_HI="-Os" C_O_FLAG_NORM="-Os" - C_O_FLAG_NONE="-O0" + C_O_FLAG_NONE="" ;; *) C_O_FLAG_HI="-O3" @@ -14656,19 +14873,61 @@ case $COMPILER_TYPE in CXX_O_FLAG_NONE="$C_O_FLAG_NONE" ;; ossc ) + # + # Forte has different names for this with their C++ compiler... + # + CXX_FLAG_DEPS="-xMMD -xMF" + +# Extra options used with HIGHEST +# +# WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be +# done with care, there are some assumptions below that need to +# be understood about the use of pointers, and IEEE behavior. +# +# Use non-standard floating point mode (not IEEE 754) +CC_HIGHEST="$CC_HIGHEST -fns" +# Do some simplification of floating point arithmetic (not IEEE 754) +CC_HIGHEST="$CC_HIGHEST -fsimple" +# Use single precision floating point with 'float' +CC_HIGHEST="$CC_HIGHEST -fsingle" +# Assume memory references via basic pointer types do not alias +# (Source with excessing pointer casting and data access with mixed +# pointer types are not recommended) +CC_HIGHEST="$CC_HIGHEST -xalias_level=basic" +# Use intrinsic or inline versions for math/std functions +# (If you expect perfect errno behavior, do not use this) +CC_HIGHEST="$CC_HIGHEST -xbuiltin=%all" +# Loop data dependency optimizations (need -xO3 or higher) +CC_HIGHEST="$CC_HIGHEST -xdepend" +# Pointer parameters to functions do not overlap +# (Similar to -xalias_level=basic usage, but less obvious sometimes. +# If you pass in multiple pointers to the same data, do not use this) +CC_HIGHEST="$CC_HIGHEST -xrestrict" +# Inline some library routines +# (If you expect perfect errno behavior, do not use this) +CC_HIGHEST="$CC_HIGHEST -xlibmil" +# Use optimized math routines +# (If you expect perfect errno behavior, do not use this) +# Can cause undefined external on Solaris 8 X86 on __sincos, removing for now +#CC_HIGHEST="$CC_HIGHEST -xlibmopt" + case $LEGACY_HOST_CPU1 in i586) + C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xchip=pentium" C_O_FLAG_HI="-xO4 -Wu,-O4~yz" C_O_FLAG_NORM="-xO2 -Wu,-O2~yz" C_O_FLAG_NONE="" + CXX_O_FLAG_HIGHEST="-xO4 -Qoption ube -O4~yz $CC_HIGHEST -xchip=pentium" CXX_O_FLAG_HI="-xO4 -Qoption ube -O4~yz" CXX_O_FLAG_NORM="-xO2 -Qoption ube -O2~yz" CXX_O_FLAG_NONE="" ;; sparc) + C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra" C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0" C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0" C_O_FLAG_NONE="" + CXX_O_FLAG_HIGHEST="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra" CXX_O_FLAG_HI="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0" CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0" CXX_O_FLAG_NONE="" @@ -14687,6 +14946,18 @@ case $COMPILER_TYPE in ;; esac +if test -z "$C_O_FLAG_HIGHEST"; then + C_O_FLAG_HIGHEST="$C_O_FLAG_HI" +fi + +if test -z "$CXX_O_FLAG_HIGHEST"; then + CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HI" +fi + + + + + @@ -14810,16 +15081,17 @@ IMAGES_MAKE_ARGS="ALT_OUTPUTDIR=$OUTPUT_ROOT/jdk \ # case $COMPILER_NAME in gcc ) - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \ + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ + -pipe -fno-omit-frame-pointer \ -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" CFLAGS_JDK="$CFLAGS_JDK -fno-strict-aliasing" ;; ossc ) - CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa REQUIRED -v -mt -norunpath -xnolib" - CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt REQUIRED -features=no%except -DCC_NOEX" + CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -norunpath -xnolib" + CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX" ;; cl ) - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \ + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \ -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \ -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \ -DWIN32 -DIAL" @@ -14898,14 +15170,14 @@ CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK" # # Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh. if test "x$COMPILER_TYPE" = xCL; then - LDFLAGS_JDKLIB="$LDFLAGS -libpath:${JDK_OUTPUTDIR}/lib jvm.lib java.lib" + LDFLAGS_JDKLIB="$LDFLAGS -dll -libpath:${JDK_OUTPUTDIR}/lib -libpath:${JDK_OUTPUTDIR}/objs" LDFLAGS_JDKLIB_SUFFIX="" - if test "x$HOST_CPU_BITS" = "x64"; then - LDFLAGS_JDKEXE="$CFLAGS ${JDK_OUTPUTDIR}/tmp/java/jli/obj64/jli.lib" + if test "$HOST_CPU_BITS" == "64"; then + LDFLAGS_STACK_SIZE=1048576 else - LDFLAGS_JDKEXE="$CFLAGS ${JDK_OUTPUTDIR}/tmp/java/jli/obj/jli.lib" + LDFLAGS_STACK_SIZE=327680 fi - LDFLAGS_JDKEXE_SUFFIX="" + LDFLAGS_JDKEXE="$LDFLAGS /STACK:$LDFLAGS_STACK_SIZE" else # If this is a --hash-style=gnu system, use --hash-style=both, why? HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'` @@ -14920,7 +15192,9 @@ else fi fi - LDFLAGS_JDKLIB="$LDFLAGS $SHARED_LIBRARY_FLAGS -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}server \ + LDFLAGS_JDKLIB="$LDFLAGS $SHARED_LIBRARY_FLAGS \ + -L${JDK_OUTPUTDIR}/objs \ + -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}server \ -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}client \ -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}" LDFLAGS_JDKLIB_SUFFIX="-ljvm -ljava" @@ -14930,8 +15204,10 @@ else # Only the jli library is explicitly linked when the launchers are built. # The libjvm is then dynamically loaded/linked by the launcher. - LDFLAGS_JDKEXE="$LDFLAGS -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}jli" - LDFLAGS_JDKEXE_SUFFIX="-ljli" + if test "x$HOST_OS" != "xmacosx"; then + LDFLAGS_JDKEXE="$LDFLAGS -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}jli" + LDFLAGS_JDKEXE_SUFFIX="-ljli" + fi fi @@ -15081,10 +15357,25 @@ fi # Could someone enlighten this configure script with a comment about libCrun? # The LEGACY_HOST_CPU3 is the setting for ISA_DIR. # -if test "x$HOST_OS" = xsolaris; then - LIBCXX="$LIBCXX /usr/lib${LEGACY_HOST_CPU3}/libCrun.so.1" +if test "x$HOST_OS" = xsolaris && test "x$LIBCXX" = x; then + LIBCXX="/usr/lib${LEGACY_HOST_CPU3}/libCrun.so.1" fi +# TODO better (platform agnostic) test +if test "x$HOST_OS" = xmacosx && test "x$LIBCXX" = x && test "x$GCC" = xyes; then + LIBCXX="-lstdc++" +fi + + + +############################################################################### + +OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`" +OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`" +OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`" +OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`" + + ############################################################################### @@ -15092,6 +15383,13 @@ fi # Misc # +# The name of the Service Agent jar. +SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}" +if test "x$HOST_OS" = "xwindows"; then + SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" +fi + + # Control wether Hotspot runs Queens test after build. # Check whether --enable-hotspot-test-in-build was given. if test "${enable_hotspot_test_in_build+set}" = set; then : @@ -15109,19 +15407,48 @@ fi ############################################################################### # -# A helpful message at the end of the configure run. +# Choose cacerts source file # -if test "x$CCACHE_FOUND" = x && test "x$GCC" = xyes; then - help_on_build_dependency ccache - printf "\nTip of the day:\nYou should really install ccache version 3.1.4 or newer.\n" - printf "It gives a tremendous speedup for C++ recompilations with precompiled headers!\n" +# Check whether --with-cacerts-file was given. +if test "${with_cacerts_file+set}" = set; then : + withval=$with_cacerts_file; fi -if test "x$CCACHE_FOUND" != x && test "x$HAS_GOOD_CCACHE" = x; then - printf "You have a ccache installed, but it is a version prior to 3.1.4. Try upgrading.\n" +if test "x$with_cacerts_file" != x; then + CACERTS_FILE=$with_cacerts_file +else + if test "x$OPENJDK" = "xtrue"; then + CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts + else + CACERTS_FILE=${SRC_ROOT}/jdk/src/closed/share/lib/security/cacerts.internal + fi fi + +# Check if build directory is on local disk. +# return 0 if it is on local disk, non-0 if on remote disk or failure +function is_directory_on_local_disk { + # df -l lists only local disks; if the given directory is not found then + # a non-zero exit code is given + $DF -l $1 > /dev/null 2>&1 +} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if build directory is on local disk" >&5 +$as_echo_n "checking if build directory is on local disk... " >&6; } +if is_directory_on_local_disk $OUTPUT_ROOT; then + OUTPUT_DIR_IS_LOCAL="yes" +else + OUTPUT_DIR_IS_LOCAL="no" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_DIR_IS_LOCAL" >&5 +$as_echo "$OUTPUT_DIR_IS_LOCAL" >&6; } + +# We're messing a bit with internal autoconf variables to put the config.status in the +# output directory instead of the current directory. +CONFIG_STATUS=$OUTPUT_ROOT/config.status + +# Now create the actual output files, after this, the main work of configure is done cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -16393,3 +16720,62 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + +# Finally output some useful information to the user + +if test "x$CCACHE_FOUND" != x; then + if test "x$HAS_GOOD_CCACHE" = x; then + CCACHE_STATUS="installed, but disabled (version older than 3.1.4)" + CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading." + else + CCACHE_STATUS="installed and in use" + fi +else + if test "x$GCC" = xyes; then + CCACHE_STATUS="not installed (consider installing)" + CCACHE_HELP_MSG="You do not have ccache installed. Try installing it." + else + CCACHE_STATUS="not available for your system" + fi +fi + +printf "\n" +printf "====================================================\n" +printf "A new configuration has been successfully created in\n" +printf "$OUTPUT_ROOT\n" +if test "x$CONFIGURE_COMMAND_LINE" != x; then + printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n" +else + printf "using default settings.\n" +fi + +printf "\n" +printf "Configuration summary:\n" +printf "* Debug level: $DEBUG_LEVEL\n" +printf "* JDK variant: $JDK_VARIANT\n" +printf "* JVM variants: $with_jvm_variants\n" +printf "* Host info: OS: $HOST_OS, CPU architecture: $HOST_CPU_ARCH, address length: $HOST_CPU_BITS\n" +printf "* Boot JDK: $BOOT_JDK\n" + +printf "\n" +printf "Build performance summary:\n" +printf "* Cores to use: $NUM_CORES\n" +printf "* Memory limit: $MEMORY_SIZE MB\n" +printf "* ccache status: $CCACHE_STATUS\n" + +if test "x$OUTPUT_DIR_IS_LOCAL" != "xyes"; then + printf "\n" + printf "WARNING: Your build output directory is not on a local disk.\n" + printf "This will severely degrade build performance!\n" + printf "It is recommended that you create an output directory on a local disk,\n" + printf "and run the configure script again from that directory.\n" +fi + +if test "x$CCACHE_HELP_MSG" != x; then + printf "\n" + printf "Build performance tip: ccache gives a tremendous speedup for C++ recompilations.\n" + printf "$CCACHE_HELP_MSG\n" + + help_on_build_dependency ccache + printf "$HELP_MSG\n" +fi diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac index 4c6b326ecaf..be678cc2f15 100644 --- a/common/autoconf/configure.ac +++ b/common/autoconf/configure.ac @@ -93,7 +93,7 @@ AC_PATH_PROGS(MAKE, [gmake make]) CHECK_NONEMPTY(MAKE) MAKE_VERSION=`$MAKE --version | head -n 1 | grep '3.8[[12346789]]'` if test "x$MAKE_VERSION" = x; then - AC_ERROR([You must use GNU make 3.81 or newer! Please put it in the path.]) + AC_MSG_ERROR([You must use GNU make 3.81 or newer! Please put it in the path.]) fi AC_PATH_PROG(MKDIR, mkdir) CHECK_NONEMPTY(MKDIR) @@ -147,6 +147,8 @@ AC_PATH_PROG(EXPR, expr) CHECK_NONEMPTY(EXPR) AC_PATH_PROG(FILE, file) CHECK_NONEMPTY(FILE) +AC_PATH_PROG(HG, hg) + # Figure out the build and host system. AC_CANONICAL_BUILD AC_CANONICAL_HOST @@ -157,7 +159,7 @@ AC_ARG_WITH(data-model, [AS_HELP_STRING([--with-data-model], if test "x$with_data_model" != x && \ test "x$with_data_model" != x32 && \ test "x$with_data_model" != x64 ; then - AC_ERROR([The data model can only be 32 or 64!]) + AC_MSG_ERROR([The data model can only be 32 or 64!]) fi # Translate the standard cpu-vendor-kernel-os quadruplets into # the new HOST_.... and BUILD_... and the legacy names used by @@ -221,7 +223,7 @@ AC_PATH_PROG(CYGPATH, cygpath) PATH_SEP=":" if test "x$BUILD_OS" = "xwindows"; then if test "x$CYGPATH" = x; then - AC_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path]) + AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path]) fi PATH_SEP=";" fi @@ -239,12 +241,12 @@ fi # # OpenJDK or closed # -AC_ARG_ENABLE([openjdk], [AS_HELP_STRING([--enable-openjdk], +AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only], [build OpenJDK regardless of the presence of closed repositories @<:@disabled@:>@])],,) -if test "x$enable_openjdk" = "xyes"; then +if test "x$enable_openjdk_only" = "xyes"; then OPENJDK=true -elif test "x$enable_openjdk" = "xno"; then +elif test "x$enable_openjdk_only" = "xno"; then OPENJDK=false elif test -d "$SRC_ROOT/jdk/src/closed"; then OPENJDK=false @@ -298,7 +300,7 @@ elif test "x$with_jdk_variant" = xembedded; then MINIMIZE_RAM_USAGE="MINIMIZE_RAM_USAGE:=true" JDK_VARIANT="embedded" else - AC_ERROR([The available JDK variants are: normal, embedded]) + AC_MSG_ERROR([The available JDK variants are: normal, embedded]) fi AC_SUBST(JAVASE_EMBEDDED) @@ -370,7 +372,7 @@ JVM_VARIANTS=",$with_jvm_variants," TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'` if test "x$TEST_VARIANTS" != "x,"; then - AC_ERROR([The available JVM variants are: server, client, kernel, zero, zeroshark]) + AC_MSG_ERROR([The available JVM variants are: server, client, kernel, zero, zeroshark]) fi AC_MSG_RESULT([$with_jvm_variants]) @@ -382,12 +384,12 @@ JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false if test "x$JVM_VARIANT_CLIENT" = xtrue; then if test "x$HOST_CPU_BITS" = x64; then - AC_ERROR([You cannot build a client JVM for a 64-bit machine.]) + AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.]) fi fi if test "x$JVM_VARIANT_KERNEL" = xtrue; then if test "x$HOST_CPU_BITS" = x64; then - AC_ERROR([You cannot build a kernel JVM for a 64-bit machine.]) + AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.]) fi fi @@ -426,7 +428,7 @@ AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level], [ DEBUG_LEVEL="${withval}" if test "x$ENABLE_DEBUG" = xyes; then - AC_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.]) + AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.]) fi ]) AC_MSG_RESULT([$DEBUG_LEVEL]) @@ -434,7 +436,7 @@ AC_MSG_RESULT([$DEBUG_LEVEL]) if test "x$DEBUG_LEVEL" != xrelease && \ test "x$DEBUG_LEVEL" != xfastdebug && \ test "x$DEBUG_LEVEL" != xslowdebug; then - AC_ERROR([Allowed debug levels are: release, fastdebug and slowdebug]) + AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug]) fi case $DEBUG_LEVEL in @@ -520,14 +522,18 @@ AC_SUBST(COOKED_BUILD_NUMBER) if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then # We are running configure from the src root. # Create a default ./build/host-variant-debuglevel output root. - OUTPUT_ROOT="$SRC_ROOT/build/${HOST_OS}-${HOST_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}" + CONF_NAME="${HOST_OS}-${HOST_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}" + OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}" mkdir -p "$OUTPUT_ROOT" if test ! -d "$OUTPUT_ROOT"; then - AC_ERROR([Could not create build directory $OUTPUT_ROOT]) + AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT]) fi else # We are running configure from outside of the src dir. # Then use the current directory as output dir! + # If configuration is situated in normal build directory, just use the build + # directory name as configuration name, otherwise use the complete path. + CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"` OUTPUT_ROOT="$CURDIR" fi @@ -565,7 +571,7 @@ if test "x$BUILD_OS" = "xwindows"; then if test "x$VARSBAT" = x || test ! -d "$VCPATH"; then AC_MSG_CHECKING([if we can find the VS installation]) AC_MSG_RESULT([no]) - AC_ERROR([Tried to find a VS installation using both $SEARCH_ROOT but failed. Please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.]) + AC_MSG_ERROR([Tried to find a VS installation using both $SEARCH_ROOT but failed. Please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.]) fi case "$LEGACY_HOST_CPU1" in i?86) @@ -577,12 +583,12 @@ if test "x$BUILD_OS" = "xwindows"; then esac # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat cd $OUTPUT_ROOT - $SRC_ROOT/common/bin/extractvcvars.sh "$VARSBAT" "$VARSBAT_ARCH" + bash $SRC_ROOT/common/bin/extractvcvars.sh "$VARSBAT" "$VARSBAT_ARCH" cd $CURDIR if test ! -s $OUTPUT_ROOT/localdevenv.sh || test ! -s $OUTPUT_ROOT/localdevenv.gmk; then AC_MSG_CHECKING([if we can extract the needed env variables]) AC_MSG_RESULT([no]) - AC_ERROR([Could not succesfully extract the env variables needed for the VS setup. Please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.]) + AC_MSG_ERROR([Could not succesfully extract the env variables needed for the VS setup. Please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.]) fi # Now set all paths and other env variables. This will allow the rest of # the configure script to find and run the compiler in the proper way. @@ -592,7 +598,7 @@ if test "x$BUILD_OS" = "xwindows"; then AC_MSG_RESULT([$VCINSTALLDIR]) else AC_MSG_RESULT([no]) - AC_ERROR([Could not find VS installation. Please install. If you are sure you have installed VS, then please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.]) + AC_MSG_ERROR([Could not find VS installation. Please install. If you are sure you have installed VS, then please run "c:\\cygwin\\bin\\bash.exe -l" from a VS command prompt and then run configure/make from there.]) fi CHECK_FOR_VCINSTALLDIR=no SETUPDEVENV="include $OUTPUT_ROOT/localdevenv.gmk" @@ -614,7 +620,7 @@ if test "x$BUILD_OS" = "xwindows"; then fi if test "x$MSVCR100DLL" = x; then AC_MSG_RESULT([no]) - AC_ERROR([Could not find msvcr100.dll !]) + AC_MSG_ERROR([Could not find msvcr100.dll !]) fi AC_MSG_RESULT([$MSVCR100DLL]) SPACESAFE(MSVCR100DLL,[the path to msvcr100.dll]) @@ -636,6 +642,7 @@ AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk) +AC_SUBST(CONF_NAME, $CONF_NAME) AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) # Where are the sources. Any of these can be overridden @@ -783,13 +790,15 @@ ORG_CFLAGS="$CFLAGS" ORG_CXXFLAGS="$CXXFLAGS" ORG_OBJCFLAGS="$OBJCFLAGS" +prepare_help_system + # gcc is almost always present, but on Windows we # prefer cl.exe and on Solaris we prefer CC. # Thus test for them in this order. AC_PROG_CC([cl cc gcc]) if test "x$CC" = x; then help_on_build_dependency devkit - AC_ERROR([Could not find a compiler. $HELP_MSG]) + AC_MSG_ERROR([Could not find a compiler. $HELP_MSG]) fi if test "x$CC" = xcc && test "x$BUILD_OS" = xmacosx; then # Do not use cc on MacOSX use gcc instead. @@ -807,7 +816,7 @@ WHICHCMD(CXX) if test "x$CXX" = x || test "x$CC" = x; then help_on_build_dependency devkit - AC_ERROR([Could not find the needed compilers! $HELP_MSG ]) + AC_MSG_ERROR([Could not find the needed compilers! $HELP_MSG ]) fi if test "x$BUILD_OS" != xwindows; then @@ -832,9 +841,10 @@ fi AC_CHECK_TOOL(LD, ld) WHICHCMD(LD) -LDEXE="$LD" -LDCXX="$LD" -LDEXECXX="$LD" +LD="$CC" +LDEXE="$CC" +LDCXX="$CXX" +LDEXECXX="$CXX" # LDEXE is the linker to use, when creating executables. AC_SUBST(LDEXE) # Linking C++ libraries. @@ -856,7 +866,7 @@ COMPILER_TYPE=CC AS_IF([test "x$BUILD_OS" = xwindows], [ # For now, assume that we are always compiling using cl.exe. CC_OUT_OPTION=-Fo - EXE_OUT_OPTION=-Fe + EXE_OUT_OPTION=-out: LD_OUT_OPTION=-out: AR_OUT_OPTION=-out: # On Windows, reject /usr/bin/link, which is a cygwin @@ -866,10 +876,9 @@ AS_IF([test "x$BUILD_OS" = xwindows], [ # the full path to the link.exe program. WHICHCMD_SPACESAFE([WINLD]) LD="$WINLD" - # However creating executables can only be done with cl.exe. - LDEXE="$CC" + LDEXE="$WINLD" LDCXX="$WINLD" - LDEXECXX="$CC" + LDEXECXX="$WINLD" AC_CHECK_PROG([MT], [mt], [mt],,, [/usr/bin/mt]) WHICHCMD_SPACESAFE([MT]) @@ -877,7 +886,7 @@ AS_IF([test "x$BUILD_OS" = xwindows], [ AC_CHECK_PROG([RC], [rc], [rc],,, [/usr/bin/rc]) WHICHCMD_SPACESAFE([RC]) - RC_FLAGS="/l 0x409 /r" + RC_FLAGS="-nologo /l 0x409 /r" AS_IF([test "x$VARIANT" = xOPT], [ RC_FLAGS="$RC_FLAGS -d NDEBUG" ]) @@ -903,14 +912,13 @@ AS_IF([test "x$BUILD_OS" = xwindows], [ WHICHCMD_SPACESAFE([DUMPBIN]) COMPILER_TYPE=CL - CFLAGS="$CFLAGS -nologo" - LDFLAGS="$LDFLAGS -nologo -dll -opt:ref -incremental:no " + CCXXFLAGS="$CCXXFLAGS -nologo" + LDFLAGS="$LDFLAGS -nologo -opt:ref -incremental:no" if test "x$LEGACY_HOST_CPU1" = xi586; then LDFLAGS="$LDFLAGS -safeseh" fi - if test "x$DEBUG_LEVEL" != xrelease; then - LDFLAGS="$LDFLAGS -debug" - fi + # TODO: make -debug optional "--disable-full-debug-symbols" + LDFLAGS="$LDFLAGS -debug" ]) AC_SUBST(RC_FLAGS) AC_SUBST(COMPILER_TYPE) @@ -933,7 +941,7 @@ fi AC_SUBST(AS) AC_SUBST(ASFLAGS) -if test "x$HOST_CPU_BITS" = x32 && test "x$HOST_OS" = macosx; then +if test "x$HOST_CPU_BITS" = x32 && test "x$HOST_OS" = xmacosx; then # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned. # While waiting for a better solution, the current workaround is to use -mstackrealign. CFLAGS="$CFLAGS -mstackrealign" @@ -944,7 +952,7 @@ if test "x$HOST_CPU_BITS" = x32 && test "x$HOST_OS" = macosx; then ], [ AC_MSG_RESULT([no]) - AC_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.]) + AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.]) ]) fi @@ -979,7 +987,7 @@ if test "x$BUILD_OS" = xwindows; then if test ! -x $OUTPUT_ROOT/uncygdrive.exe; then AC_MSG_RESULT([no]) cat $OUTPUT_ROOT/uncygdrive1.log - AC_ERROR([Could not create $OUTPUT_ROOT/uncygdrive.exe]) + AC_MSG_ERROR([Could not create $OUTPUT_ROOT/uncygdrive.exe]) fi AC_MSG_RESULT([$UNCYGDRIVE]) AC_MSG_CHECKING([if uncygdrive.exe works]) @@ -989,7 +997,7 @@ if test "x$BUILD_OS" = xwindows; then if test ! -x $OUTPUT_ROOT/uncygdrive2.exe; then AC_MSG_RESULT([no]) cat $OUTPUT_ROOT/uncygdrive2.log - AC_ERROR([Uncygdrive did not work!]) + AC_MSG_ERROR([Uncygdrive did not work!]) fi AC_MSG_RESULT([yes]) rm -f $OUTPUT_ROOT/uncygdrive?.??? $OUTPUT_ROOT/uncygdrive.obj @@ -1014,7 +1022,15 @@ AC_SUBST(BUILD_LOG_WRAPPER) # (The JVM can use 32 or 64 bit Java pointers but that decision # is made at runtime.) # +AC_LANG_PUSH(C++) +OLD_CXXFLAGS="$CXXFLAGS" +if test "x$HOST_OS" = xsolaris && test "x$with_data_model" != x; then + CXXFLAGS="-m{$with_data_model} $CXXFLAGS" +fi AC_CHECK_SIZEOF([int *], [1111]) +CXXFLAGS="$OLD_CXXFLAGS" +AC_LANG_POP(C++) + if test "x$ac_cv_sizeof_int_p" = x0; then # The test failed, lets pick the assumed value. ARCH_DATA_MODEL=$HOST_CPU_BITS @@ -1032,7 +1048,7 @@ AC_SUBST(LP64,$A_LP64) AC_SUBST(ARCH_DATA_MODEL) if test "x$ARCH_DATA_MODEL" != "x$HOST_CPU_BITS"; then - AC_ERROR([The tested number of bits in the host ($ARCH_DATA_MODEL) differs from the number of bits expected to be found in the host ($HOST_CPU_BITS)]) + AC_MSG_ERROR([The tested number of bits in the host ($ARCH_DATA_MODEL) differs from the number of bits expected to be found in the host ($HOST_CPU_BITS)]) fi ############################################################################### @@ -1084,12 +1100,16 @@ if test "x$GCC" = xyes; then OBJ_SUFFIX='.o' EXE_SUFFIX='' SET_SHARED_LIBRARY_NAME='-Xlinker -soname=$1' - SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$(JDK_TOPDIR)/$1' + SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=$1' + C_FLAG_REORDER='' + CXX_FLAG_REORDER='' SET_SHARED_LIBRARY_ORIGIN='-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$$$ORIGIN/$1' LD="$CC" LDEXE="$CC" LDCXX="$CXX" LDEXECXX="$CXX" + # TODO: for embedded set --strip-unneeded + POST_STRIP_CMD="$STRIP -g" # Linking is different on MacOSX if test "x$BUILD_OS" = xmacosx; then @@ -1102,6 +1122,7 @@ if test "x$GCC" = xyes; then SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/$1' SET_SHARED_LIBRARY_MAPFILE='' SET_SHARED_LIBRARY_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.' + POST_STRIP_CMD="$STRIP -S" fi else if test "x$BUILD_OS" = xsolaris; then @@ -1117,9 +1138,13 @@ else OBJ_SUFFIX='.o' EXE_SUFFIX='' SET_SHARED_LIBRARY_NAME='' - SET_SHARED_LIBRARY_MAPFILE='-M $(JDK_TOPDIR)/$1' + SET_SHARED_LIBRARY_MAPFILE='-M $1' + C_FLAG_REORDER='-xF' + CXX_FLAG_REORDER='-xF' SET_SHARED_LIBRARY_ORIGIN='-R \$$$$ORIGIN/$1' CFLAGS_JDKLIB_EXTRA='-xstrconst -D__solaris__' + POST_STRIP_CMD="$STRIP -x" + POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\"" fi if test "x$BUILD_OS" = xwindows; then # If it is not gcc, then assume it is the MS Visual Studio compiler @@ -1149,7 +1174,11 @@ AC_SUBST(EXE_SUFFIX) AC_SUBST(SHARED_LIBRARY_FLAGS) AC_SUBST(SET_SHARED_LIBRARY_NAME) AC_SUBST(SET_SHARED_LIBRARY_MAPFILE) +AC_SUBST(C_FLAG_REORDER) +AC_SUBST(CXX_FLAG_REORDER) AC_SUBST(SET_SHARED_LIBRARY_ORIGIN) +AC_SUBST(POST_STRIP_CMD) +AC_SUBST(POST_MCS_CMD) # The (cross) compiler is now configured, we can now test capabilities # of the host platform. @@ -1161,13 +1190,13 @@ AC_SUBST(SET_SHARED_LIBRARY_ORIGIN) AC_C_BIGENDIAN([ENDIAN="big"],[ENDIAN="little"],[ENDIAN="unknown"],[ENDIAN="universal"]) if test "x$ENDIAN" = xuniversal; then - AC_ERROR([It seems like someone needs to decide how we are to deal with universal binaries on the MacOSX?]) + AC_MSG_ERROR([It seems like someone needs to decide how we are to deal with universal binaries on the MacOSX?]) fi if test "x$ENDIAN" = xunknown; then ENDIAN="$HOST_CPU_ENDIAN" fi if test "x$ENDIAN" != "x$HOST_CPU_ENDIAN"; then - AC_WARN([The tested endian in the host ($ENDIAN) differs from the endian expected to be found in the host ($HOST_CPU_ENDIAN)]) + AC_MSG_WARN([The tested endian in the host ($ENDIAN) differs from the endian expected to be found in the host ($HOST_CPU_ENDIAN)]) ENDIAN="$HOST_CPU_ENDIAN" fi AC_SUBST(ENDIAN) @@ -1185,25 +1214,25 @@ if test "x$with_boot_jdk" != x; then BOOT_JDK_FOUND=yes fi if test "x$BOOT_JDK_FOUND" = xno; then - BDEPS_CHECK_MODULE(BOOT_JDK, bootjdk, xxx, [BOOT_JDK_FOUND=yes], [BOOT_JDK_FOUND=no]) + BDEPS_CHECK_MODULE(BOOT_JDK, boot-jdk, xxx, [BOOT_JDK_FOUND=yes], [BOOT_JDK_FOUND=no]) fi if test "x$BOOT_JDK_FOUND" = xno; then if test "x$JAVA_HOME" != x; then if test ! -d "$JAVA_HOME"; then - AC_ERROR([Your JAVA_HOME points to a non-existing directory!]) + AC_MSG_ERROR([Your JAVA_HOME points to a non-existing directory!]) fi # Aha, the user has set a JAVA_HOME # let us use that as the Boot JDK. - BOOT_JDK=$JAVA_HOME + BOOT_JDK="$JAVA_HOME" BOOT_JDK_FOUND=yes # To be on the safe side, lets check that it is a JDK. - if test -x $BOOT_JDK/bin/javac && test -x $BOOT_JDK/bin/java; then - JAVAC=$BOOT_JDK/bin/javac - JAVA=$BOOT_JDK/bin/java + if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then + JAVAC="$BOOT_JDK/bin/javac" + JAVA="$BOOT_JDK/bin/java" BOOT_JDK_FOUND=yes else - AC_ERROR([Your JAVA_HOME points to a JRE! The build needs a JDK! Please point JAVA_HOME to a JDK.]) + AC_MSG_ERROR([Your JAVA_HOME points to a JRE! The build needs a JDK! Please point JAVA_HOME to a JDK. JAVA_HOME=[$]JAVA_HOME]) fi fi fi @@ -1260,11 +1289,11 @@ if test "x$BOOT_JDK_FOUND" = xno; then fi if test "x$BOOT_JDK_FOUND" = xno; then help_on_build_dependency openjdk - AC_ERROR([Found a JRE, not not a JDK! Please remove the JRE from your path and put a JDK there instead. $HELP_MSG]) + AC_MSG_ERROR([Found a JRE, not not a JDK! Please remove the JRE from your path and put a JDK there instead. $HELP_MSG]) fi else help_on_build_dependency openjdk - AC_ERROR([Could not find a JDK. $HELP_MSG]) + AC_MSG_ERROR([Could not find a JDK. $HELP_MSG]) fi fi @@ -1281,7 +1310,7 @@ if test ! -f $BOOT_RTJAR; then # On MacOSX it is called classes.jar BOOT_RTJAR=$BOOT_JDK/../Classes/classes.jar if test ! -f $BOOT_RTJAR; then - AC_ERROR([Cannot find the rt.jar or its equivalent!]) + AC_MSG_ERROR([Cannot find the rt.jar or its equivalent!]) fi # Remove the .. BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}" @@ -1303,7 +1332,7 @@ AC_MSG_RESULT([$BOOT_TOOLSJAR]) AC_MSG_CHECKING([for java in Boot JDK]) JAVA=$BOOT_JDK/bin/java if test ! -x $JAVA; then - AC_ERROR([Could not find a working java]) + AC_MSG_ERROR([Could not find a working java]) fi BOOT_JDK_VERSION=`$JAVA -version 2>&1 | head -n 1` AC_MSG_RESULT([yes $BOOT_JDK_VERSION]) @@ -1313,7 +1342,7 @@ AC_SUBST(JAVA) [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep '\"1\.[78]\.'`] if test "x$FOUND_VERSION_78" = x; then help_on_build_dependency openjdk - AC_ERROR([Your bootjdk must be version 7 or 8. $HELP_MSG]) + AC_MSG_ERROR([Your boot-jdk must be version 7 or 8. $HELP_MSG]) fi # When compiling code to be executed by the Boot JDK, force jdk7 compatibility. @@ -1324,17 +1353,17 @@ AC_SUBST(BOOT_JDK_SOURCETARGET) AC_MSG_CHECKING([for javac in Boot JDK]) JAVAC=$BOOT_JDK/bin/javac if test ! -x $JAVAC; then - AC_ERROR([Could not find a working javac]) + AC_MSG_ERROR([Could not find a working javac]) fi AC_MSG_RESULT(yes) AC_SUBST(JAVAC) AC_SUBST(JAVAC_FLAGS) -# Use the javac tool from the Boot JDK. +# Use the javah tool from the Boot JDK. AC_MSG_CHECKING([for javah in Boot JDK]) JAVAH=$BOOT_JDK/bin/javah if test ! -x $JAVAH; then - AC_ERROR([Could not find a working javah]) + AC_MSG_ERROR([Could not find a working javah]) fi AC_MSG_RESULT(yes) AC_SUBST(JAVAH) @@ -1343,7 +1372,7 @@ AC_SUBST(JAVAH) AC_MSG_CHECKING([for jar in Boot JDK]) JAR=$BOOT_JDK/bin/jar if test ! -x $JAR; then - AC_ERROR([Could not find a working jar]) + AC_MSG_ERROR([Could not find a working jar]) fi AC_SUBST(JAR) AC_MSG_RESULT(yes) @@ -1352,11 +1381,20 @@ AC_MSG_RESULT(yes) AC_MSG_CHECKING([for rmic in Boot JDK]) RMIC=$BOOT_JDK/bin/rmic if test ! -x $RMIC; then - AC_ERROR([Could not find a working rmic]) + AC_MSG_ERROR([Could not find a working rmic]) fi AC_SUBST(RMIC) AC_MSG_RESULT(yes) +# Use the native2ascii tool from the Boot JDK. +AC_MSG_CHECKING([for native2ascii in Boot JDK]) +NATIVE2ASCII=$BOOT_JDK/bin/native2ascii +if test ! -x $NATIVE2ASCII; then + AC_MSG_ERROR([Could not find a working native2ascii]) +fi +AC_MSG_RESULT(yes) +AC_SUBST(NATIVE2ASCII) + ############################################################################### # # Pickup additional source for a component from outside of the source root @@ -1382,7 +1420,7 @@ fi if test "x$with_add_source_root" != x; then if ! test -d $with_add_source_root; then - AC_ERROR([Trying to use a non-existant add-source-root $with_add_source_root]) + AC_MSG_ERROR([Trying to use a non-existant add-source-root $with_add_source_root]) fi CURDIR="$PWD" cd "$with_add_source_root" @@ -1392,34 +1430,34 @@ if test "x$with_add_source_root" != x; then # If it does, then it is usually an error, prevent this. if test -f $with_add_source_root/langtools/makefiles/Makefile || \ test -f $with_add_source_root/langtools/make/Makefile; then - AC_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.]) + AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.]) fi if test -f $with_add_source_root/corba/makefiles/Makefile || \ test -f $with_add_source_root/corba/make/Makefile; then - AC_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.]) + AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.]) fi if test -f $with_add_source_root/jaxp/makefiles/Makefile || \ test -f $with_add_source_root/jaxp/make/Makefile; then - AC_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.]) + AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.]) fi if test -f $with_add_source_root/jaxws/makefiles/Makefile || \ test -f $with_add_source_root/jaxws/make/Makefile; then - AC_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.]) + AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.]) fi if test -f $with_add_source_root/hotspot/makefiles/Makefile || \ test -f $with_add_source_root/hotspot/make/Makefile; then - AC_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.]) + AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.]) fi if test -f $with_add_source_root/jdk/makefiles/Makefile || \ test -f $with_add_source_root/jdk/make/Makefile; then - AC_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.]) + AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.]) fi fi AC_SUBST(ADD_SRC_ROOT) if test "x$with_override_source_root" != x; then if ! test -d $with_override_source_root; then - AC_ERROR([Trying to use a non-existant override-source-root $with_override_source_root]) + AC_MSG_ERROR([Trying to use a non-existant override-source-root $with_override_source_root]) fi CURDIR="$PWD" cd "$with_override_source_root" @@ -1427,27 +1465,27 @@ if test "x$with_override_source_root" != x; then cd "$CURDIR" if test -f $with_override_source_root/langtools/makefiles/Makefile || \ test -f $with_override_source_root/langtools/make/Makefile; then - AC_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.]) + AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.]) fi if test -f $with_override_source_root/corba/makefiles/Makefile || \ test -f $with_override_source_root/corba/make/Makefile; then - AC_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.]) + AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.]) fi if test -f $with_override_source_root/jaxp/makefiles/Makefile || \ test -f $with_override_source_root/jaxp/make/Makefile; then - AC_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.]) + AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.]) fi if test -f $with_override_source_root/jaxws/makefiles/Makefile || \ test -f $with_override_source_root/jaxws/make/Makefile; then - AC_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.]) + AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.]) fi if test -f $with_override_source_root/hotspot/makefiles/Makefile || \ test -f $with_override_source_root/hotspot/make/Makefile; then - AC_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.]) + AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.]) fi if test -f $with_override_source_root/jdk/makefiles/Makefile || \ test -f $with_override_source_root/jdk/make/Makefile; then - AC_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.]) + AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.]) fi fi AC_SUBST(OVERRIDE_SRC_ROOT) @@ -1495,7 +1533,7 @@ if test "x$with_override_langtools" != x; then LANGTOOLS_TOPDIR="`pwd`" cd "$CURDIR" if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then - AC_ERROR([You have to override langtools with a full langtools repo!]) + AC_MSG_ERROR([You have to override langtools with a full langtools repo!]) fi AC_MSG_CHECKING([if langtools should be overridden]) AC_MSG_RESULT([yes with $LANGTOOLS_TOPDIR]) @@ -1506,7 +1544,7 @@ if test "x$with_override_corba" != x; then CORBA_TOPDIR="`pwd`" cd "$CURDIR" if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then - AC_ERROR([You have to override corba with a full corba repo!]) + AC_MSG_ERROR([You have to override corba with a full corba repo!]) fi AC_MSG_CHECKING([if corba should be overridden]) AC_MSG_RESULT([yes with $CORBA_TOPDIR]) @@ -1517,7 +1555,7 @@ if test "x$with_override_jaxp" != x; then JAXP_TOPDIR="`pwd`" cd "$CURDIR" if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then - AC_ERROR([You have to override jaxp with a full jaxp repo!]) + AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!]) fi AC_MSG_CHECKING([if jaxp should be overridden]) AC_MSG_RESULT([yes with $JAXP_TOPDIR]) @@ -1528,7 +1566,7 @@ if test "x$with_override_jaxws" != x; then JAXWS_TOPDIR="`pwd`" cd "$CURDIR" if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then - AC_ERROR([You have to override jaxws with a full jaxws repo!]) + AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!]) fi AC_MSG_CHECKING([if jaxws should be overridden]) AC_MSG_RESULT([yes with $JAXWS_TOPDIR]) @@ -1540,7 +1578,7 @@ if test "x$with_override_hotspot" != x; then cd "$CURDIR" if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \ ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then - AC_ERROR([You have to override hotspot with a full hotspot repo!]) + AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!]) fi AC_MSG_CHECKING([if hotspot should be overridden]) AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR]) @@ -1551,7 +1589,7 @@ if test "x$with_override_jdk" != x; then JDK_TOPDIR="`pwd`" cd "$CURDIR" if ! test -f $JDK_TOPDIR/makefiles/Makefile; then - AC_ERROR([You have to override JDK with a full JDK repo!]) + AC_MSG_ERROR([You have to override JDK with a full JDK repo!]) fi AC_MSG_CHECKING([if JDK should be overridden]) AC_MSG_RESULT([yes with $JDK_TOPDIR]) @@ -1605,7 +1643,7 @@ if test "x$with_server_java" != x; then SERVER_JAVA="$with_server_java" FOUND_VERSION=`$SERVER_JAVA -version 2>&1 | grep " version \""` if test "x$FOUND_VERSION" = x; then - AC_ERROR([Could not execute server java: $SERVER_JAVA]) + AC_MSG_ERROR([Could not execute server java: $SERVER_JAVA]) fi else SERVER_JAVA="" @@ -1806,12 +1844,9 @@ AC_PATH_XTRA if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then help_on_build_dependency x11 - AC_ERROR([Could not find X11 libraries. $HELP_MSG]) + AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG]) fi -AC_SUBST(X_CFLAGS) -AC_SUBST(X_LIBS) - # Some of the old makefiles require a setting of OPENWIN_HOME # Since the X11R6 directory has disappeared on later Linuxes, # we need to probe for it. @@ -1828,6 +1863,18 @@ if test "x$HOST_OS" = xsolaris; then fi AC_SUBST(OPENWIN_HOME) + +# +# Weird Sol10 something check...TODO change to try compile +# +if test "x${HOST_OS}" = xsolaris; then + if test "`uname -r`" = "5.10"; then + if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then + X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS" + fi + fi +fi + AC_LANG_PUSH(C) OLD_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $X_CFLAGS" @@ -1839,9 +1886,12 @@ AC_LANG_POP(C) if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then help_on_build_dependency x11 - AC_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG]) + AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG]) fi +AC_SUBST(X_CFLAGS) +AC_SUBST(X_LIBS) + ############################################################################### # # The common unix printing system cups is used to print from java. @@ -1855,7 +1905,7 @@ AC_ARG_WITH(cups-lib, [AS_HELP_STRING([--with-cups-lib], [specify directory for the cups library])]) if test "x$CUPS_NOT_NEEDED" = xyes; then - if test "x$with_cups" != x || test "x$with_cups-include" != x || test "x$with_cups-lib" != x; then + if test "x${with_cups}" != x || test "x${with_cups_include}" != x || test "x${with_cups_lib}" != x; then AC_MSG_WARN([cups not used, so --with-cups is ignored]) fi CUPS_CFLAGS= @@ -1863,21 +1913,21 @@ if test "x$CUPS_NOT_NEEDED" = xyes; then else CUPS_FOUND=no - if test "x$with_cups" = xno || test "x$with_cups-include" = xno || test "x$with_cups-lib" = xno; then - AC_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.]) + if test "x${with_cups}" = xno || test "x${with_cups_include}" = xno || test "x${with_cups_lib}" = xno; then + AC_MSG_ERROR([It is not possible to disable the use of cups. Remove the --without-cups option.]) fi - if test "x$with_cups" != x; then - CUPS_LIBS="-L$with_cups/lib -lcups" - CUPS_CFLAGS="-I$with_cups/include" + if test "x${with_cups}" != x; then + CUPS_LIBS="-L${with_cups}/lib -lcups" + CUPS_CFLAGS="-I${with_cups}/include" CUPS_FOUND=yes fi - if test "x$with_cups-include" != x; then - CUPS_CFLAGS="-I$with_cups-include" + if test "x${with_cups_include}" != x; then + CUPS_CFLAGS="-I${with_cups_include}" CUPS_FOUND=yes fi - if test "x$with_cups-lib" != x; then - CUPS_LIBS="-L$with_cups-lib -lcups" + if test "x${with_cups_lib}" != x; then + CUPS_LIBS="-L${with_cups_lib} -lcups" CUPS_FOUND=yes fi if test "x$CUPS_FOUND" = xno; then @@ -1910,7 +1960,7 @@ else fi if test "x$CUPS_FOUND" = xno; then help_on_build_dependency cups - AC_ERROR([Could not find cups! $HELP_MSG ]) + AC_MSG_ERROR([Could not find cups! $HELP_MSG ]) fi fi @@ -1953,16 +2003,16 @@ else if test "x$FREETYPE2_FOUND" = xyes; then # Verify that the directories exist if ! test -d "$with_freetype/lib" || ! test -d "$with_freetype/include"; then - AC_ERROR([Could not find the expected directories $with_freetype/lib and $with_freetype/include]) + AC_MSG_ERROR([Could not find the expected directories $with_freetype/lib and $with_freetype/include]) fi # List the contents of the lib. FREETYPELIB=`ls $with_freetype/lib/libfreetype.so $with_freetype/lib/freetype.dll 2> /dev/null` if test "x$FREETYPELIB" = x; then - AC_ERROR([Could not find libfreetype.se nor freetype.dll in $with_freetype/lib]) + AC_MSG_ERROR([Could not find libfreetype.se nor freetype.dll in $with_freetype/lib]) fi # Check one h-file if ! test -s "$with_freetype/include/ft2build.h"; then - AC_ERROR([Could not find $with_freetype/include/ft2build.h]) + AC_MSG_ERROR([Could not find $with_freetype/include/ft2build.h]) fi fi fi @@ -2010,7 +2060,7 @@ else fi if test "x$FREETYPE2_FOUND" = xno; then help_on_build_dependency freetype2 - AC_ERROR([Could not find freetype2! $HELP_MSG ]) + AC_MSG_ERROR([Could not find freetype2! $HELP_MSG ]) fi fi @@ -2032,7 +2082,7 @@ AC_ARG_WITH(alsa-lib, [AS_HELP_STRING([--with-alsa-lib], [specify directory for the alsa library])]) if test "x$ALSA_NOT_NEEDED" = xyes; then - if test "x$with_alsa" != x || test "x$with_alsa-include" != x || test "x$with_alsa-lib" != x; then + if test "x${with_alsa}" != x || test "x${with_alsa_include}" != x || test "x${with_alsa_lib}" != x; then AC_MSG_WARN([alsa not used, so --with-alsa is ignored]) fi ALSA_CFLAGS= @@ -2040,21 +2090,21 @@ if test "x$ALSA_NOT_NEEDED" = xyes; then else ALSA_FOUND=no - if test "x$with_alsa" = xno || test "x$with_alsa-include" = xno || test "x$with_alsa-lib" = xno; then - AC_ERROR([It is not possible to disable the use of alsa. Remove the --without-alsa option.]) + if test "x${with_alsa}" = xno || test "x${with_alsa_include}" = xno || test "x${with_alsa_lib}" = xno; then + AC_MSG_ERROR([It is not possible to disable the use of alsa. Remove the --without-alsa option.]) fi - if test "x$with_alsa" != x; then - ALSA_LIBS="-L$with_alsa/lib -lalsa" - ALSA_CFLAGS="-I$with_alsa/include" + if test "x${with_alsa}" != x; then + ALSA_LIBS="-L${with_alsa}/lib -lalsa" + ALSA_CFLAGS="-I${with_alsa}/include" ALSA_FOUND=yes fi - if test "x$with_alsa-include" != x; then - ALSA_CFLAGS="-I$with_alsa/include" + if test "x${with_alsa_include}" != x; then + ALSA_CFLAGS="-I${with_alsa_include}" ALSA_FOUND=yes fi - if test "x$with_alsa-lib" != x; then - ALSA_LIBS="-L$with_alsa/lib -lalsa" + if test "x${with_alsa_lib}" != x; then + ALSA_LIBS="-L${with_alsa_lib} -lalsa" ALSA_FOUND=yes fi if test "x$ALSA_FOUND" = xno; then @@ -2073,7 +2123,7 @@ else fi if test "x$ALSA_FOUND" = xno; then help_on_build_dependency alsa - AC_ERROR([Could not find alsa! $HELP_MSG ]) + AC_MSG_ERROR([Could not find alsa! $HELP_MSG ]) fi fi @@ -2093,17 +2143,17 @@ AC_ARG_WITH(pulse-include, [AS_HELP_STRING([--with-pulse-include], AC_ARG_WITH(pulse-lib, [AS_HELP_STRING([--with-pulse-lib], [specify directory for the pulseaudio library])]) -if test "x$with_pulse" != x; then - PULSE_LIBS="-L$with_pulse/lib -lfreetype" - PULSE_CFLAGS="-I$with_pulse/include" +if test "x${with_pulse}" != x; then + PULSE_LIBS="-L${with_pulse}/lib -lfreetype" + PULSE_CFLAGS="-I${with_pulse}/include" PULSE_FOUND=yes fi -if test "x$with_pulse-include" != x; then - PULSE_CFLAGS="-I$with_pulse/include" +if test "x${with_pulse_include}" != x; then + PULSE_CFLAGS="-I${with_pulse_include}" PULSE_FOUND=yes fi -if test "x$with_pulse-lib" != x; then - PULSE_LIBS="-L$with_pulse/lib -lfreetype" +if test "x${with_pulse_lib}" != x; then + PULSE_LIBS="-L${with_pulse_lib} -lpulse" PULSE_FOUND=yes fi if test "x$PULSE_FOUND" = xno; then @@ -2123,7 +2173,7 @@ fi if test "x$PULSE_FOUND" = xno && test "x$PULSE_NOT_NEEDED" != xyes; then help_on_build_dependency pulse - AC_ERROR([Could not find pulse audio libraries. $HELP_MSG ]) + AC_MSG_ERROR([Could not find pulse audio libraries. $HELP_MSG ]) fi AC_SUBST(PULSE_CFLAGS) @@ -2170,9 +2220,9 @@ AC_SUBST(USE_EXTERNAL_LIBZ) # Check if altzone exists in time.h # -AC_TRY_LINK([#include ], [return (int)altzone;], - has_altzone=yes, - has_altzone=no) +AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], [return (int)altzone;])], + [has_altzone=yes], + [has_altzone=no]) if test "x$has_altzone" = xyes; then AC_DEFINE([HAVE_ALTZONE], 1, [Define if you have the external 'altzone' variable in time.h]) fi @@ -2182,12 +2232,23 @@ fi # Check the maths library # -AC_CHECK_LIB(m, main, [], +AC_CHECK_LIB(m, cos, [], [ AC_MSG_NOTICE([Maths library was not found]) ]) AC_SUBST(LIBM) +############################################################################### +# +# Check for libdl.so + +save_LIBS="$LIBS" +LIBS="" +AC_CHECK_LIB(dl,dlopen) +LIBDL="$LIBS" +AC_SUBST(LIBDL) +LIBS="$save_LIBS" + ############################################################################### # # Should we run the painfully slow javadoc tool? @@ -2225,6 +2286,9 @@ AC_SUBST(DISABLE_NIMBUS) # Setup the opt flags for different compilers # and different operating systems. # +C_FLAG_DEPS="-MMD -MF" +CXX_FLAG_DEPS="-MMD -MF" + case $COMPILER_TYPE in CC ) D_FLAG="-g" @@ -2234,9 +2298,9 @@ case $COMPILER_TYPE in macosx ) # On MacOSX we optimize for size, something # we should do for all platforms? - C_O_FLAG_HI="-O3" + C_O_FLAG_HI="-Os" C_O_FLAG_NORM="-Os" - C_O_FLAG_NONE="-O0" + C_O_FLAG_NONE="" ;; *) C_O_FLAG_HI="-O3" @@ -2249,19 +2313,61 @@ case $COMPILER_TYPE in CXX_O_FLAG_NONE="$C_O_FLAG_NONE" ;; ossc ) + # + # Forte has different names for this with their C++ compiler... + # + CXX_FLAG_DEPS="-xMMD -xMF" + +# Extra options used with HIGHEST +# +# WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be +# done with care, there are some assumptions below that need to +# be understood about the use of pointers, and IEEE behavior. +# +# Use non-standard floating point mode (not IEEE 754) +CC_HIGHEST="$CC_HIGHEST -fns" +# Do some simplification of floating point arithmetic (not IEEE 754) +CC_HIGHEST="$CC_HIGHEST -fsimple" +# Use single precision floating point with 'float' +CC_HIGHEST="$CC_HIGHEST -fsingle" +# Assume memory references via basic pointer types do not alias +# (Source with excessing pointer casting and data access with mixed +# pointer types are not recommended) +CC_HIGHEST="$CC_HIGHEST -xalias_level=basic" +# Use intrinsic or inline versions for math/std functions +# (If you expect perfect errno behavior, do not use this) +CC_HIGHEST="$CC_HIGHEST -xbuiltin=%all" +# Loop data dependency optimizations (need -xO3 or higher) +CC_HIGHEST="$CC_HIGHEST -xdepend" +# Pointer parameters to functions do not overlap +# (Similar to -xalias_level=basic usage, but less obvious sometimes. +# If you pass in multiple pointers to the same data, do not use this) +CC_HIGHEST="$CC_HIGHEST -xrestrict" +# Inline some library routines +# (If you expect perfect errno behavior, do not use this) +CC_HIGHEST="$CC_HIGHEST -xlibmil" +# Use optimized math routines +# (If you expect perfect errno behavior, do not use this) +# Can cause undefined external on Solaris 8 X86 on __sincos, removing for now +#CC_HIGHEST="$CC_HIGHEST -xlibmopt" + case $LEGACY_HOST_CPU1 in i586) + C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xchip=pentium" C_O_FLAG_HI="-xO4 -Wu,-O4~yz" C_O_FLAG_NORM="-xO2 -Wu,-O2~yz" C_O_FLAG_NONE="" + CXX_O_FLAG_HIGHEST="-xO4 -Qoption ube -O4~yz $CC_HIGHEST -xchip=pentium" CXX_O_FLAG_HI="-xO4 -Qoption ube -O4~yz" CXX_O_FLAG_NORM="-xO2 -Qoption ube -O2~yz" CXX_O_FLAG_NONE="" ;; sparc) + C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra" C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0" C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0" C_O_FLAG_NONE="" + CXX_O_FLAG_HIGHEST="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra" CXX_O_FLAG_HI="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0" CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0" CXX_O_FLAG_NONE="" @@ -2280,12 +2386,24 @@ case $COMPILER_TYPE in ;; esac +if test -z "$C_O_FLAG_HIGHEST"; then + C_O_FLAG_HIGHEST="$C_O_FLAG_HI" +fi + +if test -z "$CXX_O_FLAG_HIGHEST"; then + CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HI" +fi + +AC_SUBST(C_O_FLAG_HIGHEST) AC_SUBST(C_O_FLAG_HI) AC_SUBST(C_O_FLAG_NORM) AC_SUBST(C_O_FLAG_NONE) +AC_SUBST(CXX_O_FLAG_HIGHEST) AC_SUBST(CXX_O_FLAG_HI) AC_SUBST(CXX_O_FLAG_NORM) AC_SUBST(CXX_O_FLAG_NONE) +AC_SUBST(C_FLAG_DEPS) +AC_SUBST(CXX_FLAG_DEPS) ############################################################################### # @@ -2403,16 +2521,17 @@ AC_SUBST(IMAGES_MAKE_ARGS) # case $COMPILER_NAME in gcc ) - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \ + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ + -pipe -fno-omit-frame-pointer \ -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" CFLAGS_JDK="$CFLAGS_JDK -fno-strict-aliasing" ;; ossc ) - CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa REQUIRED -v -mt -norunpath -xnolib" - CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt REQUIRED -features=no%except -DCC_NOEX" + CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -norunpath -xnolib" + CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX" ;; cl ) - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \ + CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Zi -MD -Zc:wchar_t- -W3 -wd4800 \ -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB -DWIN32_LEAN_AND_MEAN \ -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \ -DWIN32 -DIAL" @@ -2491,14 +2610,14 @@ CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK" # # Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh. if test "x$COMPILER_TYPE" = xCL; then - LDFLAGS_JDKLIB="$LDFLAGS -libpath:${JDK_OUTPUTDIR}/lib jvm.lib java.lib" + LDFLAGS_JDKLIB="$LDFLAGS -dll -libpath:${JDK_OUTPUTDIR}/lib -libpath:${JDK_OUTPUTDIR}/objs" LDFLAGS_JDKLIB_SUFFIX="" - if test "x$HOST_CPU_BITS" = "x64"; then - LDFLAGS_JDKEXE="$CFLAGS ${JDK_OUTPUTDIR}/tmp/java/jli/obj64/jli.lib" + if test "$HOST_CPU_BITS" == "64"; then + LDFLAGS_STACK_SIZE=1048576 else - LDFLAGS_JDKEXE="$CFLAGS ${JDK_OUTPUTDIR}/tmp/java/jli/obj/jli.lib" + LDFLAGS_STACK_SIZE=327680 fi - LDFLAGS_JDKEXE_SUFFIX="" + LDFLAGS_JDKEXE="$LDFLAGS /STACK:$LDFLAGS_STACK_SIZE" else # If this is a --hash-style=gnu system, use --hash-style=both, why? HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'` @@ -2513,9 +2632,11 @@ else fi fi - LDFLAGS_JDKLIB="$LDFLAGS $SHARED_LIBRARY_FLAGS -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}server \ + LDFLAGS_JDKLIB="$LDFLAGS $SHARED_LIBRARY_FLAGS \ + -L${JDK_OUTPUTDIR}/objs \ + -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}server \ -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}client \ - -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}" + -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}" LDFLAGS_JDKLIB_SUFFIX="-ljvm -ljava" if test "x$COMPILER_NAME" = xossc; then LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc" @@ -2523,8 +2644,10 @@ else # Only the jli library is explicitly linked when the launchers are built. # The libjvm is then dynamically loaded/linked by the launcher. - LDFLAGS_JDKEXE="$LDFLAGS -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}jli" - LDFLAGS_JDKEXE_SUFFIX="-ljli" + if test "x$HOST_OS" != "xmacosx"; then + LDFLAGS_JDKEXE="$LDFLAGS -L${JDK_OUTPUTDIR}/lib/${LIBARCHDIR}jli" + LDFLAGS_JDKEXE_SUFFIX="-ljli" + fi fi @@ -2557,9 +2680,9 @@ if test "x$HOST_OS" = xlinux; then AC_LANG_PUSH(C++) OLD_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -lstdc++" - AC_TRY_LINK([], [return 0;], - has_dynamic_libstdcxx=yes, - has_dynamic_libstdcxx=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])], + [has_dynamic_libstdcxx=yes], + [has_dynamic_libstdcxx=no]) CXXFLAGS="$OLD_CXXFLAGS" AC_LANG_POP(C++) AC_MSG_RESULT([$has_dynamic_libstdcxx]) @@ -2572,16 +2695,16 @@ if test "x$HOST_OS" = xlinux; then OLD_CXX="$CXX" LIBS="$STATIC_STDCXX_FLAGS" CXX="$CC" - AC_TRY_LINK([], [return 0;], - has_static_libstdcxx=yes, - has_static_libstdcxx=no) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [return 0;])], + [has_static_libstdcxx=yes], + [has_static_libstdcxx=no]) LIBS="$OLD_LIBS" CXX="$OLD_CXX" AC_LANG_POP(C++) AC_MSG_RESULT([$has_static_libstdcxx]) if test "x$has_static_libcxx" = xno && test "x$has_dynamic_libcxx" = xno; then - AC_ERROR([I cannot link to stdc++! Neither dynamically nor statically.]) + AC_MSG_ERROR([I cannot link to stdc++! Neither dynamically nor statically.]) fi if test "x$enable_static_link_stdc__" = xyes && test "x$has_static_libstdcxx" = xno; then @@ -2611,17 +2734,39 @@ fi # Could someone enlighten this configure script with a comment about libCrun? # The LEGACY_HOST_CPU3 is the setting for ISA_DIR. # -if test "x$HOST_OS" = xsolaris; then - LIBCXX="$LIBCXX /usr/lib${LEGACY_HOST_CPU3}/libCrun.so.1" +if test "x$HOST_OS" = xsolaris && test "x$LIBCXX" = x; then + LIBCXX="/usr/lib${LEGACY_HOST_CPU3}/libCrun.so.1" +fi + +# TODO better (platform agnostic) test +if test "x$HOST_OS" = xmacosx && test "x$LIBCXX" = x && test "x$GCC" = xyes; then + LIBCXX="-lstdc++" fi AC_SUBST(LIBCXX) +############################################################################### + +OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`" +OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`" +OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`" +OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`" +AC_SUBST(OS_VERSION_MAJOR) +AC_SUBST(OS_VERSION_MINOR) +AC_SUBST(OS_VERSION_MICRO) + ############################################################################### # # Misc # +# The name of the Service Agent jar. +SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}" +if test "x$HOST_OS" = "xwindows"; then + SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" +fi +AC_SUBST(SALIB_NAME) + # Control wether Hotspot runs Queens test after build. AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build], [enable running of Queens test after Hotspot build (not yet available) @<:@disabled@:>@])],, @@ -2635,17 +2780,99 @@ AC_SUBST(TEST_IN_BUILD) ############################################################################### # -# A helpful message at the end of the configure run. +# Choose cacerts source file # -if test "x$CCACHE_FOUND" = x && test "x$GCC" = xyes; then - help_on_build_dependency ccache - - printf "\nTip of the day:\nYou should really install ccache version 3.1.4 or newer.\n" - printf "It gives a tremendous speedup for C++ recompilations with precompiled headers!\n" -fi +AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file], + [specify alternative cacerts file])]) +if test "x$with_cacerts_file" != x; then + CACERTS_FILE=$with_cacerts_file +else + if test "x$OPENJDK" = "xtrue"; then + CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts + else + CACERTS_FILE=${SRC_ROOT}/jdk/src/closed/share/lib/security/cacerts.internal + fi +fi +AC_SUBST(CACERTS_FILE) -if test "x$CCACHE_FOUND" != x && test "x$HAS_GOOD_CCACHE" = x; then - printf "You have a ccache installed, but it is a version prior to 3.1.4. Try upgrading.\n" +# Check if build directory is on local disk. +# return 0 if it is on local disk, non-0 if on remote disk or failure +function is_directory_on_local_disk { + # df -l lists only local disks; if the given directory is not found then + # a non-zero exit code is given + $DF -l $1 > /dev/null 2>&1 +} + +AC_MSG_CHECKING([if build directory is on local disk]) +if is_directory_on_local_disk $OUTPUT_ROOT; then + OUTPUT_DIR_IS_LOCAL="yes" +else + OUTPUT_DIR_IS_LOCAL="no" +fi +AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL) + +# We're messing a bit with internal autoconf variables to put the config.status in the +# output directory instead of the current directory. +CONFIG_STATUS=$OUTPUT_ROOT/config.status + +# Now create the actual output files, after this, the main work of configure is done +AC_OUTPUT + +# Finally output some useful information to the user + +if test "x$CCACHE_FOUND" != x; then + if test "x$HAS_GOOD_CCACHE" = x; then + CCACHE_STATUS="installed, but disabled (version older than 3.1.4)" + CCACHE_HELP_MSG="You have ccache installed, but it is a version prior to 3.1.4. Try upgrading." + else + CCACHE_STATUS="installed and in use" + fi +else + if test "x$GCC" = xyes; then + CCACHE_STATUS="not installed (consider installing)" + CCACHE_HELP_MSG="You do not have ccache installed. Try installing it." + else + CCACHE_STATUS="not available for your system" + fi fi -AC_OUTPUT +printf "\n" +printf "====================================================\n" +printf "A new configuration has been successfully created in\n" +printf "$OUTPUT_ROOT\n" +if test "x$CONFIGURE_COMMAND_LINE" != x; then + printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n" +else + printf "using default settings.\n" +fi + +printf "\n" +printf "Configuration summary:\n" +printf "* Debug level: $DEBUG_LEVEL\n" +printf "* JDK variant: $JDK_VARIANT\n" +printf "* JVM variants: $with_jvm_variants\n" +printf "* Host info: OS: $HOST_OS, CPU architecture: $HOST_CPU_ARCH, address length: $HOST_CPU_BITS\n" +printf "* Boot JDK: $BOOT_JDK\n" + +printf "\n" +printf "Build performance summary:\n" +printf "* Cores to use: $NUM_CORES\n" +printf "* Memory limit: $MEMORY_SIZE MB\n" +printf "* ccache status: $CCACHE_STATUS\n" + +if test "x$OUTPUT_DIR_IS_LOCAL" != "xyes"; then + printf "\n" + printf "WARNING: Your build output directory is not on a local disk.\n" + printf "This will severely degrade build performance!\n" + printf "It is recommended that you create an output directory on a local disk,\n" + printf "and run the configure script again from that directory.\n" +fi + +if test "x$CCACHE_HELP_MSG" != x; then + printf "\n" + printf "Build performance tip: ccache gives a tremendous speedup for C++ recompilations.\n" + printf "$CCACHE_HELP_MSG\n" + + help_on_build_dependency ccache + printf "$HELP_MSG\n" +fi diff --git a/common/autoconf/help.m4 b/common/autoconf/help.m4 index 16aef9fb33c..6f74b5e65e9 100644 --- a/common/autoconf/help.m4 +++ b/common/autoconf/help.m4 @@ -23,18 +23,20 @@ # questions. # +function prepare_help_system { + AC_CHECK_PROGS(PKGHANDLER, apt-get yum port pkgutil pkgadd) +} + function help_on_build_dependency { # Print a helpful message on how to acquire the necessary build dependency. # $1 is the help tag: freetyp2, cups, pulse, alsa etc MISSING_DEPENDENCY=$1 PKGHANDLER_COMMAND= - AC_CHECK_PROGS(PKGHANDLER, apt-get yum port pkgutil pkgadd) - case $PKGHANDLER in apt-get) apt_help $MISSING_DEPENDENCY ;; - yum) + yum) yum_help $MISSING_DEPENDENCY ;; port) port_help $MISSING_DEPENDENCY ;; @@ -47,7 +49,7 @@ function help_on_build_dependency { esac if test "x$PKGHANDLER_COMMAND" != x; then - HELP_MSG="Try running '$PKGHANDLER_COMMAND'." + HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'." fi } diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4 index 364b371ab7e..adfae47e3b8 100644 --- a/common/autoconf/platform.m4 +++ b/common/autoconf/platform.m4 @@ -48,7 +48,7 @@ AC_DEFUN([CHECK_FIND_DELETE], AC_DEFUN([CHECK_NONEMPTY], [ # Test that variable $1 is not empty. - if test "" = "[$]$1"; then AC_ERROR(Could not find translit($1,A-Z,a-z) !); fi + if test "" = "[$]$1"; then AC_MSG_ERROR(Could not find translit($1,A-Z,a-z) !); fi ]) AC_DEFUN([ADD_JVM_ARG_IF_OK], @@ -97,7 +97,7 @@ AC_DEFUN([SPACESAFE], $1=`$CYGPATH -s -m -a "[$]$1"` $1=`$CYGPATH -u "[$]$1"` else - AC_ERROR([You cannot have spaces in $2! "[$]$1"]) + AC_MSG_ERROR([You cannot have spaces in $2! "[$]$1"]) fi fi ]) @@ -215,7 +215,7 @@ AC_DEFUN([SETUP_CCACHE_USAGE], AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers]) PUSHED_FLAGS="$CXXFLAGS" CXXFLAGS="-fpch-preprocess $CXXFLAGS" - AC_TRY_COMPILE([], [], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no]) CXXFLAGS="$PUSHED_FLAGS" if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then AC_MSG_RESULT([yes]) @@ -257,7 +257,7 @@ AC_DEFUN([EXTRACT_HOST_AND_BUILD_AND_LEGACY_VARS], # The same values are setup for BUILD_... # # And the legacy variables, for controlling the old makefiles. - # LEGACY_HOST_CPU1=i586,amd64,sparc,sparcv9,arm,arm64... + # LEGACY_HOST_CPU1=i586,amd64/x86_64,sparc,sparcv9,arm,arm64... # LEGACY_HOST_CPU2=i386,amd64,sparc,sparcv9,arm,arm64... # LEGACY_HOST_CPU3=sparcv9,amd64 (but only on solaris) # LEGACY_HOST_OS_API=solaris,windows @@ -276,7 +276,14 @@ AC_DEFUN([EXTRACT_HOST_AND_BUILD_AND_LEGACY_VARS], if test "x$HOST_OS" != xsolaris; then LEGACY_HOST_CPU3="" LEGACY_BUILD_CPU3="" - fi + fi + + # On MacOSX and MacOSX only, we have a different name for the x64 CPU in ARCH (LEGACY_HOST_CPU1) ... + if test "x$HOST_OS" = xmacosx && test "x$HOST_CPU" = xx64; then + LEGACY_HOST_CPU1="x86_64" + fi + + SET_RELEASE_FILE_OS_VALUES() ]) AC_DEFUN([EXTRACT_VARS_FROM_OS_TO], @@ -427,7 +434,7 @@ AC_DEFUN([EXTRACT_VARS_FROM_CPU], VAR_LEGACY_CPU=s390x ;; *) - AC_ERROR([unsupported cpu $1]) + AC_MSG_ERROR([unsupported cpu $1]) ;; esac @@ -515,3 +522,26 @@ AC_DEFUN([WIN_FIX_PATH], $1="$tmp" fi ]) + +AC_DEFUN([SET_RELEASE_FILE_OS_VALUES], +[ + if test "x$HOST_OS" = "xsolaris"; then + REQUIRED_OS_NAME=SunOS + REQUIRED_OS_VERSION=5.10 + fi + if test "x$HOST_OS" = "xlinux"; then + REQUIRED_OS_NAME=Linux + REQUIRED_OS_VERSION=2.6 + fi + if test "x$HOST_OS" = "xwindows"; then + REQUIRED_OS_NAME=Windows + REQUIRED_OS_VERSION=5.1 + fi + if test "x$HOST_OS" = "xmacosx"; then + REQUIRED_OS_NAME=Darwin + REQUIRED_OS_VERSION=11.2 + fi + + AC_SUBST(REQUIRED_OS_NAME) + AC_SUBST(REQUIRED_OS_VERSION) +]) diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index 4d5b841ea8a..28e248b019c 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -64,6 +64,9 @@ endif # A self-referential reference to this file. SPEC:=@SPEC@ +# The "human readable" name of this configuration +CONF_NAME:=@CONF_NAME@ + # The built jdk will run in this host system. HOST:=@HOST@ HOST_OS:=@HOST_OS@ @@ -87,6 +90,10 @@ BUILD_CPU_ARCH:=@BUILD_CPU_ARCH@ BUILD_CPU_BITS:=@BUILD_CPU_BITS@ BUILD_CPU_ENDIAN:=@BUILD_CPU_ENDIAN@ +# Legacy OS values for use in release file. +REQUIRED_OS_NAME:=@REQUIRED_OS_NAME@ +REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@ + # Old name for HOST_OS (aix,bsd,hpux,linux,macosx,solaris,windows etc) PLATFORM:=@HOST_OS@ # Old name for HOST_CPU, uses i586 and amd64, instead of ia32 and x64. @@ -105,6 +112,7 @@ ENDIAN:=@HOST_CPU_ENDIAN@ @SET_OPENJDK@ JIGSAW:=@JIGSAW@ LIBM:=-lm +LIBDL:=@LIBDL@ # colon or semicolon PATH_SEP:=@PATH_SEP@ @@ -287,8 +295,8 @@ CUPS_CFLAGS:=@CUPS_CFLAGS@ PACKAGE_PATH=@PACKAGE_PATH@ -CACERTS_FILE:=$(SRC_ROOT)/jdk/src/share/lib/security/cacerts -#CACERTS_INT=$(CLOSED_SHARE_SRC)/lib/security/cacerts.internal +# Source file for cacerts +CACERTS_FILE=@CACERTS_FILE@ #MOZILLA_HEADERS_PATH:= @@ -308,13 +316,18 @@ LD_OUT_OPTION:=@LD_OUT_OPTION@ AR_OUT_OPTION:=@AR_OUT_OPTION@ # Flags used for overriding the default opt setting for a C/C++ source file. +C_O_FLAG_HIGHEST:=@C_O_FLAG_HIGHEST@ C_O_FLAG_HI:=@C_O_FLAG_HI@ C_O_FLAG_NORM:=@C_O_FLAG_NORM@ C_O_FLAG_NONE:=@C_O_FLAG_NONE@ +CXX_O_FLAG_HIGHEST:=@CXX_O_FLAG_HIGHEST@ CXX_O_FLAG_HI:=@CXX_O_FLAG_HI@ CXX_O_FLAG_NORM:=@CXX_O_FLAG_NORM@ CXX_O_FLAG_NONE:=@CXX_O_FLAG_NONE@ +C_FLAG_DEPS:=@C_FLAG_DEPS@ +CXX_FLAG_DEPS:=@CXX_FLAG_DEPS@ + # Tools that potentially need to be cross compilation aware. CC:=@UNCYGDRIVE@ @CCACHE@ @CC@ @@ -386,6 +399,11 @@ SHARED_LIBRARY_FLAGS:=@SHARED_LIBRARY_FLAGS@ # (Note absence of := assignment, because we do not want to evaluate the macro body here) SET_SHARED_LIBRARY_MAPFILE=@SET_SHARED_LIBRARY_MAPFILE@ +# Options for C/CXX compiler to be used if linking is performed +# using reorder file +C_FLAG_REORDER:=@C_FLAG_REORDER@ +CXX_FLAG_REORDER:=@CXX_FLAG_REORDER@ + # Options to linker to specify the library name. # (Note absence of := assignment, because we do not want to evaluate the macro body here) SET_SHARED_LIBRARY_NAME=@SET_SHARED_LIBRARY_NAME@ @@ -406,6 +424,9 @@ STATIC_LIBRARY_SUFFIX:=@STATIC_LIBRARY_SUFFIX@ EXE_SUFFIX:=@EXE_SUFFIX@ OBJ_SUFFIX:=@OBJ_SUFFIX@ +POST_STRIP_CMD:=@POST_STRIP_CMD@ +POST_MCS_CMD:=@POST_MCS_CMD@ + JAVA_FLAGS:=@BOOT_JDK_JVMARGS@ JAVA=@UNCYGDRIVE@ @JAVA@ $(JAVA_FLAGS) @@ -419,6 +440,8 @@ JAR:=@UNCYGDRIVE@ @JAR@ RMIC:=@UNCYGDRIVE@ @RMIC@ +NATIVE2ASCII:=@UNCYGDRIVE@ @NATIVE2ASCII@ + BOOT_JAR_CMD:=@UNCYGDRIVE@ @JAR@ BOOT_JAR_JFLAGS:= @@ -483,6 +506,7 @@ OTOOL:=@OTOOL@ READELF:=@READELF@ EXPR:=@EXPR@ FILE:=@FILE@ +HG:=@HG@ UNCYGDRIVE:=@UNCYGDRIVE@ @@ -584,5 +608,13 @@ INSTALL_SYSCONFDIR=@sysconfdir@ # Misc # +# Name of Service Agent library +SALIB_NAME=@SALIB_NAME@ + # Control wether Hotspot runs Queens test after building TEST_IN_BUILD=@TEST_IN_BUILD@ + +OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@ +OS_VERSION_MINOR:=@OS_VERSION_MINOR@ +OS_VERSION_MICRO:=@OS_VERSION_MICRO@ + diff --git a/common/bin/compareimage.sh b/common/bin/compareimage.sh index 3687e41c470..2e9e8051384 100644 --- a/common/bin/compareimage.sh +++ b/common/bin/compareimage.sh @@ -45,7 +45,7 @@ # if [ "x$1" = "x-h" ] || [ "x$1" = "x--help" ] || [ "x$1" == "x" ]; then - echo "./common/bin/compareimages.sh old_jdk_image new_jdk_image" + echo "bash ./common/bin/compareimages.sh old_jdk_image new_jdk_image" echo "" echo "Compare the directory structure." echo "Compare the filenames in the directories." @@ -55,11 +55,11 @@ if [ "x$1" = "x-h" ] || [ "x$1" = "x--help" ] || [ "x$1" == "x" ]; then echo "Compare the native executables" echo "Compare the remaining files" echo "" - echo "./common/bin/compareimages.sh old_jdk_image new_jdk_image [zips jars libs execs other]" + echo "bash ./common/bin/compareimages.sh old_jdk_image new_jdk_image [zips jars libs execs other]" echo "" echo "Compare only the selected subset of the images." echo "" - echo "./common/bin/compareimages.sh old_jdk_image new_jdk_image CodePointIM.jar" + echo "bash ./common/bin/compareimages.sh old_jdk_image new_jdk_image CodePointIM.jar" echo "" echo "Compare only the CodePointIM.jar file" echo "Can be used to compare zips, libraries and executables." @@ -114,10 +114,10 @@ else CMP_OTHER=true fi -DIFFJARZIP=`dirname $0`/diffjarzip.sh -DIFFLIB=`dirname $0`/difflib.sh -DIFFEXEC=`dirname $0`/diffexec.sh -export COMPARE_ROOT=/tmp/cimages +DIFFJARZIP="/bin/bash `dirname $0`/diffjarzip.sh" +DIFFLIB="/bin/bash `dirname $0`/difflib.sh" +DIFFEXEC="/bin/bash `dirname $0`/diffexec.sh" +export COMPARE_ROOT=/tmp/cimages.$USER mkdir -p $COMPARE_ROOT # Load the correct exception list. @@ -167,16 +167,64 @@ else ONLY_OLD=$(diff $COMPARE_ROOT/from_files $COMPARE_ROOT/to_files | grep '<') if [ "$ONLY_OLD" ]; then echo Only in $OLD - echo $ONLY_OLD | sed 's|< ./|\t|g' | sed 's/ /\n/g' + echo "$ONLY_OLD" | sed 's|< ./| |g' fi # Differences in directories found. ONLY_NEW=$(diff $COMPARE_ROOT/from_files $COMPARE_ROOT/to_files | grep '>') if [ "$ONLY_NEW" ]; then echo Only in $NEW - echo $ONLY_NEW | sed 's|> ./|\t|g' | sed 's/ /\n/g' + echo "$ONLY_NEW" | sed 's|> ./| |g' fi fi +if [ "`uname`" == "SunOS" ]; then + PERM="gstat -c%a" +elif [ $OSTYPE == "cygwin" ]; then + PERM= +elif [ "`uname`" == "Darwin" ]; then + PERM="stat -f%p" +elif [ "`uname`" == "Linux" ]; then + PERM="stat -c%A" +else + PERM="stat -c%a" +fi + +if [ "${PERM}" ] +then + echo -n Permissions... + found="" + for f in `cd $OLD && find . -type f` + do + if [ ! -f ${OLD}/$f ]; then continue; fi + if [ ! -f ${NEW}/$f ]; then continue; fi + OP=`${PERM} ${OLD}/$f` + NP=`${PERM} ${NEW}/$f` + if [ "$OP" != "$NP" ] + then + if [ -z "$found" ]; then echo ; found="yes"; fi + printf "\told: ${OP} new: ${NP}\t$f\n" + fi + done + if [ -z "$found" ]; then echo ; found="yes"; fi +fi + +GENERAL_FILES=$(cd $OLD && find . -type f ! -name "*.so" ! -name "*.jar" ! -name "*.zip" \ + ! -name "*.debuginfo" ! -name "*.dylib" ! -name "jexec" \ + ! -name "ct.sym" \ + | grep -v "./bin/" | sort | $FILTER) +echo General files... +for f in $GENERAL_FILES +do + if [ -e $NEW/$f ]; then + DIFF_OUT=$(diff $OLD/$f $NEW/$f 2>&1) + if [ -n "$DIFF_OUT" ]; then + echo $f + echo "$DIFF_OUT" + fi + fi +done + + if [ "x$CMP_ZIPS" == "xtrue" ]; then ZIPS=$(cd $OLD && find . -type f -name "*.zip" | sort | $FILTER) @@ -194,7 +242,7 @@ if [ "x$CMP_ZIPS" == "xtrue" ]; then fi if [ "x$CMP_JARS" == "xtrue" ]; then - JARS=$(cd $OLD && find . -type f -name "*.jar" | sort | $FILTER) + JARS=$(cd $OLD && find . -type f -name "*.jar" -o -name "ct.sym" | sort | $FILTER) if [ -n "$JARS" ]; then echo Jar files... diff --git a/common/bin/diffexec.sh b/common/bin/diffexec.sh index e619c6ff7a4..8621e9147f1 100644 --- a/common/bin/diffexec.sh +++ b/common/bin/diffexec.sh @@ -50,14 +50,21 @@ fi if [ "`uname`" == "SunOS" ]; then NM=gnm - STAT=gstat + STAT="gstat -c%s" + LDD=ldd elif [ $OSTYPE == "cygwin" ]; then NM="$VS100COMNTOOLS/../../VC/bin/amd64/dumpbin.exe" NM_ARGS=/exports - STAT=stat + STAT="stat -c%s" + LDD= +elif [ "`uname`" == "Darwin" ]; then + NM=nm + STAT="stat -f%z" + LDD="otool -L" else NM=nm - STAT=stat + STAT="stat -c%s" + LDD=ldd fi # Should the differences be viewed? @@ -72,8 +79,8 @@ fi OLD=$(cd $(dirname $1) && pwd)/$(basename $1) NEW=$(cd $(dirname $2) && pwd)/$(basename $2) -OLD_SIZE=$($STAT -c%s "$OLD") -NEW_SIZE=$($STAT -c%s "$NEW") +OLD_SIZE=$($STAT "$OLD") +NEW_SIZE=$($STAT "$NEW") if [ $# -gt 3 ] then @@ -119,15 +126,41 @@ fi DIFFS=$(LANG=C diff $OLD_SYMBOLS $NEW_SYMBOLS) +if [ "${LDD}" ] +then + NAME=`basename $OLD` + TMP=$COMPARE_ROOT/ldd/ldd.${NAME} + rm -rf "${TMP}" + mkdir -p "${TMP}" + + (cd "${TMP}" && cp $OLD . && ${LDD} ${NAME} | awk '{ print $1;}' | sort | tee dep.old | uniq > dep.uniq.old) + (cd "${TMP}" && cp $NEW . && ${LDD} ${NAME} | awk '{ print $1;}' | sort | tee dep.new | uniq > dep.uniq.new) + (cd "${TMP}" && rm -f ${NAME}) + + DIFFS_DEP=$(LANG=C diff "${TMP}/dep.old" "${TMP}/dep.new") + DIFFS_UNIQ_DEP=$(LANG=C diff "${TMP}/dep.uniq.old" "${TMP}/dep.uniq.new") + + DEP_MSG= + if [ -z "${DIFFS_UNIQ_DEP}" -a -z "${DIFFS_DEP}" ]; then + DEP_MSG="Identical dependencies" + elif [ -z "${DIFFS_UNIQ_DEP}" ]; then + DEP_MSG="Redundant duplicate dependencies added" + RES=1 + else + DEP_MSG="DIFFERENT dependencies" + RES=1 + fi +fi + RESULT=0 if [ -n "$DIFFS" ]; then if [ $OLD_SIZE -ne $NEW_SIZE ] then - echo Differences, content AND size : $OLD_NAME + echo Differences, content AND size : $DEP_MSG : $OLD_NAME RESULT=4 else - echo Differences, content BUT SAME size: $OLD_NAME + echo Differences, content BUT SAME size: $DEP_MSG : $OLD_NAME RESULT=3 fi if [ "x$VIEW" == "xview" ]; then @@ -136,10 +169,10 @@ if [ -n "$DIFFS" ]; then else if [ $OLD_SIZE -ne $NEW_SIZE ] then - echo Identical symbols BUT NEW size : $OLD_NAME + echo Identical symbols BUT NEW size : $DEP_MSG : $OLD_NAME RESULT=2 else - echo Identical symbols AND size, BUT not bytewise identical: $OLD_NAME + echo Identical symbols AND size, BUT not bytewise identical: $DEP_MSG : $OLD_NAME RESULT=1 fi fi diff --git a/common/bin/diffjarzip.sh b/common/bin/diffjarzip.sh index 28220f74dd9..3bd96b7e112 100644 --- a/common/bin/diffjarzip.sh +++ b/common/bin/diffjarzip.sh @@ -84,8 +84,8 @@ if [ "$OLD_SUFFIX" != "$NEW_SUFFIX" ]; then exit 2 fi -if [ "$OLD_SUFFIX" != "zip" ] && [ "$OLD_SUFFIX" != "jar" ]; then - echo The files have to be zip or jar! They are $OLD_SUFFIX +if [ "$OLD_SUFFIX" != "zip" ] && [ "$OLD_SUFFIX" != "jar" ] && [ "$OLD_SUFFIX" != "sym" ]; then + echo The files have to be zip, jar or sym! They are $OLD_SUFFIX exit 2 fi @@ -128,7 +128,7 @@ if [ -n "$ONLY2" ]; then | sed "s|Only in $NEW_TEMPDIR| |"g | sed 's|: |/|g' fi -DIFFTEXT=`dirname $0`/difftext.sh +DIFFTEXT="/bin/bash `dirname $0`/difftext.sh" LANG=C $DIFF -rq $DIFF_FLAGS $OLD_TEMPDIR $NEW_TEMPDIR | grep differ | cut -f 2,4 -d ' ' | \ awk "{ print \"$DIFFTEXT \"\$1\" \"\$2 }" > $COMPARE_ROOT/diffing diff --git a/common/bin/difflib.sh b/common/bin/difflib.sh index 645005b02f4..e6f8a20ee9a 100644 --- a/common/bin/difflib.sh +++ b/common/bin/difflib.sh @@ -54,14 +54,21 @@ fi if [ "`uname`" == "SunOS" ]; then NM=gnm - STAT=gstat + STAT="gstat -c%s" + LDD=ldd elif [ $OSTYPE == "cygwin" ]; then NM="$VS100COMNTOOLS/../../VC/bin/amd64/dumpbin.exe" NM_ARGS=/exports - STAT=stat + STAT="stat -c%s" + LDD= +elif [ "`uname`" == "Darwin" ]; then + NM=nm + STAT="stat -f%z" + LDD="otool -L" else NM=nm - STAT=stat + STAT="stat -c%s" + LDD=ldd fi # Should the differences be viewed? @@ -76,8 +83,8 @@ fi OLD=$(cd $(dirname $1) && pwd)/$(basename $1) NEW=$(cd $(dirname $2) && pwd)/$(basename $2) -OLD_SIZE=$($STAT -c%s "$OLD") -NEW_SIZE=$($STAT -c%s "$NEW") +OLD_SIZE=$($STAT "$OLD") +NEW_SIZE=$($STAT "$NEW") if [ $# -gt 3 ] then @@ -139,13 +146,39 @@ DIFFS=$(LANG=C diff $OLD_SYMBOLS $NEW_SYMBOLS) RESULT=0 +if [ "${LDD}" ] +then + NAME=`basename $OLD` + TMP=$COMPARE_ROOT/ldd/ldd.${NAME} + rm -rf "${TMP}" + mkdir -p "${TMP}" + + (cd "${TMP}" && cp $OLD . && ${LDD} ${NAME} | awk '{ print $1;}' | sort | tee dep.old | uniq > dep.uniq.old) + (cd "${TMP}" && cp $NEW . && ${LDD} ${NAME} | awk '{ print $1;}' | sort | tee dep.new | uniq > dep.uniq.new) + (cd "${TMP}" && rm -f ${NAME}) + + DIFFS_DEP=$(LANG=C diff "${TMP}/dep.old" "${TMP}/dep.new") + DIFFS_UNIQ_DEP=$(LANG=C diff "${TMP}/dep.uniq.old" "${TMP}/dep.uniq.new") + + DEP_MSG= + if [ -z "${DIFFS_UNIQ_DEP}" -a -z "${DIFFS_DEP}" ]; then + DEP_MSG="Identical dependencies" + elif [ -z "${DIFFS_UNIQ_DEP}" ]; then + DEP_MSG="Redundant duplicate dependencies added" + RES=1 + else + DEP_MSG="DIFFERENT dependencies" + RES=1 + fi +fi + if [ -n "$DIFFS" ]; then if [ $OLD_SIZE -ne $NEW_SIZE ] then - echo Differences, content AND size : $OLD_NAME + echo Differences, content AND size : $DEP_MSG : $OLD_NAME RESULT=4 else - echo Differences, content BUT SAME size: $OLD_NAME + echo Differences, content BUT SAME size: $DEP_MSG : $OLD_NAME RESULT=3 fi if [ "x$VIEW" == "xview" ]; then @@ -154,10 +187,10 @@ if [ -n "$DIFFS" ]; then else if [ $OLD_SIZE -ne $NEW_SIZE ] then - echo Identical symbols BUT NEW size : $OLD_NAME + echo Identical symbols BUT NEW size : $DEP_MSG : $OLD_NAME RESULT=2 else - echo Identical symbols AND size, BUT not bytewise identical: $OLD_NAME + echo Identical symbols AND size, BUT not bytewise identical: $DEP_MSG : $OLD_NAME RESULT=1 fi fi diff --git a/common/bin/logger.sh b/common/bin/logger.sh index 9f2d7a24c7f..70c3dab047c 100644 --- a/common/bin/logger.sh +++ b/common/bin/logger.sh @@ -37,10 +37,9 @@ # Create a temporary directory to store the result code from # the wrapped command. -RCDIR=`mktemp -d tmp.XXXXXX` || exit $? -trap "rm -rf '$RCDIR'" EXIT +RCDIR=`mktemp -dt jdk-build-logger.tmp.XXXXXX` || exit $? +trap "rm -rf \"$RCDIR\"" EXIT LOGFILE=$1 shift -(exec 3>&1 ; ("$@" 2>&1 1>&3; echo $? > $RCDIR/rc) | tee -a $LOGFILE 1>&2 ; exec 3>&-) | tee -a $LOGFILE -exit `cat $RCDIR/rc` - +(exec 3>&1 ; ("$@" 2>&1 1>&3; echo $? > "$RCDIR/rc") | tee -a $LOGFILE 1>&2 ; exec 3>&-) | tee -a $LOGFILE +exit `cat "$RCDIR/rc"` diff --git a/common/makefiles/JavaCompilation.gmk b/common/makefiles/JavaCompilation.gmk index 6795e4ba009..a9ddb11a644 100644 --- a/common/makefiles/JavaCompilation.gmk +++ b/common/makefiles/JavaCompilation.gmk @@ -126,8 +126,7 @@ define SetupArchive # JAR:=Jar file to create # MANIFEST:=Optional manifest file template. # JARMAIN:=Optional main class to add to manifest - # SETUP:=The Java(h) compiler setup, needed to run javah. - # HEADERS:=Directory to put headers in + # JARINDEX := # SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically # added to the archive. # EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest. @@ -143,9 +142,8 @@ define SetupArchive $(if $(12),$1_$(strip $(12))) $(if $(13),$1_$(strip $(13))) $(if $(14),$1_$(strip $(14))) + $(if $(15),$1_$(strip $(15))) - $1_JVM := $$($$($1_SETUP)_JVM) - $1_JAVAH := $$($$($1_SETUP)_JAVAH) $1_JARMAIN:=$(strip $$($1_JARMAIN)) $1_JARNAME:=$$(notdir $$($1_JAR)) $1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest @@ -155,19 +153,46 @@ define SetupArchive $1_NATIVEAPI_NOTIFICATIONS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_native_notifications $1_NATIVEAPI_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_native $1_BIN:=$$(dir $$($1_JAR)) + ifeq (,$$($1_SUFFIXES)) # No suffix was set, default to classes. $1_SUFFIXES:=.class endif # Convert suffixes to a find expression $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES)) + # On windows, a lot of includes/excludes risk making the command line too long, so + # writing the grep patterns to files. ifneq (,$$($1_INCLUDES)) - $1_GREP_INCLUDES:=| $(GREP) $$(foreach src,$$($1_SRCS),$$(addprefix -e$(SPACE)$$(src)/,$$($1_INCLUDES))) + $1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),\ + $$(addprefix $$(src)/,$$($1_INCLUDES))) + $$(eval $$(call ListPathsSafelyNow,$1_GREP_INCLUDE_PATTERNS,\n, \ + >> $$($1_BIN)/_the.$$($1_JARNAME)_include)) + $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include endif ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES)) - $1_GREP_EXCLUDES:=| $(GREP) -v $$(foreach src,$$($1_SRCS),$$(addprefix -e$(SPACE)$$(src)/,$$($1_EXCLUDES) $$($1_EXCLUDE_FILES))) + $1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,\ + $$($1_EXCLUDES) $$($1_EXCLUDE_FILES))) + $$(eval $$(call ListPathsSafelyNow,$1_GREP_EXCLUDE_PATTERNS,\n, \ + >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)) + $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude endif + ifneq (,$$($1_JARINDEX)) + $1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@)) + else + $1_JARINDEX = true + endif + # When this macro is run in the same makefile as the java compilation, dependencies are transfered + # in make variables. When the macro is run in a different makefile than the java compilation, the + # dependencies need to be found in the filesystem. + $1_ALL_SRCS:=$$(foreach src,$$($1_SRCS),$$(shell ($(FIND) $$(src) -type f \ + -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \ + $$($1_GREP_EXCLUDES) && $(ECHO) $$($1_EXTRA_FILES)))) + ifeq (,$$($1_SKIP_METAINF)) + $1_ALL_SRCS+=$$(foreach src,$$($1_SRCS),$$(shell $(FIND) $$(src)/META-INF -type f 2> /dev/null)) + endif + + # Utility macros, to make the shell script receipt somewhat easier to dechipher. # The capture contents macro finds all files (matching the patterns, typically @@ -187,15 +212,6 @@ define SetupArchive (cd $$(src) && \ $(FIND) . -name _the.package.api.notify -exec dirname \{\} \; >> $$($1_PUBAPI_NOTIFICATIONS_FILE) ; \ true) &&) - # The capture nativeapi macro scans for native api change notificiations. If such notifications are - # found, then we will run javah on the changed classes. It also collects all classes with native methods - # to be used to find out which classes no longer has native methods, to trigger deletion of those .h files. - $1_CAPTURE_NATIVEAPI=$$(foreach src,$$($1_SRCS),\ - (cd $$(src) && \ - $(FIND) . -name _the.package.native.notify | $(SED) 's/package.native.notify/package.native/' | \ - $(XARGS) $(CAT) | $(GREP) '^TYPE ' | $(SED) 's/.*TYPE //' >> $$($1_NATIVEAPI_NOTIFICATIONS_FILE) ; \ - $(FIND) . -name _the.package.native -exec $(CAT) \{\} \; | $(SED) -n 's/^TYPE //p' >> $$($1_NATIVEAPI_FILE) ; \ - true) &&) # The update contents macro updates the jar file with the previously capture contents. $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS),\ (cd $$(src) && \ @@ -205,13 +221,18 @@ define SetupArchive fi) &&) # The s-variants of the above macros are used when the jar is created from scratch. $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS),\ - (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) $$($1_GREP_EXCLUDES) && $(ECHO) $$($1_EXTRA_FILES)) | $(SED) 's|$$(src)/||g' > $$(src)/_the.$$($1_JARNAME)_contents) && ) + (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \ + $$($1_GREP_EXCLUDES) && $(ECHO) $$($1_EXTRA_FILES)) | $(SED) 's|$$(src)/||g' > \ + $$(src)/_the.$$($1_JARNAME)_contents) && ) + ifeq (,$$($1_SKIP_METAINF)) $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS),\ - ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents) && ) + ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \ + $$(src)/_the.$$($1_JARNAME)_contents) && ) endif $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS),\ (cd $$(src) && $(JAR) uf $$@ @$$(src)/_the.$$($1_JARNAME)_contents) &&) + # The TOUCH macro is used to make sure all timestamps are identical for package files and the pubapi files. # If we do not do this, we get random recompilations, the next time we run make, since the order of package building is random, # ie independent of package --dependes on-> public api of another package. This is of course @@ -223,7 +244,7 @@ define SetupArchive # Use a slightly shorter name for logging, but with enough path to identify this jar. $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR)) # Here is the rule that creates/updates the jar file. - $$($1_JAR) : $2 + $$($1_JAR) : $2 $$($1_ALL_SRC) $(MKDIR) -p $$($1_BIN) if [ -n "$$($1_MANIFEST)" ]; then \ $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ @@ -231,9 +252,11 @@ define SetupArchive else \ $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE); \ fi - $(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE) + if [ -n "$$(strip $$($1_JARMAIN))" ]; then \ + $(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE); \ + fi if [ -n "$$($1_EXTRA_MANIFEST_ATTR)" ]; then \ - $(ECHO) "$$($1_EXTRA_MANIFEST_ATTR)" >> $$($1_MANIFEST_FILE); \ + $(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE); \ fi +if [ -s $$@ ]; then \ $(RM) -r $$($1_PUBAPI_NOTIFICATIONS_FILE) && \ @@ -255,20 +278,8 @@ define SetupArchive $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \ fi && \ $$($1_UPDATE_CONTENTS) true && \ + $$($1_JARINDEX) && \ $$($1_TOUCH_API_FILES) true && \ - $(RM) -r $$($1_NATIVEAPI_NOTIFICATIONS_FILE) $$($1_NATIVEAPI_FILE) && \ - $$($1_CAPTURE_NATIVEAPI) true && \ - if [ "x$$($1_JAVAH)" != "x" ] && [ -s $$($1_NATIVEAPI_NOTIFICATIONS_FILE) ]; then \ - $(ECHO) Native api change detected in: && $(CAT) $$($1_NATIVEAPI_NOTIFICATIONS_FILE) && \ - $$($1_JVM) $$($1_JAVAH) "-Xbootclasspath/p:$$($1_JAR)" -d $$($1_HEADERS) @$$($1_NATIVEAPI_NOTIFICATIONS_FILE) ; \ - fi && \ - $(TOUCH) $$($1_NATIVEAPI_FILE)_prev ; \ - ($(GREP) -xvf $$($1_NATIVEAPI_FILE) $$($1_NATIVEAPI_FILE)_prev > $$($1_NATIVEAPI_FILE)_deleted; true) && \ - $(CP) $$($1_NATIVEAPI_FILE) $$($1_NATIVEAPI_FILE)_prev && \ - if [ -s $$($1_NATIVEAPI_FILE)_deleted ]; then \ - $(ECHO) Native methods dropped from classes: && $(CAT) $$($1_NATIVEAPI_FILE)_deleted && \ - $(RM) `$(CAT) $$($1_NATIVEAPI_FILE)_deleted | $(SED) -e 's|\.|_|g' -e 's|.*|$$($1_HEADERS)/&.h $$($1_HEADERS)/&_*|'` ; \ - fi && \ $$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.api.notify $(FIND_DELETE); true) &&) true ; \ fi ; \ else \ @@ -276,15 +287,9 @@ define SetupArchive $$($1_SCAPTURE_CONTENTS) \ $$($1_SCAPTURE_METAINF) \ $$($1_SUPDATE_CONTENTS) \ + $$($1_JARINDEX) && \ $$($1_TOUCH_API_FILES) true && \ $(RM) -r $$($1_NATIVEAPI_NOTIFICATIONS_FILE) $$($1_NATIVEAPI_FILE) && \ - $$($1_CAPTURE_NATIVEAPI) true && \ - if [ "x$$($1_JAVAH)" != "x" ] && [ -s $$($1_NATIVEAPI_FILE) ]; then \ - $(ECHO) Generating native api headers for `$(CAT) $$($1_NATIVEAPI_FILE) | $(WC) -l` classes && \ - $(RM) $$($1_HEADERS)/*.h && \ - $$($1_JVM) $$($1_JAVAH) "-Xbootclasspath/p:$$($1_JAR)" -d $$($1_HEADERS) @$$($1_NATIVEAPI_FILE) && \ - $(CP) $$($1_NATIVEAPI_FILE) $$($1_NATIVEAPI_FILE)_prev ; \ - fi && \ $$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name "*.notify" $(FIND_DELETE); true) &&) true ; \ fi; @@ -297,7 +302,7 @@ endef define SetupZipArchive # param 1 is for example ZIP_MYSOURCE # param 2,3,4,5,6,7,8,9 are named args. - # SRC,ZIP,INCLUDES,EXCLUDES,EXCLUDE_FILES + # SRC,ZIP,INCLUDES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS $(if $2,$1_$(strip $2)) $(if $3,$1_$(strip $3)) $(if $4,$1_$(strip $4)) @@ -308,11 +313,17 @@ define SetupZipArchive $(if $9,$1_$(strip $9)) # Find all files in the source tree. - $1_ALL_SRCS := $$(foreach i,$$($1_SRC), $$(shell $(FIND) $$i -type f -a ! -name "_the.*")) + $1_SUFFIX_FILTER := $$(patsubst %,-o -name $(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES)) + $1_ALL_SRCS := $$(foreach i,$$($1_SRC), $$(shell $(FIND) $$i -type f -a ! -name "_the.*" \( -name FALSE_DUMMY $$($1_SUFFIX_FILTER) \) )) ifneq ($$($1_INCLUDES),) $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES)))) - $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES))) + ifneq ($$($1_SUFFIXES),) + $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES),\ + $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES)))) + else + $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES))) + endif $1_ALL_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_SRCS)) endif ifneq ($$($1_EXCLUDES),) @@ -329,7 +340,7 @@ define SetupZipArchive # Explicitly excluded files can be given with absolute path. The patsubst solution # isn't perfect but the likelyhood of an absolute path to match something in a src # dir is very small. - $$($1_ZIP) : $$($1_ALL_SRCS) + $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS) $(MKDIR) -p $$(@D) $(ECHO) Updating $$($1_NAME) $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES)))) ;) true @@ -472,7 +483,7 @@ define add_file_to_copy_and_clean | $(SED) -e '/^#/d' -e '/^$$$$/d' \ -e :a -e '/\\$$$$/N; s/\\\n//; ta' \ -e 's/^[ \t]*//;s/[ \t]*$$$$//' \ - -e 's/\\=/=/' | LANG=C sort > $$@ + -e 's/\\=/=/' | LANG=C $(SORT) > $$@ $(CHMOD) -f ug+w $$@ # And do not forget this target @@ -623,6 +634,7 @@ define SetupJavaCompilation # JAVAC_SOURCE_PATH_UGLY_OVERRIDE:=Don't use this. This forces an explicit -sourcepath to javac. # Its only here until we cleanup some nasty source code pasta in the jdk. # HEADERS:=path to directory where all generated c-headers are written. + # DEPENDS:=Extra dependecy $(if $2,$1_$(strip $2)) $(if $3,$1_$(strip $3)) $(if $4,$1_$(strip $4)) @@ -650,9 +662,6 @@ $1_JVM := $$($$($1_SETUP)_JVM) $1_JAVAC := $$($$($1_SETUP)_JAVAC) $1_JAVAH := $$($$($1_SETUP)_JAVAH) $1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS) -ifeq (,$$($1_HEADERS)) - $1_HEADERS := $$($1_BIN) -endif # Handle addons and overrides. $1_SRC:=$$(call ADD_SRCS,$$($1_SRC)) @@ -776,24 +785,21 @@ ifeq ($$($1_MODE),SINGLE_THREADED_BATCH) $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC))) endif + ifneq (,$$($1_HEADERS)) + $1_HEADERS_ARG := -h $$($1_HEADERS) + endif + # Create a sed expression to remove the source roots and to replace / with . # and remove .java at the end. $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g' # Here is the batch rules that depends on all the sources. - $$($1_BIN)/_the.batch: $$($1_SRCS) + $$($1_BIN)/_the.batch: $$($1_SRCS) $$($1_DEPENDS) $(MKDIR) -p $$(@D) $(RM) $$($1_BIN)/_the.batch $$($1_BIN)/_the.batch.tmp $$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.batch.tmp) $(ECHO) Compiling `$(WC) $$($1_BIN)/_the.batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files in batch $1 - ($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) -implicit:none -sourcepath "$$($1_SRCROOTSC)" -d $$($1_BIN) @$$($1_BIN)/_the.batch.tmp && \ - $$(if $$($1_JAVAH),\ - $(CAT) $$($1_BIN)/_the.batch.tmp | $(XARGS) $(GREP) -E "[[:space:]]native[[:space:]]|@GenerateNativeHeader" |\ - $(GREP) -v '*' | $(GREP) -v '//' | $(CUT) -f 1 -d ':' | $(SORT) -u |\ - $(SED) $$($1_REWRITE_INTO_CLASSES) > $$($1_BIN)/_the.batch.natives && \ - if test -s $$($1_BIN)/_the.batch.natives; then \ - $$($1_JVM) $$($1_JAVAH) "-Xbootclasspath/p:$$($1_BIN)" -d $$($1_HEADERS) @$$($1_BIN)/_the.batch.natives ; \ - fi &&) \ + ($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) -implicit:none -sourcepath "$$($1_SRCROOTSC)" -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.batch.tmp && \ $(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch) else # Ok, we have a modern javac server running! @@ -868,6 +874,7 @@ ifneq (,$$($1_JAR)) JARMAIN:=$$($1_JARMAIN),\ MANIFEST:=$$($1_MANIFEST),\ EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR),\ + JARINDEX:=$$($1_JARINDEX),\ HEADERS:=$$($1_HEADERS),\ SETUP:=$$($1_SETUP))) endif diff --git a/common/makefiles/MakeBase.gmk b/common/makefiles/MakeBase.gmk index 71150ed6443..3018a414f3b 100644 --- a/common/makefiles/MakeBase.gmk +++ b/common/makefiles/MakeBase.gmk @@ -91,6 +91,15 @@ $(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$1` `$(CAT) $(BUILDTIMESDIR)/b > $(BUILDTIMESDIR)/build_time_diff_$1 endef +# Check if the current target is the final target, as specified by +# the user on the command line. If so, call PrintEndMessage. +define CheckIfFinished +$(if $(filter $@,$(MAKECMDGOALS)),$(call PrintEndMessage)) +# If no taget is given, "all" is default. Check for that, too. +# At most one of the tests can be true. +$(if $(MAKECMDGOALS),,$(if $(filter $@,all),$(call PrintEndMessage))) +endef + # Indicate that we are done. # Record ending time and print out the total time it took to build. define MakeFinish @@ -101,6 +110,7 @@ $(BUILD_LOG_WRAPPER) $(PRINTF) "%s\n##### %-60.60s #####\n%s\n##### %-60.60s ### "########################################################################" \ $(if $(REPORT_BUILD_TIMES),"Build time `$(CAT) $(BUILDTIMESDIR)/build_time_diff_$1` for target(s) $2","") \ "########################################################################" +$(call CheckIfFinished) endef # Find all build_time_* files and print their contents in a list sorted @@ -126,6 +136,18 @@ define StopTimer $(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,TOTAL) && $(call ReportBuildTimes,$1),) endef +# Hook to be called as the very first thing when running a normal build +define AtRootMakeStart + $(call PrintStartMessage) + $(call StartTimer) +endef + +# Hook to be called as the very last thing for targets that are "top level" targets +define AtRootMakeEnd + $(call StopTimer) + $(call CheckIfFinished) +endef + # If the variable that you want to send to stdout for piping into a file or otherwise, # is potentially long, for example the a list of file paths, eg a list of all package directories. # Then you need to use ListPathsSafely, which optimistically splits the output into several shell @@ -324,4 +346,51 @@ define ListPathsSafelyNow endef +# The source tips can come from the Mercurial repository, or in the files +# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same +# directory as the original $(HGDIR) directory. +# These should not be := assignments, only used from the root Makefile. +HG_VERSION = $(shell $(HG) version 2> /dev/null) +HG_DIRECTORY=.hg +HGTIP_FILENAME=.hgtip +HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO +REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \ + $(shell $(CD) $(SRC_ROOT) ; ( $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \ + $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \ + 2> /dev/null))))) + +# Emit the repo:tip pairs to $@ +define GetSourceTips +$(CD) $(SRC_ROOT) ; \ +for i in $(REPO_LIST) IGNORE ; do \ + if [ "$${i}" = "IGNORE" ] ; then \ + continue; \ + elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \ + $(PRINTF) " %s:%s" \ + "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \ + elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \ + $(PRINTF) " %s:%s" \ + "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \ + fi; \ +done >> $@ +$(PRINTF) "\n" >> $@ +endef + +# Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk +define CreateHgTip +$(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME);\ +$(ECHO) $1/$(HGTIP_FILENAME) +endef + +define SetupLogging + ifneq ($(findstring $(LOG),debug trace),) + # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make + OLD_SHELL:=$$(SHELL) + SHELL = $$(warning Building $$@$$(if $$<, (from $$<))$(if $$?, ($$? newer)))$$(OLD_SHELL) -x + endif +endef + +# Make sure logging is setup for everyone that includes MakeBase.gmk. +$(eval $(call SetupLogging)) + endif # _MAKEBASE_GMK diff --git a/common/makefiles/Makefile b/common/makefiles/Makefile index 815f3c01c16..77420a84296 100644 --- a/common/makefiles/Makefile +++ b/common/makefiles/Makefile @@ -23,49 +23,144 @@ # questions. # -# Default to sane output from make. -# Override with empty string to get insane amount of output. -# Override with -d to get even more insane amount of debugging output. -# Override with "-d -p" to get it all. -VERBOSE=-s +# This must be the first rule +default: all + +# Find out which variables were passed explicitely on the make command line. These +# will be passed on to sub-makes, overriding spec.gmk settings. +MAKE_ARGS=$(foreach var,$(subst =command,,$(filter %=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))),$(var)=$($(var))) + +define fatal-error + # If the user specificed a "global" target (e.g. 'help'), do not exit but continue running + $$(if $$(findstring help,$$(MAKECMDGOALS)),,$$(error Cannot continue)) +endef + +ifeq ($(origin VERBOSE),undefined) + # Setup logging according to LOG (but only if VERBOSE is not given) + ifeq ($(LOG),) + # Set LOG to "warn" as default if not set (and no VERBOSE given) + LOG=warn + endif + ifeq ($(LOG),warn) + VERBOSE=-s + else ifeq ($(LOG),info) + VERBOSE= + else ifeq ($(LOG),debug) + VERBOSE= + else ifeq ($(LOG),trace) + VERBOSE=-d -p + else + $(info Error: LOG must be one of: warn, info, debug or trace.) + $(eval $(call fatal-error)) + endif +else + ifneq ($(LOG),) + # We have both a VERBOSE and a LOG argument. This is OK only if this is a repeated call by ourselves, + # but complain if this is the top-level make call. + ifeq ($(MAKELEVEL),0) + $(info Cannot use LOG=$(LOG) and VERBOSE=$(VERBOSE) at the same time. Choose one.) + $(eval $(call fatal-error)) + endif + endif +endif + +# TODO: Fix duplication in MakeBase.gmk +define SetupLogging + ifneq ($(findstring $(LOG),debug trace),) + # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make + OLD_SHELL:=$$(SHELL) + SHELL = $$(warning Building $$@$$(if $$<, (from $$<))$(if $$?, ($$? newer)))$$(OLD_SHELL) -x + endif +endef + +$(eval $(call SetupLogging)) # Find all environment or command line variables that begin with ALT. list_alt_overrides_with_origins = $(filter ALT_%=environment ALT_%=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var))))) list_alt_overrides=$(subst =command,,$(subst =environment,,$(list_alt_overrides_with_origins))) -ifneq ($(list_alt_overrides),) - $(info You have set the following ALT_ variables:) - $(foreach var,$(list_alt_overrides), $(info $(var)=$($(var)))) - $(error Using ALT_ variables is deprecated! Please clean your environment!) + +ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) + makefile_path=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) +else + makefile_path=$(lastword $(MAKEFILE_LIST)) endif +root_dir=$(patsubst %/common/makefiles/Makefile,%,$(makefile_path)) +output_dir=$(root_dir)/build -# The spec.gmk file contains the variables extracted by the configure script. -# It is usually set with SPEC=....spec.gmk on the make command line. -# However if you simply type make from the openjdk source root, it will go looking -# for a spec file, if only one is found, use it. If more than one is found, -# complain. If none is found, request the user to run configure! -SPEC ?= $(wildcard $(CURDIR)/../../build/*/spec.gmk) +ifneq ($(origin SPEC),undefined) + # We have been given a SPEC, check that it works out properly + ifeq ($(wildcard $(SPEC)),) + $(info Cannot locate spec.gmk, given by SPEC=$(SPEC)) + $(eval $(call fatal-error)) + endif + ifneq ($(origin CONF),undefined) + # We also have a CONF argument. This is OK only if this is a repeated call by ourselves, + # but complain if this is the top-level make call. + ifeq ($(MAKELEVEL),0) + $(info Cannot use CONF=$(CONF) and SPEC=$(SPEC) at the same time. Choose one.) + $(eval $(call fatal-error)) + endif + endif + # ... OK, we're satisfied, we'll use this SPEC later on +else + # Find all spec.gmk files in the build output directory + all_spec_files=$(wildcard $(output_dir)/*/spec.gmk) + ifeq ($(all_spec_files),) + $(info No configurations found for $(root_dir)! Please run configure to create a configuration.) + $(eval $(call fatal-error)) + endif + # Extract the configuration names from the path + all_confs=$(patsubst %/spec.gmk,%,$(patsubst $(output_dir)/%,%,$(all_spec_files))) -ifeq ($(words $(SPEC)),0) - $(error You must run configure!) + ifneq ($(origin CONF),undefined) + # User have given a CONF= argument. + ifeq ($(CONF),) + # If given CONF=, match all configurations + matching_confs=$(strip $(all_confs)) + else + # Otherwise select those that contain the given CONF string + matching_confs=$(strip $(foreach var,$(all_confs),$(if $(findstring $(CONF),$(var)),$(var)))) + endif + ifeq ($(matching_confs),) + $(info No configurations found matching CONF=$(CONF)) + $(info Available configurations:) + $(foreach var,$(all_confs),$(info * $(var))) + $(eval $(call fatal-error)) + else + ifeq ($(words $(matching_confs)),1) + $(info Building '$(matching_confs)' (matching CONF=$(CONF))) + else + $(info Building the following configurations (matching CONF=$(CONF)):) + $(foreach var,$(matching_confs),$(info * $(var))) + endif + endif + + # Create a SPEC definition. This will contain the path to one or more spec.gmk files. + SPEC=$(addsuffix /spec.gmk,$(addprefix $(output_dir)/,$(matching_confs))) + else + # No CONF or SPEC given, check the available configurations + ifneq ($(words $(all_spec_files)),1) + $(info No CONF or SPEC given, but more than one spec.gmk found in $(output_dir).) + $(info Available configurations:) + $(foreach var,$(all_confs),$(info * $(var))) + $(info Please retry building with CONF= or SPEC=) + $(eval $(call fatal-error)) + endif + + # We found exactly one configuration, use it + SPEC=$(strip $(all_spec_files)) + endif endif ifneq ($(words $(SPEC)),1) - ifeq ($(MAKECMDGOALS),all-conf) - SPECS:=$(shell echo $(SPEC) | sed -e 's|$(CURDIR)/build/||g' -e 's|/spec.gmk|\\n|g' -e 's| ||g') - allconf: - @echo Building configurations: - @printf "$(SPECS)" - @$(foreach s,$(SPEC),($(MAKE) SPEC=$s $(VERBOSE) VERBOSE=$(VERBOSE) images) &&) true - @echo Done building configurations: - @printf "$(SPECS)" - .PHONY: all-conf - else - $(error Since you have more than one output dir configured under build, \ - you have to either run make from the output dir of your choice \ - or specify run "make SPEC=build/.../spec.gmk" or run all the build configurations \ - using "make all-conf") - endif +# We have multiple configurations to build, call make repeatedly +all jdk hotspot jaxws jaxp corba langtools install images packages clean dist-clean: + @$(foreach spec,$(SPEC),($(MAKE) -f $(makefile_path) SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@ $(MAKE_ARGS)) &&) true + +.PHONY: all jdk hotspot jaxws jaxp corba langtools install images packages clean dist-clean + else +# This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file. # Now load the spec -include $(SPEC) @@ -88,51 +183,101 @@ $(eval $(call ResetTimers)) # Clean out any notifications from the previous build. $(shell find $(OUTPUT_ROOT) -name "_the.*.notify" $(FIND_DELETE)) -all: jdk - @$(call StopTimer) - @$(if $(JAVAC_SERVERS),rm -rf $(JAVAC_SERVERS)/*.port) +# If make was called explicitely with -j, don't add a -j ourself to sub-makes, since +# this will be inherited automatically by make. Otherwise use our default for sub-makes. +# The -j in MAKEFLAGS is only visible when executing a recipe, hence this macro. +define GetMakeJobFlag + $(if $(findstring -j,$(MAKEFLAGS)),,-j$(NUM_CORES)) +endef -langtools: start-timer +define CheckEnvironment + $(if $(list_alt_overrides), + @$(PRINTF) "\nWARNING: You have the following ALT_ variables set:\n" + @$(PRINTF) "$(foreach var,$(list_alt_overrides),$(var)=$$$(var))\n" + @$(PRINTF) "ALT_ variables are deprecated and will be ignored. Please clean your environment.\n" + ) +endef + +define PrintStartMessage + $(if $(VERBOSE),,@$(ECHO) Running make as $(MAKE) $(MFLAGS) $(MAKE_ARGS)) + $(call CheckEnvironment) + @$(ECHO) "Building OpenJDK for target $(if $(MAKECMDGOALS),'$(MAKECMDGOALS)','all') in configuration '$(CONF_NAME)'" +endef + +define PrintEndMessage + @$(ECHO) "Finished building OpenJDK for target '$@'" + $(call CheckEnvironment) +endef + +all: jdk + @$(if $(JAVAC_SERVERS),rm -rf $(JAVAC_SERVERS)/*.port) + @$(call AtRootMakeEnd) + +langtools: start-make @$(call MakeStart,langtools,all) - @($(CD) $(LANGTOOLS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) -j$(NUM_CORES) $(LANGTOOLS_MAKE_ARGS)) + @($(CD) $(LANGTOOLS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(call GetMakeJobFlag) $(LANGTOOLS_MAKE_ARGS) $(MAKE_ARGS)) @$(call MakeFinish,langtools,all) corba: langtools @$(call MakeStart,corba,all) - @($(CD) $(CORBA_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) -j$(NUM_CORES) $(CORBA_MAKE_ARGS)) + @($(CD) $(CORBA_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(call GetMakeJobFlag) $(CORBA_MAKE_ARGS) $(MAKE_ARGS)) @$(call MakeFinish,corba,all) jaxp: langtools @$(call MakeStart,jaxp,all) - @($(CD) $(JAXP_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) -j$(NUM_CORES) $(CORBA_MAKE_ARGS)) + @($(CD) $(JAXP_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(call GetMakeJobFlag) $(CORBA_MAKE_ARGS) $(MAKE_ARGS)) @$(call MakeFinish,jaxp,all) jaxws: langtools jaxp @$(call MakeStart,jaxws,all) - @($(CD) $(JAXWS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) -j$(NUM_CORES) $(CORBA_MAKE_ARGS)) + @($(CD) $(JAXWS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(call GetMakeJobFlag) $(CORBA_MAKE_ARGS) $(MAKE_ARGS)) @$(call MakeFinish,jaxws,all) hotspot: langtools @$(call MakeStart,hotspot,all) - @($(CD) $(HOTSPOT_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 $(HOTSPOT_MAKE_ARGS)) + @($(CD) $(HOTSPOT_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 $(HOTSPOT_MAKE_ARGS) $(MAKE_ARGS)) @$(call MakeFinish,hotspot,all) jdk: langtools corba jaxp jaxws hotspot @$(call MakeStart,jdk,all) - @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) -j$(NUM_CORES) $(JDK_MAKE_ARGS)) + @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(call GetMakeJobFlag) $(JDK_MAKE_ARGS) $(MAKE_ARGS)) @$(call MakeFinish,jdk,all) -images install packages: start-timer jdk langtools corba jaxp jaxws hotspot +images install packages: source-tips start-make jdk langtools corba jaxp jaxws hotspot @$(call MakeStart,jdk-images,$@) - @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) -j$(NUM_CORES) $(JDK_MAKE_ARGS) $@) + @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(call GetMakeJobFlag) $(JDK_MAKE_ARGS) $(MAKE_ARGS) $@) @$(call MakeFinish,jdk-images,$@) - @$(call StopTimer) @$(if $(JAVAC_SERVERS),rm -rf $(JAVAC_SERVERS)/*.port) + @$(call AtRootMakeEnd) -start-timer: - @$(call StartTimer) +old-images: source-tips start-make jdk langtools corba jaxp jaxws hotspot + @$(call MakeStart,jdk-old-images,$@) + @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(call GetMakeJobFlag) $(JDK_MAKE_ARGS) $(MAKE_ARGS) $@) + @$(call MakeFinish,old-jdk-images,$@) + @$(if $(JAVAC_SERVERS),rm -rf $(JAVAC_SERVERS)/*.port) + @$(call AtRootMakeEnd) + +start-make: + @$(call AtRootMakeStart) + +.PHONY: jdk hotspot jaxws jaxp corba langtools install images packages start-make + +test: start-make + @$(call MakeStart,test,$(if $(TEST),$(TEST),all)) + @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) MAKEFLAGS= -j1 PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true + @$(call MakeFinish,test,$(if $(TEST),$(TEST),all)) + @$(call AtRootMakeEnd) +.PHONY: test + + +# Stores the tips for each repository. This file is be used when constructing the jdk image and can be +# used to track the exact sources used to build that image. +source-tips: $(OUTPUT_ROOT)/source_tips +$(OUTPUT_ROOT)/source_tips: FRC + @$(MKDIR) -p $(@D) + @$(RM) $@ + @$(call GetSourceTips) -.PHONY: jdk hotspot jaxws jaxp corba langtools install images packages start-timer # Remove everything, except the output from configure. clean: @@ -152,25 +297,35 @@ clean-jdk: @$(ECHO) "Cleaned jdk build artifacts (but not langtools,corba,jaxp,jaxws,hotspot nor the build configuration)" .PHONY: clean -help: - $(info ) - $(info Typical make commands:) - $(info make) - $(info make VERBOSE= # print all commands) - $(info make VERBOSE="-d -p" # debug make as well) - $(info make all-conf # build images for all configurations) - $(info make clean # remove build artifacts) - $(info make dist-clean # you have to rerun configure) -# $(info make test # run tests) - $(info make images # create the jdk and jre images) - $(info make install # install the jdk image) -# $(info make modules # EXPERIMENTAL: Migrate JDK into a modularized form!) - $(info make packages # create zips and other packages) - -# $(info make eclipse_workspace # Create an Eclipse workspace) -# $(info make netbeans_workspace # Create a NetBeans workspace) -# $(info make vs_workspace # Create a Visual Studio workspace) - -.PHONY: help - endif + +# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration. +# If you addd more global targets, please update the fatal-error macro. + +help: + $(info ) + $(info OpenJDK Makefile help) + $(info =====================) + $(info ) + $(info Common make targets) + $(info . make [all] # Compile all code but do not create images) + $(info . make images # Create complete j2sdk and j2re images) + $(info . make install # Install the generated images locally) + $(info . make clean # Remove all files generated by make, but not those generated by configure) + $(info . make dist-clean # Remove all files generated by both make and configure) + $(info . make help # Give some help on using make) + $(info . make test # Run tests, default is all tests (see TEST below)) + $(info ) + $(info Useful make variables) + $(info . make CONF= # Build all configurations (note, assignment is empty)) + $(info . make CONF= # Build the configuration(s) with a name matching the given substring) + $(info ) + $(info . make LOG= # Change loglevel from warn (default) to the given loglevel) + $(info . # Available loglevels are: warn, info, debug and trace) + $(info . # To see executed command lines, use LOG=info) + $(info ) + $(info . make test TEST= # Only run the given test or tests, e.g.) + $(info . # make test TEST="jdk_lang jdk_net") + $(info ) +.PHONY: help +FRC: # Force target diff --git a/common/makefiles/NativeCompilation.gmk b/common/makefiles/NativeCompilation.gmk index eedffe72d5b..ee18f186c8e 100644 --- a/common/makefiles/NativeCompilation.gmk +++ b/common/makefiles/NativeCompilation.gmk @@ -28,7 +28,7 @@ # desired whenever sort is used below! ifeq (,$(_MAKEBASE_GMK)) - $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk) + $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk) endif ifeq ($(COMPILER_TYPE),CC) @@ -54,15 +54,22 @@ define add_native_source ifneq (,$$(filter %.c,$2)) # Compile as a C file - $1_$2_FLAGS=$4 + $1_$2_FLAGS=$4 $$($1_$(notdir $2)_CFLAGS) $1_$2_COMP=$5 + $1_$2_DEP_FLAG:=$(C_FLAG_DEPS) + else ifneq (,$$(filter %.m,$2)) + # Compile as a objective-c file + $1_$2_FLAGS=-x objective-c $4 $$($1_$(notdir $2)_CFLAGS) + $1_$2_COMP=$5 + $1_$2_DEP_FLAG:=$(C_FLAG_DEPS) else # Compile as a C++ file - $1_$2_FLAGS=$6 + $1_$2_FLAGS=$6 $$($1_$(notdir $2)_CXXFLAGS) $1_$2_COMP=$7 + $1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS) endif # Generate the .o (.obj) file name and place it in the bin dir. - $1_$2_OBJ:=$3/$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(notdir $2))) + $1_$2_OBJ:=$3/$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(notdir $2)))) # Only continue if this object file hasn't been processed already. This lets the first found # source file override any other with the same name. ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_OBJS_SO_FAR))) @@ -80,7 +87,7 @@ define add_native_source $$($1_$2_OBJ) : $2 ifeq ($(COMPILER_TYPE),CC) $$(call COMPILING_MSG,$$(notdir $2)) - $$($1_$2_COMP) $$($1_$2_FLAGS) -MMD -MF $$($1_$2_DEP) -c $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 + $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) -c $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 endif ifeq ($(COMPILER_TYPE),CL) $$(call COMPILING_MSG,$$(notdir $2)) @@ -109,6 +116,8 @@ define SetupNativeCompilation # EXCLUDE_FILES with these names # VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run # RC_FLAGS flags for RC. + # MAPFILE mapfile + # REORDER reorder file $(if $2,$1_$(strip $2)) $(if $3,$1_$(strip $3)) $(if $4,$1_$(strip $4)) @@ -154,7 +163,7 @@ define SetupNativeCompilation ifneq ($$($1_EXCLUDE_FILES),) $1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES)) endif - $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter %.c %.cpp,$$($1_ALL_SRCS))) + $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter %.c %.cpp %.m,$$($1_ALL_SRCS))) ifneq (,$$(strip $$($1_INCLUDE_FILES))) $1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS)) endif @@ -178,7 +187,7 @@ define SetupNativeCompilation # Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides # a reproducable order on the input files to the linker). - $1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_BIN)/,$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(notdir $$($1_SRCS)))))) + $1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_BIN)/,$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(notdir $$($1_SRCS))))))) $1 := $$($1_EXPECTED_OBJS) # Are there too many object files on disk? Perhaps because some source file was removed? $1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS))) @@ -218,6 +227,11 @@ define SetupNativeCompilation $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS) endif + ifneq (,$$($1_REORDER)) + $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER) + $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER) + endif + # Now create a list of the packages that are about to compile. Used when sending source # in a batch to the compiler. $$(shell $(RM) $$($1_BIN)/_the.list_of_sources) @@ -233,29 +247,53 @@ define SetupNativeCompilation ifeq ($(HOST_OS_API), winapi) ifneq (,$$($1_VERSIONINFO_RESOURCE)) ifneq (,$$($1_LIB)) - ifeq (dynamic,$$(patsubst %$(SHARED_LIBRARY_SUFFIX),dynamic,$$($1_LIB))) - $1_RES:=$$(patsubst %$(SHARED_LIBRARY_SUFFIX),%.res,$$($1_LIB)) - else - $1_RES:=$$(patsubst %$(STATIC_LIBRARY_SUFFIX),%.res,$$($1_LIB)) - endif + $1_BASENAME:=$$(basename $$(notdir $$($1_LIB))) endif ifneq (,$$($1_EXE)) - $1_RES:=$$(patsubst %$(EXE_SUFFIX),%.res,$$($1_EXE)) + $1_BASENAME:=$$(basename $$(notdir $$($1_EXE))) endif + $1_RES:=$$($1_BIN)/$$($1_BASENAME).res $$($1_RES): $$($1_VERSIONINFO_RESOURCE) $(RC) $$($1_RC_FLAGS) $(CC_OUT_OPTION)$$@ $$($1_VERSIONINFO_RESOURCE) endif + ifneq (,$$($1_MANIFEST)) + $1_PROGRAM:=$$(basename $$(notdir $$($1_EXE))) + $1_GEN_MANIFEST:=$$($1_BIN)/$$($1_PROGRAM).manifest + IMVERSIONVALUE:=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER) + $$($1_GEN_MANIFEST): $$($1_MANIFEST) + $(SED) 's%IMVERSION%$$(IMVERSIONVALUE)%g;s%PROGRAM%$$($1_PROGRAM)%g' $$< > $$@ + endif + endif + + # mapfile doesnt seem to be implemented on macosx (yet??) + ifneq ($(HOST_OS),macosx) + ifneq ($(HOST_OS),windows) + $1_REAL_MAPFILE := $$($1_MAPFILE) + ifneq (,$$($1_REORDER)) + $1_REAL_MAPFILE := $$($1_BIN)/mapfile + + $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER) + $$(MKDIR) -p $$(@D) + $$(CP) $$($1_MAPFILE) $$@.tmp + $$(SED) -e 's=OUTPUTDIR=$$($1_BIN)=' $$($1_REORDER) >> $$@.tmp + $$(MV) $$@.tmp $$@ + endif + endif endif # Pickup extra HOST_OS_API dependent variables (posix or winapi) and # (linux,solaris,windows,bsd) for LDFLAGS and LDFLAGS_SUFFIX $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(HOST_OS_API)) $$($1_LDFLAGS_$(PLATFORM)) $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(HOST_OS_API)) $$($1_LDFLAGS_SUFFIX_$(PLATFORM)) + ifneq (,$$($1_REAL_MAPFILE)) + $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE)) + endif + ifneq (,$$($1_LIB)) ifeq (dynamic,$$(patsubst %$(SHARED_LIBRARY_SUFFIX),dynamic,$$($1_LIB))) # Generating a dynamic library. $1_EXTRA_LDFLAGS+=$$(call SET_SHARED_LIBRARY_NAME,$$(notdir $$($1_LIB))) - $$($1_LIB) : $$($1_EXPECTED_OBJS) $$($1_RES) + $$($1_LIB) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE) $$(call LINKING_MSG,$$(notdir $$($1_LIB))) $$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(LD_OUT_OPTION)$$($1_LIB) \ $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) @@ -269,9 +307,13 @@ define SetupNativeCompilation endif ifneq (,$$($1_EXE)) # A executable binary has been specified, setup the target for it. - $$($1_EXE) : $$($1_EXPECTED_OBJS) $$($1_RES) + $$($1_EXE) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST) $$(call LINKING_EXE_MSG,$$(notdir $$($1_EXE))) $$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_EXE) \ - $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX) + $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \ + $$($1_EXTRA_LDFLAGS_SUFFIX) + ifneq (,$$($1_GEN_MANIFEST)) + $(MT) -nologo /manifest $$($1_GEN_MANIFEST) /outputresource:$$@;#1 + endif endif endef diff --git a/corba/.hgtags b/corba/.hgtags index d092dca1acd..743ca2bdd1b 100644 --- a/corba/.hgtags +++ b/corba/.hgtags @@ -163,3 +163,5 @@ b8cbfb31139f820e5e094ba71449e58159fbe22e jdk8-b38 785af00e2827990f149b32ec37f523dbca3efdd1 jdk8-b39 56d030e5035fdee5bba6cf318a06287fda5d67ec jdk8-b40 113f0d5f0a08aa0947b3edf783b603e7f042748a jdk8-b41 +79cc42c9c71bbd6630ede681642e98f5e4a841fa jdk8-b42 +cd879aff5d3cc1f58829aab3116880aa19525b78 jdk8-b43 diff --git a/corba/make/common/shared/Platform.gmk b/corba/make/common/shared/Platform.gmk index a3fe6d5ff21..822c1e787b8 100644 --- a/corba/make/common/shared/Platform.gmk +++ b/corba/make/common/shared/Platform.gmk @@ -143,7 +143,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) REQUIRED_FREE_SPACE=1040000 endif # How much RAM does this machine have: - MB_OF_MEMORY=$(shell /etc/prtconf | fgrep 'Memory size:' | expand | cut -d' ' -f3) + MB_OF_MEMORY:=$(shell /usr/sbin/prtconf 2>/dev/null | fgrep 'Memory size:' | expand | cut -d' ' -f3) endif # Platform settings specific to Linux diff --git a/corba/makefiles/Makefile b/corba/makefiles/Makefile index 6cd7dfa735d..c97c32dd07d 100644 --- a/corba/makefiles/Makefile +++ b/corba/makefiles/Makefile @@ -27,13 +27,14 @@ # Makefile for building the corba workspace. # +# This must be the first rule +default: all + include $(SPEC) include MakeBase.gmk include JavaCompilation.gmk include IdlCompilation.gmk -default: all - JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar # The Corba sources are old and generates a LOT of warnings. @@ -105,9 +106,9 @@ $(eval $(call SetupArchive,ARCHIVE_LOGUTIL,$(BUILD_LOGUTIL),\ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java : \ $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \ $(CORBA_OUTPUTDIR)/btjars/logutil.jar - mkdir -p $(@D) - rm -f $(@D)/_the_wrappers.d - echo Generating class file from $*.mc + $(MKDIR) -p $(@D) + $(RM) -f $(@D)/_the_wrappers.d + $(ECHO) Generating class file from $*.mc $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D) # Generate LogWrapper properties file by concatening resource files @@ -120,15 +121,15 @@ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properti $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \ $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \ $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource - mkdir -p $(@D) - echo Concatenating 8 resource files into $(@F) + $(MKDIR) -p $(@D) + $(ECHO) Concatenating 8 resource files into $(@F) $(CAT) $^ > $@ # The resources files are generated from lisp-like .mc files. $(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource : $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar - mkdir -p $(@D) - rm -f $(@D)/_the_wrappers.d - echo Generating resource file from $*.mc + $(MKDIR) -p $(@D) + $(RM) -f $(@D)/_the_wrappers.d + $(ECHO) Generating resource file from $*.mc $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D) @@ -142,8 +143,8 @@ $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d : $(CORBA_OUTPUTDIR)/btjars/logut $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \ $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties - mkdir -p $(@D) - echo LOGWRAPPERS_ARE_CREATED=yes > $@ + $(MKDIR) -p $(@D) + $(ECHO) LOGWRAPPERS_ARE_CREATED=yes > $@ # Trigger the generation of the logwrappers. After the logwrapper classes and # resources have been created, then the makefile will restart and the newly @@ -167,8 +168,8 @@ ifeq ($(LOGWRAPPERS_ARE_CREATED),yes) $(BUILD_IDLS) : $(CORBA_OUTPUTDIR)/btjars/idlj.jar $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d : $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar - mkdir -p $(@D) - echo IDLS_ARE_CREATED=yes > $@ + $(MKDIR) -p $(@D) + $(ECHO) IDLS_ARE_CREATED=yes > $@ -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d @@ -229,15 +230,16 @@ ifeq ($(LOGWRAPPERS_ARE_CREATED),yes) # The created src.zip now contains .java and .properties files used to create the classes in classes.jar # and is ready for inclusion into the jdk src.zip - BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/orb.idl $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/ir.idl + BIN_FILES:=$(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \ + $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl $(CORBA_OUTPUTDIR)/dist/lib/bin.zip : $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar - mkdir -p $(CORBA_OUTPUTDIR)/dist/lib - mkdir -p $(CORBA_OUTPUTDIR)/lib - rm -f $@ - echo Creating `basename $@` - cp $(CORBA_TOPDIR)/src/share/classes/org/omg/CORBA/*.idl $(CORBA_OUTPUTDIR)/lib - chmod ug+w $(CORBA_OUTPUTDIR)/lib/* + $(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib + $(MKDIR) -p $(CORBA_OUTPUTDIR)/lib + $(RM) -f $@ + $(ECHO) Creating `basename $@` + $(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib + $(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/* (cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl) # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl @@ -252,6 +254,6 @@ ifeq ($(LOGWRAPPERS_ARE_CREATED),yes) endif clean: - rm -rf $(CORBA_OUTPUTDIR) + $(RM) -rf $(CORBA_OUTPUTDIR) .PHONY: default all clean clobber diff --git a/hotspot/.hgtags b/hotspot/.hgtags index c82b49c5543..905d081f32c 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -252,3 +252,6 @@ ff9decc8235d5af80ea45fda4ecbe643ea252564 jdk8-b40 785573170238f0eae6dc8e22ecf1050fbc9ea055 hs24-b12 37add4fa0296705f67481e1fd50e2900cd25e39b jdk8-b41 bd568544be7fcd12a9327e6c448592198d57b043 hs24-b13 +55954061c6e8750ea39a63523fd65d580db6eeb1 jdk8-b42 +e77b8e0ed1f84e3e268239e276c7ab64fa573baa jdk8-b43 +5ba29a1db46ecb80a321ca873adb56a3fe6ad320 hs24-b14 diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java index 5346d490761..d19dc93cfae 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -50,8 +50,7 @@ public class ConstMethod extends Oop { private static synchronized void initialize(TypeDataBase db) throws WrongTypeException { Type type = db.lookupType("constMethodOopDesc"); - // Backpointer to non-const methodOop - method = new OopField(type.getOopField("_method"), 0); + constants = new OopField(type.getOopField("_constants"), 0); // The exception handler table. 4-tuples of ints [start_pc, end_pc, // handler_pc, catch_type index] For methods with no exceptions the // table is pointing to Universe::the_empty_int_array @@ -69,6 +68,7 @@ public class ConstMethod extends Oop { nameIndex = new CIntField(type.getCIntegerField("_name_index"), 0); signatureIndex = new CIntField(type.getCIntegerField("_signature_index"), 0); genericSignatureIndex = new CIntField(type.getCIntegerField("_generic_signature_index"),0); + idnum = new CIntField(type.getCIntegerField("_method_idnum"), 0); // start of byte code bytecodeOffset = type.getSize(); @@ -85,7 +85,7 @@ public class ConstMethod extends Oop { } // Fields - private static OopField method; + private static OopField constants; private static OopField exceptionTable; private static CIntField constMethodSize; private static ByteField flags; @@ -93,6 +93,7 @@ public class ConstMethod extends Oop { private static CIntField nameIndex; private static CIntField signatureIndex; private static CIntField genericSignatureIndex; + private static CIntField idnum; // start of bytecode private static long bytecodeOffset; @@ -100,9 +101,15 @@ public class ConstMethod extends Oop { private static long checkedExceptionElementSize; private static long localVariableTableElementSize; - // Accessors for declared fields public Method getMethod() { - return (Method) method.getValue(this); + InstanceKlass ik = (InstanceKlass)getConstants().getPoolHolder(); + ObjArray methods = ik.getMethods(); + return (Method)methods.getObjAt(getIdNum()); + } + + // Accessors for declared fields + public ConstantPool getConstants() { + return (ConstantPool) constants.getValue(this); } public TypeArray getExceptionTable() { @@ -133,6 +140,10 @@ public class ConstMethod extends Oop { return genericSignatureIndex.getValue(this); } + public long getIdNum() { + return idnum.getValue(this); + } + public Symbol getName() { return getMethod().getName(); } @@ -223,7 +234,7 @@ public class ConstMethod extends Oop { public void iterateFields(OopVisitor visitor, boolean doVMFields) { super.iterateFields(visitor, doVMFields); if (doVMFields) { - visitor.doOop(method, true); + visitor.doOop(constants, true); visitor.doOop(exceptionTable, true); visitor.doCInt(constMethodSize, true); visitor.doByte(flags, true); diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java index d42115b90e3..b691f1537c3 100644 --- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java +++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,7 +48,6 @@ public class Method extends Oop { private static synchronized void initialize(TypeDataBase db) throws WrongTypeException { Type type = db.lookupType("methodOopDesc"); constMethod = new OopField(type.getOopField("_constMethod"), 0); - constants = new OopField(type.getOopField("_constants"), 0); methodData = new OopField(type.getOopField("_method_data"), 0); methodSize = new CIntField(type.getCIntegerField("_method_size"), 0); maxStack = new CIntField(type.getCIntegerField("_max_stack"), 0); @@ -83,7 +82,6 @@ public class Method extends Oop { // Fields private static OopField constMethod; - private static OopField constants; private static OopField methodData; private static CIntField methodSize; private static CIntField maxStack; @@ -125,7 +123,9 @@ public class Method extends Oop { // Accessors for declared fields public ConstMethod getConstMethod() { return (ConstMethod) constMethod.getValue(this); } - public ConstantPool getConstants() { return (ConstantPool) constants.getValue(this); } + public ConstantPool getConstants() { + return getConstMethod().getConstants(); + } public MethodData getMethodData() { return (MethodData) methodData.getValue(this); } public TypeArray getExceptionTable() { return getConstMethod().getExceptionTable(); } /** WARNING: this is in words, not useful in this system; use getObjectSize() instead */ @@ -281,7 +281,6 @@ public class Method extends Oop { super.iterateFields(visitor, doVMFields); if (doVMFields) { visitor.doOop(constMethod, true); - visitor.doOop(constants, true); visitor.doCInt(methodSize, true); visitor.doCInt(maxStack, true); visitor.doCInt(maxLocals, true); diff --git a/hotspot/make/bsd/makefiles/gcc.make b/hotspot/make/bsd/makefiles/gcc.make index 938da94fe66..249628ee7fa 100644 --- a/hotspot/make/bsd/makefiles/gcc.make +++ b/hotspot/make/bsd/makefiles/gcc.make @@ -214,7 +214,7 @@ endif # Flags for generating make dependency flags. ifneq ("${CC_VER_MAJOR}", "2") -DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) +DEPFLAGS = -fpch-deps -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) endif # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version index fd867f1ad0a..76b61ffa403 100644 --- a/hotspot/make/hotspot_version +++ b/hotspot/make/hotspot_version @@ -35,7 +35,7 @@ HOTSPOT_VM_COPYRIGHT=Copyright 2012 HS_MAJOR_VER=24 HS_MINOR_VER=0 -HS_BUILD_NUMBER=13 +HS_BUILD_NUMBER=14 JDK_MAJOR_VER=1 JDK_MINOR_VER=8 diff --git a/hotspot/make/jprt.properties b/hotspot/make/jprt.properties index 964413b8ff1..b49573ca37f 100644 --- a/hotspot/make/jprt.properties +++ b/hotspot/make/jprt.properties @@ -54,72 +54,72 @@ jprt.sync.push=false # Define the Solaris platforms we want for the various releases jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10 jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10 -jprt.my.solaris.sparc.jdk7u4=${jprt.my.solaris.sparc.jdk7} +jprt.my.solaris.sparc.jdk7u6=${jprt.my.solaris.sparc.jdk7} jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}} jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10 jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10 -jprt.my.solaris.sparcv9.jdk7u4=${jprt.my.solaris.sparcv9.jdk7} +jprt.my.solaris.sparcv9.jdk7u6=${jprt.my.solaris.sparcv9.jdk7} jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}} jprt.my.solaris.i586.jdk8=solaris_i586_5.10 jprt.my.solaris.i586.jdk7=solaris_i586_5.10 -jprt.my.solaris.i586.jdk7u4=${jprt.my.solaris.i586.jdk7} +jprt.my.solaris.i586.jdk7u6=${jprt.my.solaris.i586.jdk7} jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}} jprt.my.solaris.x64.jdk8=solaris_x64_5.10 jprt.my.solaris.x64.jdk7=solaris_x64_5.10 -jprt.my.solaris.x64.jdk7u4=${jprt.my.solaris.x64.jdk7} +jprt.my.solaris.x64.jdk7u6=${jprt.my.solaris.x64.jdk7} jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} jprt.my.linux.i586.jdk8=linux_i586_2.6 jprt.my.linux.i586.jdk7=linux_i586_2.6 -jprt.my.linux.i586.jdk7u4=${jprt.my.linux.i586.jdk7} +jprt.my.linux.i586.jdk7u6=${jprt.my.linux.i586.jdk7} jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}} jprt.my.linux.x64.jdk8=linux_x64_2.6 jprt.my.linux.x64.jdk7=linux_x64_2.6 -jprt.my.linux.x64.jdk7u4=${jprt.my.linux.x64.jdk7} +jprt.my.linux.x64.jdk7u6=${jprt.my.linux.x64.jdk7} jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}} jprt.my.linux.ppc.jdk8=linux_ppc_2.6 jprt.my.linux.ppc.jdk7=linux_ppc_2.6 -jprt.my.linux.ppc.jdk7u4=${jprt.my.linux.ppc.jdk7} +jprt.my.linux.ppc.jdk7u6=${jprt.my.linux.ppc.jdk7} jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}} jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6 -jprt.my.linux.ppcv2.jdk7u4=${jprt.my.linux.ppcv2.jdk7} +jprt.my.linux.ppcv2.jdk7u6=${jprt.my.linux.ppcv2.jdk7} jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}} jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6 -jprt.my.linux.ppcsflt.jdk7u4=${jprt.my.linux.ppcsflt.jdk7} +jprt.my.linux.ppcsflt.jdk7u6=${jprt.my.linux.ppcsflt.jdk7} jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}} jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6 jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6 -jprt.my.linux.armvfp.jdk7u4=${jprt.my.linux.armvfp.jdk7} +jprt.my.linux.armvfp.jdk7u6=${jprt.my.linux.armvfp.jdk7} jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}} jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6 -jprt.my.linux.armsflt.jdk7u4=${jprt.my.linux.armsflt.jdk7} +jprt.my.linux.armsflt.jdk7u6=${jprt.my.linux.armsflt.jdk7} jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}} jprt.my.macosx.x64.jdk8=macosx_x64_10.7 jprt.my.macosx.x64.jdk7=macosx_x64_10.7 -jprt.my.macosx.x64.jdk7u4=${jprt.my.macosx.x64.jdk7} +jprt.my.macosx.x64.jdk7u6=${jprt.my.macosx.x64.jdk7} jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}} jprt.my.windows.i586.jdk8=windows_i586_5.1 jprt.my.windows.i586.jdk7=windows_i586_5.1 -jprt.my.windows.i586.jdk7u4=${jprt.my.windows.i586.jdk7} +jprt.my.windows.i586.jdk7u6=${jprt.my.windows.i586.jdk7} jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} jprt.my.windows.x64.jdk8=windows_x64_5.2 jprt.my.windows.x64.jdk7=windows_x64_5.2 -jprt.my.windows.x64.jdk7u4=${jprt.my.windows.x64.jdk7} +jprt.my.windows.x64.jdk7u6=${jprt.my.windows.x64.jdk7} jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}} # Standard list of jprt build targets for this source tree @@ -154,7 +154,7 @@ jprt.build.targets.all=${jprt.build.targets.standard}, \ jprt.build.targets.jdk8=${jprt.build.targets.all} jprt.build.targets.jdk7=${jprt.build.targets.all} -jprt.build.targets.jdk7u4=${jprt.build.targets.all} +jprt.build.targets.jdk7u6=${jprt.build.targets.all} jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}} # Subset lists of test targets for this source tree @@ -346,12 +346,12 @@ jprt.my.macosx.x64.test.targets = \ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_CMS, \ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_G1, \ - ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC -# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \ -# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_tiered, \ -# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \ -# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \ -# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC, \ + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \ + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_nontiered, \ + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \ + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \ + ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC jprt.my.windows.i586.test.targets = \ ${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ @@ -447,7 +447,7 @@ jprt.test.targets.embedded= \ jprt.test.targets.jdk8=${jprt.test.targets.standard} jprt.test.targets.jdk7=${jprt.test.targets.standard} -jprt.test.targets.jdk7u4=${jprt.test.targets.jdk7} +jprt.test.targets.jdk7u6=${jprt.test.targets.jdk7} jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}} # The default test/Makefile targets that should be run @@ -507,6 +507,9 @@ jprt.make.rule.test.targets.embedded = \ jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard} jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard} -jprt.make.rule.test.targets.jdk7u4=${jprt.make.rule.test.targets.jdk7} +jprt.make.rule.test.targets.jdk7u6=${jprt.make.rule.test.targets.jdk7} jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}} +# 7155453: Work-around to prevent popups on OSX from blocking test completion +# but the work-around is added to all platforms to be consistent +jprt.jbb.options=-Djava.awt.headless=true diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make index 57fcad6f556..ff0a3753da4 100644 --- a/hotspot/make/linux/makefiles/gcc.make +++ b/hotspot/make/linux/makefiles/gcc.make @@ -166,7 +166,7 @@ endif # Flags for generating make dependency flags. ifneq ("${CC_VER_MAJOR}", "2") -DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) +DEPFLAGS = -fpch-deps -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) endif # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. diff --git a/hotspot/make/solaris/makefiles/gcc.make b/hotspot/make/solaris/makefiles/gcc.make index 4d0db9e7a7a..be26f6d418c 100644 --- a/hotspot/make/solaris/makefiles/gcc.make +++ b/hotspot/make/solaris/makefiles/gcc.make @@ -141,7 +141,7 @@ OPT_CFLAGS/NOOPT=-O0 # Flags for generating make dependency flags. ifneq ("${CC_VER_MAJOR}", "2") -DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) +DEPFLAGS = -fpch-deps -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) endif # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp index e432fedd68b..7b1bf6f1c83 100644 --- a/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp @@ -644,30 +644,6 @@ void LIRGenerator::do_CompareOp(CompareOp* x) { } -void LIRGenerator::do_AttemptUpdate(Intrinsic* x) { - assert(x->number_of_arguments() == 3, "wrong type"); - LIRItem obj (x->argument_at(0), this); // AtomicLong object - LIRItem cmp_value (x->argument_at(1), this); // value to compare with field - LIRItem new_value (x->argument_at(2), this); // replace field with new_value if it matches cmp_value - - obj.load_item(); - cmp_value.load_item(); - new_value.load_item(); - - // generate compare-and-swap and produce zero condition if swap occurs - int value_offset = sun_misc_AtomicLongCSImpl::value_offset(); - LIR_Opr addr = FrameMap::O7_opr; - __ add(obj.result(), LIR_OprFact::intConst(value_offset), addr); - LIR_Opr t1 = FrameMap::G1_opr; // temp for 64-bit value - LIR_Opr t2 = FrameMap::G3_opr; // temp for 64-bit value - __ cas_long(addr, cmp_value.result(), new_value.result(), t1, t2); - - // generate conditional move of boolean result - LIR_Opr result = rlock_result(x); - __ cmove(lir_cond_equal, LIR_OprFact::intConst(1), LIR_OprFact::intConst(0), result, T_LONG); -} - - void LIRGenerator::do_CompareAndSwap(Intrinsic* x, ValueType* type) { assert(x->number_of_arguments() == 4, "wrong type"); LIRItem obj (x->argument_at(0), this); // object @@ -989,10 +965,10 @@ void LIRGenerator::do_NewMultiArray(NewMultiArray* x) { if (!x->klass()->is_loaded() || PatchALot) { patching_info = state_for(x, x->state_before()); - // cannot re-use same xhandlers for multiple CodeEmitInfos, so - // clone all handlers. This is handled transparently in other - // places by the CodeEmitInfo cloning logic but is handled - // specially here because a stub isn't being used. + // Cannot re-use same xhandlers for multiple CodeEmitInfos, so + // clone all handlers (NOTE: Usually this is handled transparently + // by the CodeEmitInfo cloning logic in CodeStub constructors but + // is done explicitly here because a stub isn't being used). x->set_exception_handlers(new XHandlers(x->exception_handlers())); } CodeEmitInfo* info = state_for(x, x->state()); diff --git a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp index f85d4e33111..6736f5c0a51 100644 --- a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -490,7 +490,8 @@ address InterpreterGenerator::generate_accessor_entry(void) { ConstantPoolCacheEntry::size()) * BytesPerWord), G1_scratch); // get constant pool cache - __ ld_ptr(G5_method, in_bytes(methodOopDesc::constants_offset()), G3_scratch); + __ ld_ptr(G5_method, in_bytes(methodOopDesc::const_offset()), G3_scratch); + __ ld_ptr(G3_scratch, in_bytes(constMethodOopDesc::constants_offset()), G3_scratch); __ ld_ptr(G3_scratch, constantPoolOopDesc::cache_offset_in_bytes(), G3_scratch); // get specific constant pool cache entry @@ -768,7 +769,8 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) { // for static methods insert the mirror argument const int mirror_offset = in_bytes(Klass::java_mirror_offset()); - __ ld_ptr(Address(G5_method, 0, in_bytes(methodOopDesc:: constants_offset())), O1); + __ ld_ptr(Address(G5_method, 0, in_bytes(methodOopDesc:: const_offset())), O1); + __ ld_ptr(Address(O1, 0, in_bytes(constMethodOopDesc::constants_offset())), O1); __ ld_ptr(Address(O1, 0, constantPoolOopDesc::pool_holder_offset_in_bytes()), O1); __ ld_ptr(O1, mirror_offset, O1); // where the mirror handle body is allocated: @@ -1047,7 +1049,7 @@ void CppInterpreterGenerator::generate_compute_interpreter_state(const Register assert_different_registers(state, prev_state); assert_different_registers(prev_state, G3_scratch); const Register Gtmp = G3_scratch; - const Address constants (G5_method, 0, in_bytes(methodOopDesc::constants_offset())); + const Address constMethod (G5_method, 0, in_bytes(methodOopDesc::const_offset())); const Address access_flags (G5_method, 0, in_bytes(methodOopDesc::access_flags_offset())); const Address size_of_parameters(G5_method, 0, in_bytes(methodOopDesc::size_of_parameters_offset())); const Address max_stack (G5_method, 0, in_bytes(methodOopDesc::max_stack_offset())); @@ -1155,7 +1157,8 @@ void CppInterpreterGenerator::generate_compute_interpreter_state(const Register __ set((int) BytecodeInterpreter::method_entry, O1); __ st(O1, XXX_STATE(_msg)); - __ ld_ptr(constants, O3); + __ ld_ptr(constMethod, O3); + __ ld_ptr(O3, in_bytes(constMethodOopDesc::constants_offset()), O3); __ ld_ptr(O3, constantPoolOopDesc::cache_offset_in_bytes(), O2); __ st_ptr(O2, XXX_STATE(_constants)); @@ -1178,7 +1181,8 @@ void CppInterpreterGenerator::generate_compute_interpreter_state(const Register __ ld_ptr(XXX_STATE(_locals), O1); __ br( Assembler::zero, true, Assembler::pt, got_obj); __ delayed()->ld_ptr(O1, 0, O1); // get receiver for not-static case - __ ld_ptr(constants, O1); + __ ld_ptr(constMethod, O1); + __ ld_ptr( O1, in_bytes(constMethodOopDesc::constants_offset()), O1); __ ld_ptr( O1, constantPoolOopDesc::pool_holder_offset_in_bytes(), O1); // lock the mirror, not the klassOop __ ld_ptr( O1, mirror_offset, O1); @@ -1536,7 +1540,7 @@ address InterpreterGenerator::generate_normal_entry(bool synchronized) { const Register Gtmp1 = G3_scratch; // const Register Lmirror = L1; // native mirror (native calls only) - const Address constants (G5_method, 0, in_bytes(methodOopDesc::constants_offset())); + const Address constMethod (G5_method, 0, in_bytes(methodOopDesc::const_offset())); const Address access_flags (G5_method, 0, in_bytes(methodOopDesc::access_flags_offset())); const Address size_of_parameters(G5_method, 0, in_bytes(methodOopDesc::size_of_parameters_offset())); const Address max_stack (G5_method, 0, in_bytes(methodOopDesc::max_stack_offset())); diff --git a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp index 8e3b919cfe3..eee2148415f 100644 --- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -934,8 +934,14 @@ void InterpreterMacroAssembler::index_check(Register array, Register index, int } +void InterpreterMacroAssembler::get_const(Register Rdst) { + ld_ptr(Lmethod, in_bytes(methodOopDesc::const_offset()), Rdst); +} + + void InterpreterMacroAssembler::get_constant_pool(Register Rdst) { - ld_ptr(Lmethod, in_bytes(methodOopDesc::constants_offset()), Rdst); + get_const(Rdst); + ld_ptr(Rdst, in_bytes(constMethodOopDesc::constants_offset()), Rdst); } diff --git a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp index 8e05e9a1e80..4732bf0a639 100644 --- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp +++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -205,6 +205,7 @@ class InterpreterMacroAssembler: public MacroAssembler { void index_check(Register array, Register index, int index_shift, Register tmp, Register res); void index_check_without_pop(Register array, Register index, int index_shift, Register tmp, Register res); + void get_const(Register Rdst); void get_constant_pool(Register Rdst); void get_constant_pool_cache(Register Rdst); void get_cpool_and_tags(Register Rcpool, Register Rtags); diff --git a/hotspot/src/cpu/sparc/vm/sparc.ad b/hotspot/src/cpu/sparc/vm/sparc.ad index e4f868baf0c..43c9976bbde 100644 --- a/hotspot/src/cpu/sparc/vm/sparc.ad +++ b/hotspot/src/cpu/sparc/vm/sparc.ad @@ -827,7 +827,6 @@ void emit_form3_mem_reg(CodeBuffer &cbuf, const MachNode* n, int primary, int te // a Load // inputs are (0:control, 1:memory, 2:address) if (!(n->ideal_Opcode()==ld_op) && // Following are special cases - !(n->ideal_Opcode()==Op_LoadLLocked && ld_op==Op_LoadI) && !(n->ideal_Opcode()==Op_LoadPLocked && ld_op==Op_LoadP) && !(n->ideal_Opcode()==Op_LoadI && ld_op==Op_LoadF) && !(n->ideal_Opcode()==Op_LoadF && ld_op==Op_LoadI) && @@ -7306,17 +7305,6 @@ instruct loadPLocked(iRegP dst, memory mem) %{ ins_pipe(iload_mem); %} -// LoadL-locked. Same as a regular long load when used with a compare-swap -instruct loadLLocked(iRegL dst, memory mem) %{ - match(Set dst (LoadLLocked mem)); - ins_cost(MEMORY_REF_COST); - size(4); - format %{ "LDX $mem,$dst\t! long" %} - opcode(Assembler::ldx_op3); - ins_encode(simple_form3_mem_reg( mem, dst ) ); - ins_pipe(iload_mem); -%} - instruct storePConditional( iRegP heap_top_ptr, iRegP oldval, g3RegP newval, flagsRegP pcc ) %{ match(Set pcc (StorePConditional heap_top_ptr (Binary oldval newval))); effect( KILL newval ); diff --git a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp index 98028af0ea0..e5f0df08c39 100644 --- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp +++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -371,7 +371,8 @@ void InterpreterGenerator::lock_method(void) { __ br( Assembler::zero, true, Assembler::pt, done); __ delayed()->ld_ptr(Llocals, Interpreter::local_offset_in_bytes(0), O0); // get receiver for not-static case - __ ld_ptr( Lmethod, in_bytes(methodOopDesc::constants_offset()), O0); + __ ld_ptr( Lmethod, in_bytes(methodOopDesc::const_offset()), O0); + __ ld_ptr( O0, in_bytes(constMethodOopDesc::constants_offset()), O0); __ ld_ptr( O0, constantPoolOopDesc::pool_holder_offset_in_bytes(), O0); // lock the mirror, not the klassOop @@ -670,7 +671,8 @@ address InterpreterGenerator::generate_accessor_entry(void) { ConstantPoolCacheEntry::size()) * BytesPerWord), G1_scratch); // get constant pool cache - __ ld_ptr(G5_method, methodOopDesc::constants_offset(), G3_scratch); + __ ld_ptr(G5_method, methodOopDesc::const_offset(), G3_scratch); + __ ld_ptr(G3_scratch, constMethodOopDesc::constants_offset(), G3_scratch); __ ld_ptr(G3_scratch, constantPoolOopDesc::cache_offset_in_bytes(), G3_scratch); // get specific constant pool cache entry @@ -993,7 +995,8 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) { // for static methods insert the mirror argument const int mirror_offset = in_bytes(Klass::java_mirror_offset()); - __ ld_ptr(Lmethod, methodOopDesc:: constants_offset(), O1); + __ ld_ptr(Lmethod, methodOopDesc:: const_offset(), O1); + __ ld_ptr(O1, constMethodOopDesc::constants_offset(), O1); __ ld_ptr(O1, constantPoolOopDesc::pool_holder_offset_in_bytes(), O1); __ ld_ptr(O1, mirror_offset, O1); #ifdef ASSERT diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.cpp b/hotspot/src/cpu/x86/vm/assembler_x86.cpp index 4537a24e002..8409fd73e18 100644 --- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp +++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp @@ -6927,21 +6927,42 @@ void MacroAssembler::pow_exp_core_encoding() { addptr(rsp,sizeof(jdouble)); } +void MacroAssembler::increase_precision() { + subptr(rsp, BytesPerWord); + fnstcw(Address(rsp, 0)); + movl(rax, Address(rsp, 0)); + orl(rax, 0x300); + push(rax); + fldcw(Address(rsp, 0)); + pop(rax); +} + +void MacroAssembler::restore_precision() { + fldcw(Address(rsp, 0)); + addptr(rsp, BytesPerWord); +} + void MacroAssembler::fast_pow() { // computes X^Y = 2^(Y * log2(X)) // if fast computation is not possible, result is NaN. Requires // fallback from user of this macro. + // increase precision for intermediate steps of the computation + increase_precision(); fyl2x(); // Stack: (Y*log2(X)) ... pow_exp_core_encoding(); // Stack: exp(X) ... + restore_precision(); } void MacroAssembler::fast_exp() { // computes exp(X) = 2^(X * log2(e)) // if fast computation is not possible, result is NaN. Requires // fallback from user of this macro. + // increase precision for intermediate steps of the computation + increase_precision(); fldl2e(); // Stack: log2(e) X ... fmulp(1); // Stack: (X*log2(e)) ... pow_exp_core_encoding(); // Stack: exp(X) ... + restore_precision(); } void MacroAssembler::pow_or_exp(bool is_exp, int num_fpu_regs_in_use) { diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.hpp b/hotspot/src/cpu/x86/vm/assembler_x86.hpp index d0f1171f9b0..2e2fca03354 100644 --- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp +++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp @@ -2395,6 +2395,8 @@ class MacroAssembler: public Assembler { // runtime call. void fast_pow(); void fast_exp(); + void increase_precision(); + void restore_precision(); // computes exp(x). Fallback to runtime call included. void exp_with_fallback(int num_fpu_regs_in_use) { pow_or_exp(true, num_fpu_regs_in_use); } diff --git a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp index 764c9cff7d5..dedde0b6ef3 100644 --- a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp +++ b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp @@ -2673,7 +2673,7 @@ void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2, #endif // _LP64 } } else { - ShouldNotReachHere(); + fatal(err_msg("unexpected type: %s", basictype_to_str(c->type()))); } // cpu register - address } else if (opr2->is_address()) { diff --git a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp index 66d8ed0a845..deca1a0edcb 100644 --- a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp +++ b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp @@ -718,35 +718,6 @@ void LIRGenerator::do_CompareOp(CompareOp* x) { } -void LIRGenerator::do_AttemptUpdate(Intrinsic* x) { - assert(x->number_of_arguments() == 3, "wrong type"); - LIRItem obj (x->argument_at(0), this); // AtomicLong object - LIRItem cmp_value (x->argument_at(1), this); // value to compare with field - LIRItem new_value (x->argument_at(2), this); // replace field with new_value if it matches cmp_value - - // compare value must be in rdx,eax (hi,lo); may be destroyed by cmpxchg8 instruction - cmp_value.load_item_force(FrameMap::long0_opr); - - // new value must be in rcx,ebx (hi,lo) - new_value.load_item_force(FrameMap::long1_opr); - - // object pointer register is overwritten with field address - obj.load_item(); - - // generate compare-and-swap; produces zero condition if swap occurs - int value_offset = sun_misc_AtomicLongCSImpl::value_offset(); - LIR_Opr addr = new_pointer_register(); - __ leal(LIR_OprFact::address(new LIR_Address(obj.result(), value_offset, T_LONG)), addr); - LIR_Opr t1 = LIR_OprFact::illegalOpr; // no temp needed - LIR_Opr t2 = LIR_OprFact::illegalOpr; // no temp needed - __ cas_long(addr, cmp_value.result(), new_value.result(), t1, t2); - - // generate conditional move of boolean result - LIR_Opr result = rlock_result(x); - __ cmove(lir_cond_equal, LIR_OprFact::intConst(1), LIR_OprFact::intConst(0), result, T_LONG); -} - - void LIRGenerator::do_CompareAndSwap(Intrinsic* x, ValueType* type) { assert(x->number_of_arguments() == 4, "wrong type"); LIRItem obj (x->argument_at(0), this); // object @@ -1116,10 +1087,10 @@ void LIRGenerator::do_NewMultiArray(NewMultiArray* x) { if (!x->klass()->is_loaded() || PatchALot) { patching_info = state_for(x, x->state_before()); - // cannot re-use same xhandlers for multiple CodeEmitInfos, so - // clone all handlers. This is handled transparently in other - // places by the CodeEmitInfo cloning logic but is handled - // specially here because a stub isn't being used. + // Cannot re-use same xhandlers for multiple CodeEmitInfos, so + // clone all handlers (NOTE: Usually this is handled transparently + // by the CodeEmitInfo cloning logic in CodeStub constructors but + // is done explicitly here because a stub isn't being used). x->set_exception_handlers(new XHandlers(x->exception_handlers())); } CodeEmitInfo* info = state_for(x, x->state()); diff --git a/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp b/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp index b9a5c22934f..022af0452d3 100644 --- a/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp +++ b/hotspot/src/cpu/x86/vm/cppInterpreter_x86.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -481,7 +481,8 @@ void CppInterpreterGenerator::generate_compute_interpreter_state(const Register __ xorptr(rdx, rdx); __ movptr(STATE(_oop_temp), rdx); // state->_oop_temp = NULL (only really needed for native) __ movptr(STATE(_mdx), rdx); // state->_mdx = NULL - __ movptr(rdx, Address(rbx, methodOopDesc::constants_offset())); + __ movptr(rdx, Address(rbx, methodOopDesc::const_offset())); + __ movptr(rdx, Address(rdx, constMethodOopDesc::constants_offset())); __ movptr(rdx, Address(rdx, constantPoolOopDesc::cache_offset_in_bytes())); __ movptr(STATE(_constants), rdx); // state->_constants = constants() @@ -516,7 +517,8 @@ void CppInterpreterGenerator::generate_compute_interpreter_state(const Register __ testl(rax, JVM_ACC_STATIC); __ movptr(rax, Address(locals, 0)); // get receiver (assume this is frequent case) __ jcc(Assembler::zero, done); - __ movptr(rax, Address(rbx, methodOopDesc::constants_offset())); + __ movptr(rax, Address(rbx, methodOopDesc::const_offset())); + __ movptr(rax, Address(rax, constMethodOopDesc::constants_offset())); __ movptr(rax, Address(rax, constantPoolOopDesc::pool_holder_offset_in_bytes())); __ movptr(rax, Address(rax, mirror_offset)); __ bind(done); @@ -769,7 +771,8 @@ void InterpreterGenerator::lock_method(void) { __ testl(rax, JVM_ACC_STATIC); __ movptr(rax, Address(rdi, 0)); // get receiver (assume this is frequent case) __ jcc(Assembler::zero, done); - __ movptr(rax, Address(rbx, methodOopDesc::constants_offset())); + __ movptr(rax, Address(rbx, methodOopDesc::const_offset())); + __ movptr(rax, Address(rax, constMethodOopDesc::constants_offset())); __ movptr(rax, Address(rax, constantPoolOopDesc::pool_holder_offset_in_bytes())); __ movptr(rax, Address(rax, mirror_offset)); __ bind(done); @@ -821,9 +824,9 @@ address InterpreterGenerator::generate_accessor_entry(void) { __ testptr(rax, rax); __ jcc(Assembler::zero, slow_path); - __ movptr(rdi, Address(rbx, methodOopDesc::constants_offset())); // read first instruction word and extract bytecode @ 1 and index @ 2 __ movptr(rdx, Address(rbx, methodOopDesc::const_offset())); + __ movptr(rdi, Address(rdx, constMethodOopDesc::constants_offset())); __ movl(rdx, Address(rdx, constMethodOopDesc::codes_offset())); // Shift codes right to get the index on the right. // The bytecode fetched looks like <0xb4><0x2a> @@ -1185,7 +1188,8 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) { __ testl(t, JVM_ACC_STATIC); __ jcc(Assembler::zero, L); // get mirror - __ movptr(t, Address(method, methodOopDesc:: constants_offset())); + __ movptr(t, Address(method, methodOopDesc:: const_offset())); + __ movptr(t, Address(t, constMethodOopDesc::constants_offset())); __ movptr(t, Address(t, constantPoolOopDesc::pool_holder_offset_in_bytes())); __ movptr(t, Address(t, mirror_offset)); // copy mirror into activation object diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp index 97f1da41f33..458325765c9 100644 --- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp +++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -77,7 +77,8 @@ class InterpreterMacroAssembler: public MacroAssembler { // Helpers for runtime call arguments/results void get_method(Register reg) { movptr(reg, Address(rbp, frame::interpreter_frame_method_offset * wordSize)); } - void get_constant_pool(Register reg) { get_method(reg); movptr(reg, Address(reg, methodOopDesc::constants_offset())); } + void get_const(Register reg) { get_method(reg); movptr(reg, Address(reg, methodOopDesc::const_offset())); } + void get_constant_pool(Register reg) { get_const(reg); movptr(reg, Address(reg, constMethodOopDesc::constants_offset())); } void get_constant_pool_cache(Register reg) { get_constant_pool(reg); movptr(reg, Address(reg, constantPoolOopDesc::cache_offset_in_bytes())); } void get_cpool_and_tags(Register cpool, Register tags) { get_constant_pool(cpool); movptr(tags, Address(cpool, constantPoolOopDesc::tags_offset_in_bytes())); } diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp index cb17e01fa4d..8486c348ba6 100644 --- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp +++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -84,9 +84,14 @@ class InterpreterMacroAssembler: public MacroAssembler { movptr(reg, Address(rbp, frame::interpreter_frame_method_offset * wordSize)); } - void get_constant_pool(Register reg) { + void get_const(Register reg) { get_method(reg); - movptr(reg, Address(reg, methodOopDesc::constants_offset())); + movptr(reg, Address(reg, methodOopDesc::const_offset())); + } + + void get_constant_pool(Register reg) { + get_const(reg); + movptr(reg, Address(reg, constMethodOopDesc::constants_offset())); } void get_constant_pool_cache(Register reg) { diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp index fda7980d821..da0f66160e1 100644 --- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp +++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -566,7 +566,8 @@ void InterpreterGenerator::lock_method(void) { __ testl(rax, JVM_ACC_STATIC); __ movptr(rax, Address(rdi, Interpreter::local_offset_in_bytes(0))); // get receiver (assume this is frequent case) __ jcc(Assembler::zero, done); - __ movptr(rax, Address(rbx, methodOopDesc::constants_offset())); + __ movptr(rax, Address(rbx, methodOopDesc::const_offset())); + __ movptr(rax, Address(rax, constMethodOopDesc::constants_offset())); __ movptr(rax, Address(rax, constantPoolOopDesc::pool_holder_offset_in_bytes())); __ movptr(rax, Address(rax, mirror_offset)); __ bind(done); @@ -606,7 +607,8 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) { __ push(0); } - __ movptr(rdx, Address(rbx, methodOopDesc::constants_offset())); + __ movptr(rdx, Address(rbx, methodOopDesc::const_offset())); + __ movptr(rdx, Address(rdx, constMethodOopDesc::constants_offset())); __ movptr(rdx, Address(rdx, constantPoolOopDesc::cache_offset_in_bytes())); __ push(rdx); // set constant pool cache __ push(rdi); // set locals pointer @@ -661,9 +663,9 @@ address InterpreterGenerator::generate_accessor_entry(void) { __ testptr(rax, rax); __ jcc(Assembler::zero, slow_path); - __ movptr(rdi, Address(rbx, methodOopDesc::constants_offset())); // read first instruction word and extract bytecode @ 1 and index @ 2 __ movptr(rdx, Address(rbx, methodOopDesc::const_offset())); + __ movptr(rdi, Address(rdx, constMethodOopDesc::constants_offset())); __ movl(rdx, Address(rdx, constMethodOopDesc::codes_offset())); // Shift codes right to get the index on the right. // The bytecode fetched looks like <0xb4><0x2a> @@ -1026,7 +1028,8 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) { __ testl(t, JVM_ACC_STATIC); __ jcc(Assembler::zero, L); // get mirror - __ movptr(t, Address(method, methodOopDesc:: constants_offset())); + __ movptr(t, Address(method, methodOopDesc:: const_offset())); + __ movptr(t, Address(t, constMethodOopDesc::constants_offset())); __ movptr(t, Address(t, constantPoolOopDesc::pool_holder_offset_in_bytes())); __ movptr(t, Address(t, mirror_offset)); // copy mirror into activation frame diff --git a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp index 2e78cd5aa10..bb57b742eb3 100644 --- a/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp +++ b/hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -522,7 +522,8 @@ void InterpreterGenerator::lock_method(void) { // get receiver (assume this is frequent case) __ movptr(rax, Address(r14, Interpreter::local_offset_in_bytes(0))); __ jcc(Assembler::zero, done); - __ movptr(rax, Address(rbx, methodOopDesc::constants_offset())); + __ movptr(rax, Address(rbx, methodOopDesc::const_offset())); + __ movptr(rax, Address(rax, constMethodOopDesc::constants_offset())); __ movptr(rax, Address(rax, constantPoolOopDesc::pool_holder_offset_in_bytes())); __ movptr(rax, Address(rax, mirror_offset)); @@ -579,7 +580,8 @@ void TemplateInterpreterGenerator::generate_fixed_frame(bool native_call) { __ push(0); } - __ movptr(rdx, Address(rbx, methodOopDesc::constants_offset())); + __ movptr(rdx, Address(rbx, methodOopDesc::const_offset())); + __ movptr(rdx, Address(rdx, constMethodOopDesc::constants_offset())); __ movptr(rdx, Address(rdx, constantPoolOopDesc::cache_offset_in_bytes())); __ push(rdx); // set constant pool cache __ push(r14); // set locals pointer @@ -629,9 +631,9 @@ address InterpreterGenerator::generate_accessor_entry(void) { __ testptr(rax, rax); __ jcc(Assembler::zero, slow_path); - __ movptr(rdi, Address(rbx, methodOopDesc::constants_offset())); // read first instruction word and extract bytecode @ 1 and index @ 2 __ movptr(rdx, Address(rbx, methodOopDesc::const_offset())); + __ movptr(rdi, Address(rdx, constMethodOopDesc::constants_offset())); __ movl(rdx, Address(rdx, constMethodOopDesc::codes_offset())); // Shift codes right to get the index on the right. // The bytecode fetched looks like <0xb4><0x2a> @@ -1020,7 +1022,8 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) { __ testl(t, JVM_ACC_STATIC); __ jcc(Assembler::zero, L); // get mirror - __ movptr(t, Address(method, methodOopDesc::constants_offset())); + __ movptr(t, Address(method, methodOopDesc::const_offset())); + __ movptr(t, Address(t, constMethodOopDesc::constants_offset())); __ movptr(t, Address(t, constantPoolOopDesc::pool_holder_offset_in_bytes())); __ movptr(t, Address(t, mirror_offset)); // copy mirror into activation frame diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad index cd4adccd352..300903954d2 100644 --- a/hotspot/src/cpu/x86/vm/x86_32.ad +++ b/hotspot/src/cpu/x86/vm/x86_32.ad @@ -5555,8 +5555,9 @@ instruct bytes_reverse_long(eRegL dst) %{ ins_pipe( ialu_reg_reg); %} -instruct bytes_reverse_unsigned_short(eRegI dst) %{ +instruct bytes_reverse_unsigned_short(eRegI dst, eFlagsReg cr) %{ match(Set dst (ReverseBytesUS dst)); + effect(KILL cr); format %{ "BSWAP $dst\n\t" "SHR $dst,16\n\t" %} @@ -5567,8 +5568,9 @@ instruct bytes_reverse_unsigned_short(eRegI dst) %{ ins_pipe( ialu_reg ); %} -instruct bytes_reverse_short(eRegI dst) %{ +instruct bytes_reverse_short(eRegI dst, eFlagsReg cr) %{ match(Set dst (ReverseBytesS dst)); + effect(KILL cr); format %{ "BSWAP $dst\n\t" "SAR $dst,16\n\t" %} @@ -5729,9 +5731,10 @@ instruct countTrailingZerosL(eRegI dst, eRegL src, eFlagsReg cr) %{ //---------- Population Count Instructions ------------------------------------- -instruct popCountI(eRegI dst, eRegI src) %{ +instruct popCountI(eRegI dst, eRegI src, eFlagsReg cr) %{ predicate(UsePopCountInstruction); match(Set dst (PopCountI src)); + effect(KILL cr); format %{ "POPCNT $dst, $src" %} ins_encode %{ @@ -5740,9 +5743,10 @@ instruct popCountI(eRegI dst, eRegI src) %{ ins_pipe(ialu_reg); %} -instruct popCountI_mem(eRegI dst, memory mem) %{ +instruct popCountI_mem(eRegI dst, memory mem, eFlagsReg cr) %{ predicate(UsePopCountInstruction); match(Set dst (PopCountI (LoadI mem))); + effect(KILL cr); format %{ "POPCNT $dst, $mem" %} ins_encode %{ @@ -7796,50 +7800,6 @@ instruct loadPLocked(eRegP dst, memory mem) %{ ins_pipe( ialu_reg_mem ); %} -// LoadLong-locked - same as a volatile long load when used with compare-swap -instruct loadLLocked(stackSlotL dst, memory mem) %{ - predicate(UseSSE<=1); - match(Set dst (LoadLLocked mem)); - - ins_cost(200); - format %{ "FILD $mem\t# Atomic volatile long load\n\t" - "FISTp $dst" %} - ins_encode(enc_loadL_volatile(mem,dst)); - ins_pipe( fpu_reg_mem ); -%} - -instruct loadLX_Locked(stackSlotL dst, memory mem, regD tmp) %{ - predicate(UseSSE>=2); - match(Set dst (LoadLLocked mem)); - effect(TEMP tmp); - ins_cost(180); - format %{ "MOVSD $tmp,$mem\t# Atomic volatile long load\n\t" - "MOVSD $dst,$tmp" %} - ins_encode %{ - __ movdbl($tmp$$XMMRegister, $mem$$Address); - __ movdbl(Address(rsp, $dst$$disp), $tmp$$XMMRegister); - %} - ins_pipe( pipe_slow ); -%} - -instruct loadLX_reg_Locked(eRegL dst, memory mem, regD tmp) %{ - predicate(UseSSE>=2); - match(Set dst (LoadLLocked mem)); - effect(TEMP tmp); - ins_cost(160); - format %{ "MOVSD $tmp,$mem\t# Atomic volatile long load\n\t" - "MOVD $dst.lo,$tmp\n\t" - "PSRLQ $tmp,32\n\t" - "MOVD $dst.hi,$tmp" %} - ins_encode %{ - __ movdbl($tmp$$XMMRegister, $mem$$Address); - __ movdl($dst$$Register, $tmp$$XMMRegister); - __ psrlq($tmp$$XMMRegister, 32); - __ movdl(HIGH_FROM_LOW($dst$$Register), $tmp$$XMMRegister); - %} - ins_pipe( pipe_slow ); -%} - // Conditional-store of the updated heap-top. // Used during allocation of the shared heap. // Sets flags (EQ) on success. Implemented with a CMPXCHG on Intel. diff --git a/hotspot/src/cpu/x86/vm/x86_64.ad b/hotspot/src/cpu/x86/vm/x86_64.ad index 80928c3fa2d..1a5e1c86c6c 100644 --- a/hotspot/src/cpu/x86/vm/x86_64.ad +++ b/hotspot/src/cpu/x86/vm/x86_64.ad @@ -6417,14 +6417,14 @@ instruct bytes_reverse_long(rRegL dst) %{ match(Set dst (ReverseBytesL dst)); format %{ "bswapq $dst" %} - opcode(0x0F, 0xC8); /* Opcode 0F /C8 */ ins_encode( REX_reg_wide(dst), OpcP, opc2_reg(dst) ); ins_pipe( ialu_reg); %} -instruct bytes_reverse_unsigned_short(rRegI dst) %{ +instruct bytes_reverse_unsigned_short(rRegI dst, rFlagsReg cr) %{ match(Set dst (ReverseBytesUS dst)); + effect(KILL cr); format %{ "bswapl $dst\n\t" "shrl $dst,16\n\t" %} @@ -6435,8 +6435,9 @@ instruct bytes_reverse_unsigned_short(rRegI dst) %{ ins_pipe( ialu_reg ); %} -instruct bytes_reverse_short(rRegI dst) %{ +instruct bytes_reverse_short(rRegI dst, rFlagsReg cr) %{ match(Set dst (ReverseBytesS dst)); + effect(KILL cr); format %{ "bswapl $dst\n\t" "sar $dst,16\n\t" %} @@ -6564,9 +6565,10 @@ instruct countTrailingZerosL(rRegI dst, rRegL src, rFlagsReg cr) %{ //---------- Population Count Instructions ------------------------------------- -instruct popCountI(rRegI dst, rRegI src) %{ +instruct popCountI(rRegI dst, rRegI src, rFlagsReg cr) %{ predicate(UsePopCountInstruction); match(Set dst (PopCountI src)); + effect(KILL cr); format %{ "popcnt $dst, $src" %} ins_encode %{ @@ -6575,9 +6577,10 @@ instruct popCountI(rRegI dst, rRegI src) %{ ins_pipe(ialu_reg); %} -instruct popCountI_mem(rRegI dst, memory mem) %{ +instruct popCountI_mem(rRegI dst, memory mem, rFlagsReg cr) %{ predicate(UsePopCountInstruction); match(Set dst (PopCountI (LoadI mem))); + effect(KILL cr); format %{ "popcnt $dst, $mem" %} ins_encode %{ @@ -6587,9 +6590,10 @@ instruct popCountI_mem(rRegI dst, memory mem) %{ %} // Note: Long.bitCount(long) returns an int. -instruct popCountL(rRegI dst, rRegL src) %{ +instruct popCountL(rRegI dst, rRegL src, rFlagsReg cr) %{ predicate(UsePopCountInstruction); match(Set dst (PopCountL src)); + effect(KILL cr); format %{ "popcnt $dst, $src" %} ins_encode %{ @@ -6599,9 +6603,10 @@ instruct popCountL(rRegI dst, rRegL src) %{ %} // Note: Long.bitCount(long) returns an int. -instruct popCountL_mem(rRegI dst, memory mem) %{ +instruct popCountL_mem(rRegI dst, memory mem, rFlagsReg cr) %{ predicate(UsePopCountInstruction); match(Set dst (PopCountL (LoadL mem))); + effect(KILL cr); format %{ "popcnt $dst, $mem" %} ins_encode %{ @@ -7492,18 +7497,6 @@ instruct loadPLocked(rRegP dst, memory mem) ins_pipe(ialu_reg_mem); // XXX %} -// LoadL-locked - same as a regular LoadL when used with compare-swap -instruct loadLLocked(rRegL dst, memory mem) -%{ - match(Set dst (LoadLLocked mem)); - - ins_cost(125); // XXX - format %{ "movq $dst, $mem\t# long locked" %} - opcode(0x8B); - ins_encode(REX_reg_mem_wide(dst, mem), OpcP, reg_mem(dst, mem)); - ins_pipe(ialu_reg_mem); // XXX -%} - // Conditional-store of the updated heap-top. // Used during allocation of the shared heap. // Sets flags (EQ) on success. Implemented with a CMPXCHG on Intel. diff --git a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp b/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp index 022643161a1..9457ab48270 100644 --- a/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp +++ b/hotspot/src/os/solaris/dtrace/generateJvmOffsets.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -220,10 +220,10 @@ int generateJvmOffsets(GEN_variant gen_variant) { printf("\n"); GEN_OFFS(methodOopDesc, _constMethod); - GEN_OFFS(methodOopDesc, _constants); GEN_OFFS(methodOopDesc, _access_flags); printf("\n"); + GEN_OFFS(constMethodOopDesc, _constants); GEN_OFFS(constMethodOopDesc, _flags); GEN_OFFS(constMethodOopDesc, _code_size); GEN_OFFS(constMethodOopDesc, _name_index); diff --git a/hotspot/src/os/solaris/dtrace/jhelper.d b/hotspot/src/os/solaris/dtrace/jhelper.d index 75e74269576..ad68ac1f8b1 100644 --- a/hotspot/src/os/solaris/dtrace/jhelper.d +++ b/hotspot/src/os/solaris/dtrace/jhelper.d @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -118,7 +118,7 @@ dtrace:helper:ustack: copyin_offset(OFFSET_Symbol_body); copyin_offset(OFFSET_methodOopDesc_constMethod); - copyin_offset(OFFSET_methodOopDesc_constants); + copyin_offset(OFFSET_constMethodOopDesc_constants); copyin_offset(OFFSET_constMethodOopDesc_name_index); copyin_offset(OFFSET_constMethodOopDesc_signature_index); @@ -359,8 +359,8 @@ dtrace:helper:ustack: this->signatureIndex = copyin_uint16(this->constMethod + OFFSET_constMethodOopDesc_signature_index); - this->constantPool = copyin_ptr(this->methodOopPtr + - OFFSET_methodOopDesc_constants); + this->constantPool = copyin_ptr(this->constMethod + + OFFSET_constMethodOopDesc_constants); this->nameSymbol = copyin_ptr(this->constantPool + this->nameIndex * sizeof (pointer) + SIZE_constantPoolOopDesc); diff --git a/hotspot/src/os/solaris/dtrace/libjvm_db.c b/hotspot/src/os/solaris/dtrace/libjvm_db.c index 8caac23e9e2..2f9a56e919f 100644 --- a/hotspot/src/os/solaris/dtrace/libjvm_db.c +++ b/hotspot/src/os/solaris/dtrace/libjvm_db.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -514,10 +514,10 @@ name_for_methodOop(jvm_agent_t* J, uint64_t methodOopPtr, char * result, size_t char * signatureString = NULL; int err; - err = read_pointer(J, methodOopPtr + OFFSET_methodOopDesc_constants, &constantPool); - CHECK_FAIL(err); err = read_pointer(J, methodOopPtr + OFFSET_methodOopDesc_constMethod, &constMethod); CHECK_FAIL(err); + err = read_pointer(J->P, constMethod + OFFSET_constMethodOopDesc_constants, &constantPool); + CHECK_FAIL(err); /* To get name string */ err = ps_pread(J->P, constMethod + OFFSET_constMethodOopDesc_name_index, &nameIndex, 2); diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp index 0a8ff680806..440b8026233 100644 --- a/hotspot/src/os/windows/vm/os_windows.cpp +++ b/hotspot/src/os/windows/vm/os_windows.cpp @@ -1591,7 +1591,8 @@ void os::win32::print_windows_version(outputStream* st) { case 5001: st->print(" Windows XP"); break; case 5002: case 6000: - case 6001: { + case 6001: + case 6002: { // Retrieve SYSTEM_INFO from GetNativeSystemInfo call so that we could // find out whether we are running on 64 bit processor or not. SYSTEM_INFO si; @@ -1623,6 +1624,14 @@ void os::win32::print_windows_version(outputStream* st) { } if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) st->print(" , 64 bit"); + } else if (os_vers == 6002) { + if (osvi.wProductType == VER_NT_WORKSTATION) { + st->print(" Windows 8"); + } else { + st->print(" Windows Server 2012"); + } + if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) + st->print(" , 64 bit"); } else { // future os // Unrecognized windows, print out its major and minor versions st->print(" Windows NT %d.%d", osvi.dwMajorVersion, osvi.dwMinorVersion); diff --git a/hotspot/src/share/vm/adlc/forms.cpp b/hotspot/src/share/vm/adlc/forms.cpp index 5e05a841ed9..372ef5dd508 100644 --- a/hotspot/src/share/vm/adlc/forms.cpp +++ b/hotspot/src/share/vm/adlc/forms.cpp @@ -261,7 +261,6 @@ Form::DataType Form::is_load_from_memory(const char *opType) const { if( strcmp(opType,"LoadL")==0 ) return Form::idealL; if( strcmp(opType,"LoadL_unaligned")==0 ) return Form::idealL; if( strcmp(opType,"LoadPLocked")==0 ) return Form::idealP; - if( strcmp(opType,"LoadLLocked")==0 ) return Form::idealL; if( strcmp(opType,"LoadP")==0 ) return Form::idealP; if( strcmp(opType,"LoadN")==0 ) return Form::idealN; if( strcmp(opType,"LoadRange")==0 ) return Form::idealI; diff --git a/hotspot/src/share/vm/adlc/formssel.cpp b/hotspot/src/share/vm/adlc/formssel.cpp index 3c69d6a0da8..e92b8f89ec9 100644 --- a/hotspot/src/share/vm/adlc/formssel.cpp +++ b/hotspot/src/share/vm/adlc/formssel.cpp @@ -3387,7 +3387,7 @@ int MatchNode::needs_ideal_memory_edge(FormDict &globals) const { "Load4I" ,"Load2I" ,"Load2L" ,"Load2D" ,"Load4F" ,"Load2F" ,"Load16B" , "Load8B" ,"Load4B" ,"Load8C" ,"Load4C" ,"Load2C" ,"Load8S", "Load4S","Load2S", "LoadRange", "LoadKlass", "LoadNKlass", "LoadL_unaligned", "LoadD_unaligned", - "LoadPLocked", "LoadLLocked", + "LoadPLocked", "StorePConditional", "StoreIConditional", "StoreLConditional", "CompareAndSwapI", "CompareAndSwapL", "CompareAndSwapP", "CompareAndSwapN", "StoreCM", diff --git a/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp b/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp index c7a5198da33..4158ce5cb3b 100644 --- a/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp +++ b/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp @@ -42,6 +42,11 @@ void Canonicalizer::set_canonical(Value x) { // the instruction stream (because the instruction list is embedded // in the instructions). if (canonical() != x) { +#ifndef PRODUCT + if (!x->has_printable_bci()) { + x->set_printable_bci(bci()); + } +#endif if (PrintCanonicalization) { PrintValueVisitor do_print_value; canonical()->input_values_do(&do_print_value); @@ -451,6 +456,28 @@ void Canonicalizer::do_Intrinsic (Intrinsic* x) { } break; } + case vmIntrinsics::_isInstance : { + assert(x->number_of_arguments() == 2, "wrong type"); + + InstanceConstant* c = x->argument_at(0)->type()->as_InstanceConstant(); + if (c != NULL && !c->value()->is_null_object()) { + // ciInstance::java_mirror_type() returns non-NULL only for Java mirrors + ciType* t = c->value()->as_instance()->java_mirror_type(); + if (t->is_klass()) { + // substitute cls.isInstance(obj) of a constant Class into + // an InstantOf instruction + InstanceOf* i = new InstanceOf(t->as_klass(), x->argument_at(1), x->state_before()); + set_canonical(i); + // and try to canonicalize even further + do_InstanceOf(i); + } else { + assert(t->is_primitive_type(), "should be a primitive type"); + // cls.isInstance(obj) always returns false for primitive classes + set_constant(0); + } + } + break; + } } } @@ -677,8 +704,8 @@ void Canonicalizer::do_If(If* x) { return; } } - set_canonical(canon); set_bci(cmp->state_before()->bci()); + set_canonical(canon); } } } else if (l->as_InstanceOf() != NULL) { diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp index 2a2b8ae9d9d..d59f87c7e9e 100644 --- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp +++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp @@ -3170,6 +3170,7 @@ bool GraphBuilder::try_inline_intrinsics(ciMethod* callee) { break; case vmIntrinsics::_getClass : + case vmIntrinsics::_isInstance : if (!InlineClassNatives) return false; preserves_state = true; break; @@ -3194,13 +3195,6 @@ bool GraphBuilder::try_inline_intrinsics(ciMethod* callee) { preserves_state = true; break; - // sun/misc/AtomicLong.attemptUpdate - case vmIntrinsics::_attemptUpdate : - if (!VM_Version::supports_cx8()) return false; - if (!InlineAtomicLong) return false; - preserves_state = true; - break; - // Use special nodes for Unsafe instructions so we can more easily // perform an address-mode optimization on the raw variants case vmIntrinsics::_getObject : return append_unsafe_get_obj(callee, T_OBJECT, false); diff --git a/hotspot/src/share/vm/c1/c1_Instruction.hpp b/hotspot/src/share/vm/c1/c1_Instruction.hpp index 9cdef87b9f3..98f9884f68b 100644 --- a/hotspot/src/share/vm/c1/c1_Instruction.hpp +++ b/hotspot/src/share/vm/c1/c1_Instruction.hpp @@ -302,8 +302,6 @@ class Instruction: public CompilationResourceObj { void update_exception_state(ValueStack* state); - bool has_printable_bci() const { return NOT_PRODUCT(_printable_bci != -99) PRODUCT_ONLY(false); } - protected: void set_type(ValueType* type) { assert(type != NULL, "type must exist"); @@ -392,8 +390,9 @@ class Instruction: public CompilationResourceObj { // accessors int id() const { return _id; } #ifndef PRODUCT + bool has_printable_bci() const { return _printable_bci != -99; } int printable_bci() const { assert(has_printable_bci(), "_printable_bci should have been set"); return _printable_bci; } - void set_printable_bci(int bci) { NOT_PRODUCT(_printable_bci = bci;) } + void set_printable_bci(int bci) { _printable_bci = bci; } #endif int use_count() const { return _use_count; } int pin_state() const { return _pin_state; } @@ -576,6 +575,7 @@ LEAF(Phi, Instruction) , _block(b) , _index(index) { + NOT_PRODUCT(set_printable_bci(Value(b)->printable_bci())); if (type->is_illegal()) { make_illegal(); } @@ -631,7 +631,9 @@ LEAF(Local, Instruction) : Instruction(type) , _java_index(index) , _declared_type(declared) - {} + { + NOT_PRODUCT(set_printable_bci(-1)); + } // accessors int java_index() const { return _java_index; } diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp index 3e61b92c514..db61d7a42e6 100644 --- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp +++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp @@ -1242,6 +1242,36 @@ void LIRGenerator::do_Reference_get(Intrinsic* x) { NULL /* info */); } +// Example: clazz.isInstance(object) +void LIRGenerator::do_isInstance(Intrinsic* x) { + assert(x->number_of_arguments() == 2, "wrong type"); + + // TODO could try to substitute this node with an equivalent InstanceOf + // if clazz is known to be a constant Class. This will pick up newly found + // constants after HIR construction. I'll leave this to a future change. + + // as a first cut, make a simple leaf call to runtime to stay platform independent. + // could follow the aastore example in a future change. + + LIRItem clazz(x->argument_at(0), this); + LIRItem object(x->argument_at(1), this); + clazz.load_item(); + object.load_item(); + LIR_Opr result = rlock_result(x); + + // need to perform null check on clazz + if (x->needs_null_check()) { + CodeEmitInfo* info = state_for(x); + __ null_check(clazz.result(), info); + } + + LIR_Opr call_result = call_runtime(clazz.value(), object.value(), + CAST_FROM_FN_PTR(address, Runtime1::is_instance_of), + x->type(), + NULL); // NULL CodeEmitInfo results in a leaf call + __ move(call_result, result); +} + // Example: object.getClass () void LIRGenerator::do_getClass(Intrinsic* x) { assert(x->number_of_arguments() == 1, "wrong type"); @@ -2777,31 +2807,29 @@ void LIRGenerator::do_Invoke(Invoke* x) { int index = bcs.get_method_index(); size_t call_site_offset = cpcache->get_f1_offset(index); + // Load CallSite object from constant pool cache. + LIR_Opr call_site = new_register(objectType); + __ oop2reg(cpcache->constant_encoding(), call_site); + __ move_wide(new LIR_Address(call_site, call_site_offset, T_OBJECT), call_site); + // If this invokedynamic call site hasn't been executed yet in // the interpreter, the CallSite object in the constant pool // cache is still null and we need to deoptimize. if (cpcache->is_f1_null_at(index)) { - // Cannot re-use same xhandlers for multiple CodeEmitInfos, so - // clone all handlers. This is handled transparently in other - // places by the CodeEmitInfo cloning logic but is handled - // specially here because a stub isn't being used. - x->set_exception_handlers(new XHandlers(x->exception_handlers())); - + // Only deoptimize if the CallSite object is still null; we don't + // recompile methods in C1 after deoptimization so this call site + // might be resolved the next time we execute it after OSR. DeoptimizeStub* deopt_stub = new DeoptimizeStub(deopt_info); - __ jump(deopt_stub); + __ cmp(lir_cond_equal, call_site, LIR_OprFact::oopConst(NULL)); + __ branch(lir_cond_equal, T_OBJECT, deopt_stub); } // Use the receiver register for the synthetic MethodHandle // argument. receiver = LIR_Assembler::receiverOpr(); - LIR_Opr tmp = new_register(objectType); - - // Load CallSite object from constant pool cache. - __ oop2reg(cpcache->constant_encoding(), tmp); - __ move_wide(new LIR_Address(tmp, call_site_offset, T_OBJECT), tmp); // Load target MethodHandle from CallSite object. - __ load(new LIR_Address(tmp, java_lang_invoke_CallSite::target_offset_in_bytes(), T_OBJECT), receiver); + __ load(new LIR_Address(call_site, java_lang_invoke_CallSite::target_offset_in_bytes(), T_OBJECT), receiver); __ call_dynamic(target, receiver, result_register, SharedRuntime::get_resolve_opt_virtual_call_stub(), @@ -2809,7 +2837,7 @@ void LIRGenerator::do_Invoke(Invoke* x) { break; } default: - ShouldNotReachHere(); + fatal(err_msg("unexpected bytecode: %s", Bytecodes::name(x->code()))); break; } @@ -2951,6 +2979,7 @@ void LIRGenerator::do_Intrinsic(Intrinsic* x) { break; case vmIntrinsics::_Object_init: do_RegisterFinalizer(x); break; + case vmIntrinsics::_isInstance: do_isInstance(x); break; case vmIntrinsics::_getClass: do_getClass(x); break; case vmIntrinsics::_currentThread: do_currentThread(x); break; @@ -2978,11 +3007,6 @@ void LIRGenerator::do_Intrinsic(Intrinsic* x) { do_CompareAndSwap(x, longType); break; - // sun.misc.AtomicLongCSImpl.attemptUpdate - case vmIntrinsics::_attemptUpdate: - do_AttemptUpdate(x); - break; - case vmIntrinsics::_Reference_get: do_Reference_get(x); break; @@ -3223,4 +3247,3 @@ void LIRGenerator::do_MemBar(MemBar* x) { } } } - diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp index 67127df04d8..bc6b2510e70 100644 --- a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp +++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp @@ -238,12 +238,12 @@ class LIRGenerator: public InstructionVisitor, public BlockClosure { LIR_Opr getThreadPointer(); void do_RegisterFinalizer(Intrinsic* x); + void do_isInstance(Intrinsic* x); void do_getClass(Intrinsic* x); void do_currentThread(Intrinsic* x); void do_MathIntrinsic(Intrinsic* x); void do_ArrayCopy(Intrinsic* x); void do_CompareAndSwap(Intrinsic* x, ValueType* type); - void do_AttemptUpdate(Intrinsic* x); void do_NIOCheckIndex(Intrinsic* x); void do_FPIntrinsics(Intrinsic* x); void do_Reference_get(Intrinsic* x); diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/hotspot/src/share/vm/c1/c1_Runtime1.cpp index 47703492d1e..d0b6abecb9d 100644 --- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp +++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp @@ -294,6 +294,7 @@ const char* Runtime1::name_for_address(address entry) { FUNCTION_CASE(entry, SharedRuntime::lrem); FUNCTION_CASE(entry, SharedRuntime::dtrace_method_entry); FUNCTION_CASE(entry, SharedRuntime::dtrace_method_exit); + FUNCTION_CASE(entry, is_instance_of); FUNCTION_CASE(entry, trace_block_entry); #ifdef TRACE_HAVE_INTRINSICS FUNCTION_CASE(entry, TRACE_TIME_METHOD); @@ -1270,6 +1271,19 @@ JRT_LEAF(void, Runtime1::oop_arraycopy(HeapWord* src, HeapWord* dst, int num)) JRT_END +JRT_LEAF(int, Runtime1::is_instance_of(oopDesc* mirror, oopDesc* obj)) + // had to return int instead of bool, otherwise there may be a mismatch + // between the C calling convention and the Java one. + // e.g., on x86, GCC may clear only %al when returning a bool false, but + // JVM takes the whole %eax as the return value, which may misinterpret + // the return value as a boolean true. + + assert(mirror != NULL, "should null-check on mirror before calling"); + klassOop k = java_lang_Class::as_klassOop(mirror); + return (k != NULL && obj != NULL && obj->is_a(k)) ? 1 : 0; +JRT_END + + #ifndef PRODUCT void Runtime1::print_statistics() { tty->print_cr("C1 Runtime statistics:"); diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.hpp b/hotspot/src/share/vm/c1/c1_Runtime1.hpp index 20325640bf1..fce5b2c5272 100644 --- a/hotspot/src/share/vm/c1/c1_Runtime1.hpp +++ b/hotspot/src/share/vm/c1/c1_Runtime1.hpp @@ -186,6 +186,7 @@ class Runtime1: public AllStatic { static int arraycopy(oopDesc* src, int src_pos, oopDesc* dst, int dst_pos, int length); static void primitive_arraycopy(HeapWord* src, HeapWord* dst, int length); static void oop_arraycopy(HeapWord* src, HeapWord* dst, int length); + static int is_instance_of(oopDesc* mirror, oopDesc* obj); static void print_statistics() PRODUCT_RETURN; }; diff --git a/hotspot/src/share/vm/c1/c1_ValueMap.hpp b/hotspot/src/share/vm/c1/c1_ValueMap.hpp index 4278b11d39a..5b38819da82 100644 --- a/hotspot/src/share/vm/c1/c1_ValueMap.hpp +++ b/hotspot/src/share/vm/c1/c1_ValueMap.hpp @@ -141,8 +141,11 @@ class ValueNumberingVisitor: public InstructionVisitor { // visitor functions void do_StoreField (StoreField* x) { - if (x->is_init_point()) { - // putstatic is an initialization point so treat it as a wide kill + if (x->is_init_point() || // putstatic is an initialization point so treat it as a wide kill + // This is actually too strict and the JMM doesn't require + // this in all cases (e.g. load a; volatile store b; load a) + // but possible future optimizations might require this. + x->field()->is_volatile()) { kill_memory(); } else { kill_field(x->field()); @@ -160,8 +163,8 @@ class ValueNumberingVisitor: public InstructionVisitor { void do_Local (Local* x) { /* nothing to do */ } void do_Constant (Constant* x) { /* nothing to do */ } void do_LoadField (LoadField* x) { - if (x->is_init_point()) { - // getstatic is an initialization point so treat it as a wide kill + if (x->is_init_point() || // getstatic is an initialization point so treat it as a wide kill + x->field()->is_volatile()) { // the JMM requires this kill_memory(); } } diff --git a/hotspot/src/share/vm/classfile/javaClasses.cpp b/hotspot/src/share/vm/classfile/javaClasses.cpp index eab75e181e3..74e6566f785 100644 --- a/hotspot/src/share/vm/classfile/javaClasses.cpp +++ b/hotspot/src/share/vm/classfile/javaClasses.cpp @@ -2919,7 +2919,6 @@ int java_lang_AssertionStatusDirectives::packages_offset; int java_lang_AssertionStatusDirectives::packageEnabled_offset; int java_lang_AssertionStatusDirectives::deflt_offset; int java_nio_Buffer::_limit_offset; -int sun_misc_AtomicLongCSImpl::_value_offset; int java_util_concurrent_locks_AbstractOwnableSynchronizer::_owner_offset = 0; int sun_reflect_ConstantPool::_cp_oop_offset; int sun_reflect_UnsafeStaticFieldAccessorImpl::_base_offset; @@ -2979,21 +2978,6 @@ void java_nio_Buffer::compute_offsets() { compute_offset(_limit_offset, k, vmSymbols::limit_name(), vmSymbols::int_signature()); } -// Support for intrinsification of sun.misc.AtomicLongCSImpl.attemptUpdate -int sun_misc_AtomicLongCSImpl::value_offset() { - assert(SystemDictionary::AtomicLongCSImpl_klass() != NULL, "can't call this"); - return _value_offset; -} - - -void sun_misc_AtomicLongCSImpl::compute_offsets() { - klassOop k = SystemDictionary::AtomicLongCSImpl_klass(); - // If this class is not present, its value field offset won't be referenced. - if (k != NULL) { - compute_offset(_value_offset, k, vmSymbols::value_name(), vmSymbols::long_signature()); - } -} - void java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(TRAPS) { if (_owner_offset != 0) return; @@ -3098,7 +3082,6 @@ void JavaClasses::compute_offsets() { sun_reflect_ConstantPool::compute_offsets(); sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets(); } - sun_misc_AtomicLongCSImpl::compute_offsets(); // generated interpreter code wants to know about the offsets we just computed: AbstractAssembler::update_delayed_values(); diff --git a/hotspot/src/share/vm/classfile/javaClasses.hpp b/hotspot/src/share/vm/classfile/javaClasses.hpp index 708ea4f544a..4924d5829d1 100644 --- a/hotspot/src/share/vm/classfile/javaClasses.hpp +++ b/hotspot/src/share/vm/classfile/javaClasses.hpp @@ -1383,15 +1383,6 @@ class java_nio_Buffer: AllStatic { static void compute_offsets(); }; -class sun_misc_AtomicLongCSImpl: AllStatic { - private: - static int _value_offset; - - public: - static int value_offset(); - static void compute_offsets(); -}; - class java_util_concurrent_locks_AbstractOwnableSynchronizer : AllStatic { private: static int _owner_offset; diff --git a/hotspot/src/share/vm/classfile/systemDictionary.hpp b/hotspot/src/share/vm/classfile/systemDictionary.hpp index 3abc5054d58..72be344383b 100644 --- a/hotspot/src/share/vm/classfile/systemDictionary.hpp +++ b/hotspot/src/share/vm/classfile/systemDictionary.hpp @@ -170,9 +170,6 @@ class SymbolPropertyTable; /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \ template(nio_Buffer_klass, java_nio_Buffer, Opt) \ \ - /* If this class isn't present, it won't be referenced. */ \ - template(AtomicLongCSImpl_klass, sun_misc_AtomicLongCSImpl, Opt) \ - \ template(DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel) \ \ template(PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt) \ diff --git a/hotspot/src/share/vm/classfile/verifier.cpp b/hotspot/src/share/vm/classfile/verifier.cpp index 9ab47f7b664..7b5932a5401 100644 --- a/hotspot/src/share/vm/classfile/verifier.cpp +++ b/hotspot/src/share/vm/classfile/verifier.cpp @@ -1738,10 +1738,14 @@ void ClassVerifier::verify_switch( int target = bci + default_offset; stackmap_table->check_jump_target(current_frame, target, CHECK_VERIFY(this)); for (int i = 0; i < keys; i++) { + // Because check_jump_target() may safepoint, the bytecode could have + // moved, which means 'aligned_bcp' is no good and needs to be recalculated. + aligned_bcp = (address)round_to((intptr_t)(bcs->bcp() + 1), jintSize); target = bci + (jint)Bytes::get_Java_u4(aligned_bcp+(3+i*delta)*jintSize); stackmap_table->check_jump_target( current_frame, target, CHECK_VERIFY(this)); } + NOT_PRODUCT(aligned_bcp = NULL); // no longer valid at this point } bool ClassVerifier::name_in_supers( diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp index b0d014575aa..2814b1d3668 100644 --- a/hotspot/src/share/vm/classfile/vmSymbols.hpp +++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp @@ -722,15 +722,6 @@ /* java/lang/ref/Reference */ \ do_intrinsic(_Reference_get, java_lang_ref_Reference, get_name, void_object_signature, F_R) \ \ - \ - do_class(sun_misc_AtomicLongCSImpl, "sun/misc/AtomicLongCSImpl") \ - do_intrinsic(_get_AtomicLong, sun_misc_AtomicLongCSImpl, get_name, void_long_signature, F_R) \ - /* (symbols get_name and void_long_signature defined above) */ \ - \ - do_intrinsic(_attemptUpdate, sun_misc_AtomicLongCSImpl, attemptUpdate_name, attemptUpdate_signature, F_R) \ - do_name( attemptUpdate_name, "attemptUpdate") \ - do_signature(attemptUpdate_signature, "(JJ)Z") \ - \ /* support for sun.misc.Unsafe */ \ do_class(sun_misc_Unsafe, "sun/misc/Unsafe") \ \ diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp index 9959260d51c..40d2aece12a 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp @@ -293,7 +293,7 @@ void ConcurrentMarkThread::run() { // Java thread is waiting for a full GC to happen (e.g., it // called System.gc() with +ExplicitGCInvokesConcurrent). _sts.join(); - g1h->increment_full_collections_completed(true /* concurrent */); + g1h->increment_old_marking_cycles_completed(true /* concurrent */); _sts.leave(); } assert(_should_terminate, "just checking"); diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp index 27863989e0c..fdd82c5c9c6 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp @@ -1299,6 +1299,7 @@ bool G1CollectedHeap::do_collection(bool explicit_gc, gc_prologue(true); increment_total_collections(true /* full gc */); + increment_old_marking_cycles_started(); size_t g1h_prev_used = used(); assert(used() == recalculate_used(), "Should be equal"); @@ -1492,22 +1493,28 @@ bool G1CollectedHeap::do_collection(bool explicit_gc, JavaThread::dirty_card_queue_set().abandon_logs(); assert(!G1DeferredRSUpdate || (G1DeferredRSUpdate && (dirty_card_queue_set().completed_buffers_num() == 0)), "Should not be any"); + + _young_list->reset_sampled_info(); + // At this point there should be no regions in the + // entire heap tagged as young. + assert( check_young_list_empty(true /* check_heap */), + "young list should be empty at this point"); + + // Update the number of full collections that have been completed. + increment_old_marking_cycles_completed(false /* concurrent */); + + _hrs.verify_optional(); + verify_region_sets_optional(); + + print_heap_after_gc(); + + // We must call G1MonitoringSupport::update_sizes() in the same scoping level + // as an active TraceMemoryManagerStats object (i.e. before the destructor for the + // TraceMemoryManagerStats is called) so that the G1 memory pools are updated + // before any GC notifications are raised. + g1mm()->update_sizes(); } - _young_list->reset_sampled_info(); - // At this point there should be no regions in the - // entire heap tagged as young. - assert( check_young_list_empty(true /* check_heap */), - "young list should be empty at this point"); - - // Update the number of full collections that have been completed. - increment_full_collections_completed(false /* concurrent */); - - _hrs.verify_optional(); - verify_region_sets_optional(); - - print_heap_after_gc(); - g1mm()->update_sizes(); post_full_gc_dump(); return true; @@ -1888,7 +1895,8 @@ G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) : _retained_old_gc_alloc_region(NULL), _expand_heap_after_alloc_failure(true), _surviving_young_words(NULL), - _full_collections_completed(0), + _old_marking_cycles_started(0), + _old_marking_cycles_completed(0), _in_cset_fast_test(NULL), _in_cset_fast_test_base(NULL), _dirty_cards_region_list(NULL), @@ -2360,7 +2368,16 @@ void G1CollectedHeap::allocate_dummy_regions() { } #endif // !PRODUCT -void G1CollectedHeap::increment_full_collections_completed(bool concurrent) { +void G1CollectedHeap::increment_old_marking_cycles_started() { + assert(_old_marking_cycles_started == _old_marking_cycles_completed || + _old_marking_cycles_started == _old_marking_cycles_completed + 1, + err_msg("Wrong marking cycle count (started: %d, completed: %d)", + _old_marking_cycles_started, _old_marking_cycles_completed)); + + _old_marking_cycles_started++; +} + +void G1CollectedHeap::increment_old_marking_cycles_completed(bool concurrent) { MonitorLockerEx x(FullGCCount_lock, Mutex::_no_safepoint_check_flag); // We assume that if concurrent == true, then the caller is a @@ -2368,11 +2385,6 @@ void G1CollectedHeap::increment_full_collections_completed(bool concurrent) { // Set. If there's ever a cheap way to check this, we should add an // assert here. - // We have already incremented _total_full_collections at the start - // of the GC, so total_full_collections() represents how many full - // collections have been started. - unsigned int full_collections_started = total_full_collections(); - // Given that this method is called at the end of a Full GC or of a // concurrent cycle, and those can be nested (i.e., a Full GC can // interrupt a concurrent cycle), the number of full collections @@ -2382,21 +2394,21 @@ void G1CollectedHeap::increment_full_collections_completed(bool concurrent) { // This is the case for the inner caller, i.e. a Full GC. assert(concurrent || - (full_collections_started == _full_collections_completed + 1) || - (full_collections_started == _full_collections_completed + 2), - err_msg("for inner caller (Full GC): full_collections_started = %u " - "is inconsistent with _full_collections_completed = %u", - full_collections_started, _full_collections_completed)); + (_old_marking_cycles_started == _old_marking_cycles_completed + 1) || + (_old_marking_cycles_started == _old_marking_cycles_completed + 2), + err_msg("for inner caller (Full GC): _old_marking_cycles_started = %u " + "is inconsistent with _old_marking_cycles_completed = %u", + _old_marking_cycles_started, _old_marking_cycles_completed)); // This is the case for the outer caller, i.e. the concurrent cycle. assert(!concurrent || - (full_collections_started == _full_collections_completed + 1), + (_old_marking_cycles_started == _old_marking_cycles_completed + 1), err_msg("for outer caller (concurrent cycle): " - "full_collections_started = %u " - "is inconsistent with _full_collections_completed = %u", - full_collections_started, _full_collections_completed)); + "_old_marking_cycles_started = %u " + "is inconsistent with _old_marking_cycles_completed = %u", + _old_marking_cycles_started, _old_marking_cycles_completed)); - _full_collections_completed += 1; + _old_marking_cycles_completed += 1; // We need to clear the "in_progress" flag in the CM thread before // we wake up any waiters (especially when ExplicitInvokesConcurrent @@ -2432,7 +2444,7 @@ void G1CollectedHeap::collect(GCCause::Cause cause) { assert_heap_not_locked(); unsigned int gc_count_before; - unsigned int full_gc_count_before; + unsigned int old_marking_count_before; bool retry_gc; do { @@ -2443,7 +2455,7 @@ void G1CollectedHeap::collect(GCCause::Cause cause) { // Read the GC count while holding the Heap_lock gc_count_before = total_collections(); - full_gc_count_before = total_full_collections(); + old_marking_count_before = _old_marking_cycles_started; } if (should_do_concurrent_full_gc(cause)) { @@ -2458,7 +2470,7 @@ void G1CollectedHeap::collect(GCCause::Cause cause) { VMThread::execute(&op); if (!op.pause_succeeded()) { - if (full_gc_count_before == total_full_collections()) { + if (old_marking_count_before == _old_marking_cycles_started) { retry_gc = op.should_retry_gc(); } else { // A Full GC happened while we were trying to schedule the @@ -2486,7 +2498,7 @@ void G1CollectedHeap::collect(GCCause::Cause cause) { VMThread::execute(&op); } else { // Schedule a Full GC. - VM_G1CollectFull op(gc_count_before, full_gc_count_before, cause); + VM_G1CollectFull op(gc_count_before, old_marking_count_before, cause); VMThread::execute(&op); } } @@ -3613,7 +3625,7 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) { if (g1_policy()->during_initial_mark_pause()) { // We are about to start a marking cycle, so we increment the // full collection counter. - increment_total_full_collections(); + increment_old_marking_cycles_started(); } // if the log level is "finer" is on, we'll print long statistics information // in the collector policy code, so let's not print this as the output @@ -3930,26 +3942,31 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) { gc_epilogue(false); } + + // The closing of the inner scope, immediately above, will complete + // logging at the "fine" level. The record_collection_pause_end() call + // above will complete logging at the "finer" level. + // + // It is not yet to safe, however, to tell the concurrent mark to + // start as we have some optional output below. We don't want the + // output from the concurrent mark thread interfering with this + // logging output either. + + _hrs.verify_optional(); + verify_region_sets_optional(); + + TASKQUEUE_STATS_ONLY(if (ParallelGCVerbose) print_taskqueue_stats()); + TASKQUEUE_STATS_ONLY(reset_taskqueue_stats()); + + print_heap_after_gc(); + + // We must call G1MonitoringSupport::update_sizes() in the same scoping level + // as an active TraceMemoryManagerStats object (i.e. before the destructor for the + // TraceMemoryManagerStats is called) so that the G1 memory pools are updated + // before any GC notifications are raised. + g1mm()->update_sizes(); } - // The closing of the inner scope, immediately above, will complete - // logging at the "fine" level. The record_collection_pause_end() call - // above will complete logging at the "finer" level. - // - // It is not yet to safe, however, to tell the concurrent mark to - // start as we have some optional output below. We don't want the - // output from the concurrent mark thread interfering with this - // logging output either. - - _hrs.verify_optional(); - verify_region_sets_optional(); - - TASKQUEUE_STATS_ONLY(if (ParallelGCVerbose) print_taskqueue_stats()); - TASKQUEUE_STATS_ONLY(reset_taskqueue_stats()); - - print_heap_after_gc(); - g1mm()->update_sizes(); - if (G1SummarizeRSetStats && (G1SummarizeRSetStatsPeriod > 0) && (total_collections() % G1SummarizeRSetStatsPeriod == 0)) { diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp index 9b8e795c024..d3f5382d03a 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp @@ -359,10 +359,13 @@ private: // (c) cause == _g1_humongous_allocation bool should_do_concurrent_full_gc(GCCause::Cause cause); - // Keeps track of how many "full collections" (i.e., Full GCs or - // concurrent cycles) we have completed. The number of them we have - // started is maintained in _total_full_collections in CollectedHeap. - volatile unsigned int _full_collections_completed; + // Keeps track of how many "old marking cycles" (i.e., Full GCs or + // concurrent cycles) we have started. + volatile unsigned int _old_marking_cycles_started; + + // Keeps track of how many "old marking cycles" (i.e., Full GCs or + // concurrent cycles) we have completed. + volatile unsigned int _old_marking_cycles_completed; // This is a non-product method that is helpful for testing. It is // called at the end of a GC and artificially expands the heap by @@ -673,8 +676,12 @@ public: (size_t) _in_cset_fast_test_length * sizeof(bool)); } + // This is called at the start of either a concurrent cycle or a Full + // GC to update the number of old marking cycles started. + void increment_old_marking_cycles_started(); + // This is called at the end of either a concurrent cycle or a Full - // GC to update the number of full collections completed. Those two + // GC to update the number of old marking cycles completed. Those two // can happen in a nested fashion, i.e., we start a concurrent // cycle, a Full GC happens half-way through it which ends first, // and then the cycle notices that a Full GC happened and ends @@ -683,14 +690,14 @@ public: // false, the caller is the inner caller in the nesting (i.e., the // Full GC). If concurrent is true, the caller is the outer caller // in this nesting (i.e., the concurrent cycle). Further nesting is - // not currently supported. The end of the this call also notifies + // not currently supported. The end of this call also notifies // the FullGCCount_lock in case a Java thread is waiting for a full // GC to happen (e.g., it called System.gc() with // +ExplicitGCInvokesConcurrent). - void increment_full_collections_completed(bool concurrent); + void increment_old_marking_cycles_completed(bool concurrent); - unsigned int full_collections_completed() { - return _full_collections_completed; + unsigned int old_marking_cycles_completed() { + return _old_marking_cycles_completed; } G1HRPrinter* hr_printer() { return &_hr_printer; } diff --git a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp index d880f5509ad..cf7488ffebd 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp +++ b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp @@ -64,7 +64,7 @@ VM_G1IncCollectionPause::VM_G1IncCollectionPause( _should_initiate_conc_mark(should_initiate_conc_mark), _target_pause_time_ms(target_pause_time_ms), _should_retry_gc(false), - _full_collections_completed_before(0) { + _old_marking_cycles_completed_before(0) { guarantee(target_pause_time_ms > 0.0, err_msg("target_pause_time_ms = %1.6lf should be positive", target_pause_time_ms)); @@ -112,11 +112,11 @@ void VM_G1IncCollectionPause::doit() { GCCauseSetter x(g1h, _gc_cause); if (_should_initiate_conc_mark) { - // It's safer to read full_collections_completed() here, given + // It's safer to read old_marking_cycles_completed() here, given // that noone else will be updating it concurrently. Since we'll // only need it if we're initiating a marking cycle, no point in // setting it earlier. - _full_collections_completed_before = g1h->full_collections_completed(); + _old_marking_cycles_completed_before = g1h->old_marking_cycles_completed(); // At this point we are supposed to start a concurrent cycle. We // will do so if one is not already in progress. @@ -181,17 +181,17 @@ void VM_G1IncCollectionPause::doit_epilogue() { G1CollectedHeap* g1h = G1CollectedHeap::heap(); - // In the doit() method we saved g1h->full_collections_completed() - // in the _full_collections_completed_before field. We have to - // wait until we observe that g1h->full_collections_completed() + // In the doit() method we saved g1h->old_marking_cycles_completed() + // in the _old_marking_cycles_completed_before field. We have to + // wait until we observe that g1h->old_marking_cycles_completed() // has increased by at least one. This can happen if a) we started // a cycle and it completes, b) a cycle already in progress // completes, or c) a Full GC happens. // If the condition has already been reached, there's no point in // actually taking the lock and doing the wait. - if (g1h->full_collections_completed() <= - _full_collections_completed_before) { + if (g1h->old_marking_cycles_completed() <= + _old_marking_cycles_completed_before) { // The following is largely copied from CMS Thread* thr = Thread::current(); @@ -200,8 +200,8 @@ void VM_G1IncCollectionPause::doit_epilogue() { ThreadToNativeFromVM native(jt); MutexLockerEx x(FullGCCount_lock, Mutex::_no_safepoint_check_flag); - while (g1h->full_collections_completed() <= - _full_collections_completed_before) { + while (g1h->old_marking_cycles_completed() <= + _old_marking_cycles_completed_before) { FullGCCount_lock->wait(Mutex::_no_safepoint_check_flag); } } diff --git a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp index ea2aeae2108..691812e2edb 100644 --- a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp +++ b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp @@ -80,7 +80,7 @@ private: bool _should_initiate_conc_mark; bool _should_retry_gc; double _target_pause_time_ms; - unsigned int _full_collections_completed_before; + unsigned int _old_marking_cycles_completed_before; public: VM_G1IncCollectionPause(unsigned int gc_count_before, size_t word_size, diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp index e1c166587dd..6f5511f9fcc 100644 --- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp +++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp @@ -844,6 +844,14 @@ nmethod* InterpreterRuntime::frequency_counter_overflow(JavaThread* thread, addr int bci = method->bci_from(fr.interpreter_frame_bcp()); nm = method->lookup_osr_nmethod_for(bci, CompLevel_none, false); } +#ifndef PRODUCT + if (TraceOnStackReplacement) { + if (nm != NULL) { + tty->print("OSR entry @ pc: " INTPTR_FORMAT ": ", nm->osr_entry()); + nm->print(); + } + } +#endif return nm; } diff --git a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp index 3f4a8a16ac5..08a9b033432 100644 --- a/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp +++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.cpp @@ -230,7 +230,7 @@ void TreeList::return_chunk_at_tail(TreeChunk* chunk) { link_tail(chunk); assert(!tail() || size() == tail()->size(), "Wrong sized chunk in list"); - FreeList::increment_count(); + increment_count(); debug_only(increment_returned_bytes_by(chunk->size()*sizeof(HeapWord));) assert(head() == NULL || head()->prev() == NULL, "list invariant"); assert(tail() == NULL || tail()->next() == NULL, "list invariant"); @@ -258,7 +258,7 @@ void TreeList::return_chunk_at_head(TreeChunk* chunk) { } head()->link_after(chunk); assert(!head() || size() == head()->size(), "Wrong sized chunk in list"); - FreeList::increment_count(); + increment_count(); debug_only(increment_returned_bytes_by(chunk->size()*sizeof(HeapWord));) assert(head() == NULL || head()->prev() == NULL, "list invariant"); assert(tail() == NULL || tail()->next() == NULL, "list invariant"); @@ -909,6 +909,7 @@ class TreeCensusClosure : public StackObj { template class AscendTreeCensusClosure : public TreeCensusClosure { + using TreeCensusClosure::do_list; public: void do_tree(TreeList* tl) { if (tl != NULL) { @@ -921,6 +922,7 @@ class AscendTreeCensusClosure : public TreeCensusClosure { template class DescendTreeCensusClosure : public TreeCensusClosure { + using TreeCensusClosure::do_list; public: void do_tree(TreeList* tl) { if (tl != NULL) { @@ -987,6 +989,7 @@ class AscendTreeSearchClosure : public TreeSearchClosure { template class DescendTreeSearchClosure : public TreeSearchClosure { + using TreeSearchClosure::do_list; public: bool do_tree(TreeList* tl) { if (tl != NULL) { diff --git a/hotspot/src/share/vm/memory/binaryTreeDictionary.hpp b/hotspot/src/share/vm/memory/binaryTreeDictionary.hpp index 6d25852cb3e..4b8c0d8141b 100644 --- a/hotspot/src/share/vm/memory/binaryTreeDictionary.hpp +++ b/hotspot/src/share/vm/memory/binaryTreeDictionary.hpp @@ -60,13 +60,18 @@ class TreeList: public FreeList { TreeList* left() const { return _left; } TreeList* right() const { return _right; } - // Wrapper on call to base class, to get the template to compile. - Chunk* head() const { return FreeList::head(); } - Chunk* tail() const { return FreeList::tail(); } - void set_head(Chunk* head) { FreeList::set_head(head); } - void set_tail(Chunk* tail) { FreeList::set_tail(tail); } + // Explicitly import these names into our namespace to fix name lookup with templates + using FreeList::head; + using FreeList::set_head; - size_t size() const { return FreeList::size(); } + using FreeList::tail; + using FreeList::set_tail; + using FreeList::link_tail; + + using FreeList::increment_count; + NOT_PRODUCT(using FreeList::increment_returned_bytes_by;) + using FreeList::verify_chunk_in_free_list; + using FreeList::size; // Accessors for links in tree. diff --git a/hotspot/src/share/vm/oops/constMethodKlass.cpp b/hotspot/src/share/vm/oops/constMethodKlass.cpp index 509b4118b74..b66df9505fd 100644 --- a/hotspot/src/share/vm/oops/constMethodKlass.cpp +++ b/hotspot/src/share/vm/oops/constMethodKlass.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -80,7 +80,7 @@ constMethodOop constMethodKlass::allocate(int byte_code_size, No_Safepoint_Verifier no_safepoint; cm->set_interpreter_kind(Interpreter::invalid); cm->init_fingerprint(); - cm->set_method(NULL); + cm->set_constants(NULL); cm->set_stackmap_data(NULL); cm->set_exception_table(NULL); cm->set_code_size(byte_code_size); @@ -98,7 +98,7 @@ constMethodOop constMethodKlass::allocate(int byte_code_size, void constMethodKlass::oop_follow_contents(oop obj) { assert (obj->is_constMethod(), "object must be constMethod"); constMethodOop cm = constMethodOop(obj); - MarkSweep::mark_and_push(cm->adr_method()); + MarkSweep::mark_and_push(cm->adr_constants()); MarkSweep::mark_and_push(cm->adr_stackmap_data()); MarkSweep::mark_and_push(cm->adr_exception_table()); // Performance tweak: We skip iterating over the klass pointer since we @@ -110,7 +110,7 @@ void constMethodKlass::oop_follow_contents(ParCompactionManager* cm, oop obj) { assert (obj->is_constMethod(), "object must be constMethod"); constMethodOop cm_oop = constMethodOop(obj); - PSParallelCompact::mark_and_push(cm, cm_oop->adr_method()); + PSParallelCompact::mark_and_push(cm, cm_oop->adr_constants()); PSParallelCompact::mark_and_push(cm, cm_oop->adr_stackmap_data()); PSParallelCompact::mark_and_push(cm, cm_oop->adr_exception_table()); // Performance tweak: We skip iterating over the klass pointer since we @@ -121,7 +121,7 @@ void constMethodKlass::oop_follow_contents(ParCompactionManager* cm, int constMethodKlass::oop_oop_iterate(oop obj, OopClosure* blk) { assert (obj->is_constMethod(), "object must be constMethod"); constMethodOop cm = constMethodOop(obj); - blk->do_oop(cm->adr_method()); + blk->do_oop(cm->adr_constants()); blk->do_oop(cm->adr_stackmap_data()); blk->do_oop(cm->adr_exception_table()); // Get size before changing pointers. @@ -135,7 +135,7 @@ int constMethodKlass::oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr) assert (obj->is_constMethod(), "object must be constMethod"); constMethodOop cm = constMethodOop(obj); oop* adr; - adr = cm->adr_method(); + adr = cm->adr_constants(); if (mr.contains(adr)) blk->do_oop(adr); adr = cm->adr_stackmap_data(); if (mr.contains(adr)) blk->do_oop(adr); @@ -153,7 +153,7 @@ int constMethodKlass::oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr) int constMethodKlass::oop_adjust_pointers(oop obj) { assert(obj->is_constMethod(), "should be constMethod"); constMethodOop cm = constMethodOop(obj); - MarkSweep::adjust_pointer(cm->adr_method()); + MarkSweep::adjust_pointer(cm->adr_constants()); MarkSweep::adjust_pointer(cm->adr_stackmap_data()); MarkSweep::adjust_pointer(cm->adr_exception_table()); // Get size before changing pointers. @@ -188,8 +188,8 @@ void constMethodKlass::oop_print_on(oop obj, outputStream* st) { assert(obj->is_constMethod(), "must be constMethod"); Klass::oop_print_on(obj, st); constMethodOop m = constMethodOop(obj); - st->print(" - method: " INTPTR_FORMAT " ", (address)m->method()); - m->method()->print_value_on(st); st->cr(); + st->print(" - constants: " INTPTR_FORMAT " ", (address)m->constants()); + m->constants()->print_value_on(st); st->cr(); st->print(" - exceptions: " INTPTR_FORMAT "\n", (address)m->exception_table()); if (m->has_stackmap_table()) { st->print(" - stackmap data: "); @@ -223,8 +223,8 @@ void constMethodKlass::oop_verify_on(oop obj, outputStream* st) { // Verification can occur during oop construction before the method or // other fields have been initialized. if (!obj->partially_loaded()) { - guarantee(m->method()->is_perm(), "should be in permspace"); - guarantee(m->method()->is_method(), "should be method"); + guarantee(m->constants()->is_perm(), "should be in permspace"); + guarantee(m->constants()->is_constantPool(), "should be constant pool"); typeArrayOop stackmap_data = m->stackmap_data(); guarantee(stackmap_data == NULL || stackmap_data->is_perm(), "should be in permspace"); diff --git a/hotspot/src/share/vm/oops/constMethodOop.cpp b/hotspot/src/share/vm/oops/constMethodOop.cpp index b52e64ee485..cc8dfd5011b 100644 --- a/hotspot/src/share/vm/oops/constMethodOop.cpp +++ b/hotspot/src/share/vm/oops/constMethodOop.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -53,6 +53,10 @@ int constMethodOopDesc::object_size(int code_size, return align_object_size(header_size() + extra_words); } +methodOop constMethodOopDesc::method() const { + return instanceKlass::cast(_constants->pool_holder())->method_with_idnum( + _method_idnum); + } // linenumber table - note that length is unknown until decompression, // see class CompressedLineNumberReadStream. diff --git a/hotspot/src/share/vm/oops/constMethodOop.hpp b/hotspot/src/share/vm/oops/constMethodOop.hpp index 91f97869a0c..10344ec6db7 100644 --- a/hotspot/src/share/vm/oops/constMethodOop.hpp +++ b/hotspot/src/share/vm/oops/constMethodOop.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,7 +41,7 @@ // |------------------------------------------------------| // | fingerprint 1 | // | fingerprint 2 | -// | method (oop) | +// | constants (oop) | // | stackmap_data (oop) | // | exception_table (oop) | // | constMethod_size | @@ -113,7 +113,7 @@ private: volatile bool _is_conc_safe; // if true, safe for concurrent GC processing public: - oop* oop_block_beg() const { return adr_method(); } + oop* oop_block_beg() const { return adr_constants(); } oop* oop_block_end() const { return adr_exception_table() + 1; } private: @@ -121,8 +121,7 @@ private: // The oop block. See comment in klass.hpp before making changes. // - // Backpointer to non-const methodOop (needed for some JVMTI operations) - methodOop _method; + constantPoolOop _constants; // Constant pool // Raw stackmap data for the method typeArrayOop _stackmap_data; @@ -167,10 +166,13 @@ public: void set_interpreter_kind(int kind) { _interpreter_kind = kind; } int interpreter_kind(void) const { return _interpreter_kind; } - // backpointer to non-const methodOop - methodOop method() const { return _method; } - void set_method(methodOop m) { oop_store_without_check((oop*)&_method, (oop) m); } + // constant pool + constantPoolOop constants() const { return _constants; } + void set_constants(constantPoolOop c) { + oop_store_without_check((oop*)&_constants, (oop)c); + } + methodOop method() const; // stackmap table data typeArrayOop stackmap_data() const { return _stackmap_data; } @@ -278,11 +280,13 @@ public: { return in_ByteSize(sizeof(constMethodOopDesc)); } // interpreter support + static ByteSize constants_offset() + { return byte_offset_of(constMethodOopDesc, _constants); } static ByteSize exception_table_offset() { return byte_offset_of(constMethodOopDesc, _exception_table); } // Garbage collection support - oop* adr_method() const { return (oop*)&_method; } + oop* adr_constants() const { return (oop*)&_constants; } oop* adr_stackmap_data() const { return (oop*)&_stackmap_data; } oop* adr_exception_table() const { return (oop*)&_exception_table; } bool is_conc_safe() { return _is_conc_safe; } diff --git a/hotspot/src/share/vm/oops/methodKlass.cpp b/hotspot/src/share/vm/oops/methodKlass.cpp index b2d62358db8..b88b8b72901 100644 --- a/hotspot/src/share/vm/oops/methodKlass.cpp +++ b/hotspot/src/share/vm/oops/methodKlass.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -112,11 +112,6 @@ methodOop methodKlass::allocate(constMethodHandle xconst, assert(m->is_parsable(), "must be parsable here."); assert(m->size() == size, "wrong size for object"); - // We should not publish an uprasable object's reference - // into one that is parsable, since that presents problems - // for the concurrent parallel marking and precleaning phases - // of concurrent gc (CMS). - xconst->set_method(m); return m; } @@ -127,7 +122,6 @@ void methodKlass::oop_follow_contents(oop obj) { // Performance tweak: We skip iterating over the klass pointer since we // know that Universe::methodKlassObj never moves. MarkSweep::mark_and_push(m->adr_constMethod()); - MarkSweep::mark_and_push(m->adr_constants()); if (m->method_data() != NULL) { MarkSweep::mark_and_push(m->adr_method_data()); } @@ -141,7 +135,6 @@ void methodKlass::oop_follow_contents(ParCompactionManager* cm, // Performance tweak: We skip iterating over the klass pointer since we // know that Universe::methodKlassObj never moves. PSParallelCompact::mark_and_push(cm, m->adr_constMethod()); - PSParallelCompact::mark_and_push(cm, m->adr_constants()); #ifdef COMPILER2 if (m->method_data() != NULL) { PSParallelCompact::mark_and_push(cm, m->adr_method_data()); @@ -159,7 +152,6 @@ int methodKlass::oop_oop_iterate(oop obj, OopClosure* blk) { // Performance tweak: We skip iterating over the klass pointer since we // know that Universe::methodKlassObj never moves blk->do_oop(m->adr_constMethod()); - blk->do_oop(m->adr_constants()); if (m->method_data() != NULL) { blk->do_oop(m->adr_method_data()); } @@ -178,8 +170,6 @@ int methodKlass::oop_oop_iterate_m(oop obj, OopClosure* blk, MemRegion mr) { oop* adr; adr = m->adr_constMethod(); if (mr.contains(adr)) blk->do_oop(adr); - adr = m->adr_constants(); - if (mr.contains(adr)) blk->do_oop(adr); if (m->method_data() != NULL) { adr = m->adr_method_data(); if (mr.contains(adr)) blk->do_oop(adr); @@ -197,7 +187,6 @@ int methodKlass::oop_adjust_pointers(oop obj) { // Performance tweak: We skip iterating over the klass pointer since we // know that Universe::methodKlassObj never moves. MarkSweep::adjust_pointer(m->adr_constMethod()); - MarkSweep::adjust_pointer(m->adr_constants()); if (m->method_data() != NULL) { MarkSweep::adjust_pointer(m->adr_method_data()); } @@ -213,7 +202,6 @@ int methodKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) { assert(obj->is_method(), "should be method"); methodOop m = methodOop(obj); PSParallelCompact::adjust_pointer(m->adr_constMethod()); - PSParallelCompact::adjust_pointer(m->adr_constants()); #ifdef COMPILER2 if (m->method_data() != NULL) { PSParallelCompact::adjust_pointer(m->adr_method_data()); @@ -339,8 +327,6 @@ void methodKlass::oop_verify_on(oop obj, outputStream* st) { if (!obj->partially_loaded()) { methodOop m = methodOop(obj); guarantee(m->is_perm(), "should be in permspace"); - guarantee(m->constants()->is_perm(), "should be in permspace"); - guarantee(m->constants()->is_constantPool(), "should be constant pool"); guarantee(m->constMethod()->is_constMethod(), "should be constMethodOop"); guarantee(m->constMethod()->is_perm(), "should be in permspace"); methodDataOop method_data = m->method_data(); diff --git a/hotspot/src/share/vm/oops/methodOop.cpp b/hotspot/src/share/vm/oops/methodOop.cpp index 6decdd72b93..7a0e74e0fe3 100644 --- a/hotspot/src/share/vm/oops/methodOop.cpp +++ b/hotspot/src/share/vm/oops/methodOop.cpp @@ -70,11 +70,11 @@ address methodOopDesc::get_c2i_unverified_entry() { return _adapter->get_c2i_unverified_entry(); } -char* methodOopDesc::name_and_sig_as_C_string() { +char* methodOopDesc::name_and_sig_as_C_string() const { return name_and_sig_as_C_string(Klass::cast(constants()->pool_holder()), name(), signature()); } -char* methodOopDesc::name_and_sig_as_C_string(char* buf, int size) { +char* methodOopDesc::name_and_sig_as_C_string(char* buf, int size) const { return name_and_sig_as_C_string(Klass::cast(constants()->pool_holder()), name(), signature(), buf, size); } @@ -177,7 +177,8 @@ void methodOopDesc::mask_for(int bci, InterpreterOopMap* mask) { int methodOopDesc::bci_from(address bcp) const { - assert(is_native() && bcp == code_base() || contains(bcp) || is_error_reported(), "bcp doesn't belong to this method"); + assert(is_native() && bcp == code_base() || contains(bcp) || is_error_reported(), + err_msg("bcp doesn't belong to this method: bcp: " INTPTR_FORMAT ", method: %s", bcp, name_and_sig_as_C_string())); return bcp - code_base(); } @@ -531,9 +532,9 @@ int methodOopDesc::line_number_from_bci(int bci) const { bool methodOopDesc::is_klass_loaded_by_klass_index(int klass_index) const { - if( _constants->tag_at(klass_index).is_unresolved_klass() ) { + if( constants()->tag_at(klass_index).is_unresolved_klass() ) { Thread *thread = Thread::current(); - Symbol* klass_name = _constants->klass_name_at(klass_index); + Symbol* klass_name = constants()->klass_name_at(klass_index); Handle loader(thread, instanceKlass::cast(method_holder())->class_loader()); Handle prot (thread, Klass::cast(method_holder())->protection_domain()); return SystemDictionary::find(klass_name, loader, prot, thread) != NULL; @@ -544,7 +545,7 @@ bool methodOopDesc::is_klass_loaded_by_klass_index(int klass_index) const { bool methodOopDesc::is_klass_loaded(int refinfo_index, bool must_be_resolved) const { - int klass_index = _constants->klass_ref_index_at(refinfo_index); + int klass_index = constants()->klass_ref_index_at(refinfo_index); if (must_be_resolved) { // Make sure klass is resolved in constantpool. if (constants()->tag_at(klass_index).is_unresolved_klass()) return false; @@ -886,11 +887,13 @@ oop methodOopDesc::method_handle_type() const { } jint* methodOopDesc::method_type_offsets_chain() { - static jint pchase[] = { -1, -1, -1 }; + static jint pchase[] = { -1, -1, -1, -1 }; if (pchase[0] == -1) { - jint step0 = in_bytes(constants_offset()); - jint step1 = (constantPoolOopDesc::header_size() + _imcp_method_type_value) * HeapWordSize; + jint step0 = in_bytes(const_offset()); + jint step1 = in_bytes(constMethodOopDesc::constants_offset()); + jint step2 = (constantPoolOopDesc::header_size() + _imcp_method_type_value) * HeapWordSize; // do this in reverse to avoid races: + OrderAccess::release_store(&pchase[2], step2); OrderAccess::release_store(&pchase[1], step1); OrderAccess::release_store(&pchase[0], step0); } @@ -1076,9 +1079,7 @@ methodHandle methodOopDesc:: clone_with_new_data(methodHandle m, u_char* new_cod assert(m->constMethod()->is_parsable(), "Should remain parsable"); // Reset correct method/const method, method size, and parameter info - newcm->set_method(newm()); newm->set_constMethod(newcm); - assert(newcm->method() == newm(), "check"); newm->constMethod()->set_code_size(new_code_length); newm->constMethod()->set_constMethod_size(new_const_method_size); newm->set_method_size(new_method_size); diff --git a/hotspot/src/share/vm/oops/methodOop.hpp b/hotspot/src/share/vm/oops/methodOop.hpp index 60bb34bb2cf..de10b7c96f0 100644 --- a/hotspot/src/share/vm/oops/methodOop.hpp +++ b/hotspot/src/share/vm/oops/methodOop.hpp @@ -64,7 +64,6 @@ // | klass | // |------------------------------------------------------| // | constMethodOop (oop) | -// | constants (oop) | // |------------------------------------------------------| // | methodData (oop) | // | interp_invocation_count | @@ -110,7 +109,6 @@ class methodOopDesc : public oopDesc { friend class VMStructs; private: constMethodOop _constMethod; // Method read-only data. - constantPoolOop _constants; // Constant pool methodDataOop _method_data; int _interpreter_invocation_count; // Count of times invoked (reused as prev_event_count in tiered) AccessFlags _access_flags; // Access flags @@ -170,17 +168,17 @@ class methodOopDesc : public oopDesc { void set_access_flags(AccessFlags flags) { _access_flags = flags; } // name - Symbol* name() const { return _constants->symbol_at(name_index()); } + Symbol* name() const { return constants()->symbol_at(name_index()); } int name_index() const { return constMethod()->name_index(); } void set_name_index(int index) { constMethod()->set_name_index(index); } // signature - Symbol* signature() const { return _constants->symbol_at(signature_index()); } + Symbol* signature() const { return constants()->symbol_at(signature_index()); } int signature_index() const { return constMethod()->signature_index(); } void set_signature_index(int index) { constMethod()->set_signature_index(index); } // generics support - Symbol* generic_signature() const { int idx = generic_signature_index(); return ((idx != 0) ? _constants->symbol_at(idx) : (Symbol*)NULL); } + Symbol* generic_signature() const { int idx = generic_signature_index(); return ((idx != 0) ? constants()->symbol_at(idx) : (Symbol*)NULL); } int generic_signature_index() const { return constMethod()->generic_signature_index(); } void set_generic_signature_index(int index) { constMethod()->set_generic_signature_index(index); } @@ -198,8 +196,8 @@ class methodOopDesc : public oopDesc { // C string, for the purpose of providing more useful NoSuchMethodErrors // and fatal error handling. The string is allocated in resource // area if a buffer is not provided by the caller. - char* name_and_sig_as_C_string(); - char* name_and_sig_as_C_string(char* buf, int size); + char* name_and_sig_as_C_string() const; + char* name_and_sig_as_C_string(char* buf, int size) const; // Static routine in the situations we don't have a methodOop static char* name_and_sig_as_C_string(Klass* klass, Symbol* method_name, Symbol* signature); @@ -242,8 +240,8 @@ class methodOopDesc : public oopDesc { } // constant pool for klassOop holding this method - constantPoolOop constants() const { return _constants; } - void set_constants(constantPoolOop c) { oop_store_without_check((oop*)&_constants, c); } + constantPoolOop constants() const { return constMethod()->constants(); } + void set_constants(constantPoolOop c) { constMethod()->set_constants(c); } // max stack int max_stack() const { return _max_stack; } @@ -453,7 +451,7 @@ class methodOopDesc : public oopDesc { { return constMethod()->compressed_linenumber_table(); } // method holder (the klassOop holding this method) - klassOop method_holder() const { return _constants->pool_holder(); } + klassOop method_holder() const { return constants()->pool_holder(); } void compute_size_of_parameters(Thread *thread); // word size of parameters (receiver if any + arguments) Symbol* klass_name() const; // returns the name of the method holder @@ -544,7 +542,6 @@ class methodOopDesc : public oopDesc { // interpreter support static ByteSize const_offset() { return byte_offset_of(methodOopDesc, _constMethod ); } - static ByteSize constants_offset() { return byte_offset_of(methodOopDesc, _constants ); } static ByteSize access_flags_offset() { return byte_offset_of(methodOopDesc, _access_flags ); } #ifdef CC_INTERP static ByteSize result_index_offset() { return byte_offset_of(methodOopDesc, _result_index ); } @@ -723,7 +720,6 @@ class methodOopDesc : public oopDesc { // Garbage collection support oop* adr_constMethod() const { return (oop*)&_constMethod; } - oop* adr_constants() const { return (oop*)&_constants; } oop* adr_method_data() const { return (oop*)&_method_data; } }; diff --git a/hotspot/src/share/vm/opto/classes.hpp b/hotspot/src/share/vm/opto/classes.hpp index 19ade906999..03b5107c3e4 100644 --- a/hotspot/src/share/vm/opto/classes.hpp +++ b/hotspot/src/share/vm/opto/classes.hpp @@ -147,7 +147,6 @@ macro(LoadNKlass) macro(LoadL) macro(LoadL_unaligned) macro(LoadPLocked) -macro(LoadLLocked) macro(LoadP) macro(LoadN) macro(LoadRange) diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp index 0a374d792f2..5c4b5145ab7 100644 --- a/hotspot/src/share/vm/opto/compile.cpp +++ b/hotspot/src/share/vm/opto/compile.cpp @@ -2297,7 +2297,6 @@ static void final_graph_reshaping_impl( Node *n, Final_Reshape_Counts &frc ) { case Op_LoadL: case Op_LoadL_unaligned: case Op_LoadPLocked: - case Op_LoadLLocked: case Op_LoadP: case Op_LoadN: case Op_LoadRange: diff --git a/hotspot/src/share/vm/opto/divnode.cpp b/hotspot/src/share/vm/opto/divnode.cpp index 5539410070d..14fa0790bb6 100644 --- a/hotspot/src/share/vm/opto/divnode.cpp +++ b/hotspot/src/share/vm/opto/divnode.cpp @@ -284,9 +284,14 @@ static Node* long_by_long_mulhi(PhaseGVN* phase, Node* dividend, jlong magic_con const int N = 64; + // Dummy node to keep intermediate nodes alive during construction + Node* hook = new (phase->C, 4) Node(4); + // u0 = u & 0xFFFFFFFF; u1 = u >> 32; Node* u0 = phase->transform(new (phase->C, 3) AndLNode(dividend, phase->longcon(0xFFFFFFFF))); Node* u1 = phase->transform(new (phase->C, 3) RShiftLNode(dividend, phase->intcon(N / 2))); + hook->init_req(0, u0); + hook->init_req(1, u1); // v0 = v & 0xFFFFFFFF; v1 = v >> 32; Node* v0 = phase->longcon(magic_const & 0xFFFFFFFF); @@ -299,19 +304,14 @@ static Node* long_by_long_mulhi(PhaseGVN* phase, Node* dividend, jlong magic_con Node* u1v0 = phase->transform(new (phase->C, 3) MulLNode(u1, v0)); Node* temp = phase->transform(new (phase->C, 3) URShiftLNode(w0, phase->intcon(N / 2))); Node* t = phase->transform(new (phase->C, 3) AddLNode(u1v0, temp)); + hook->init_req(2, t); // w1 = t & 0xFFFFFFFF; - Node* w1 = new (phase->C, 3) AndLNode(t, phase->longcon(0xFFFFFFFF)); + Node* w1 = phase->transform(new (phase->C, 3) AndLNode(t, phase->longcon(0xFFFFFFFF))); + hook->init_req(3, w1); // w2 = t >> 32; - Node* w2 = new (phase->C, 3) RShiftLNode(t, phase->intcon(N / 2)); - - // 6732154: Construct both w1 and w2 before transforming, so t - // doesn't go dead prematurely. - // 6837011: We need to transform w2 before w1 because the - // transformation of w1 could return t. - w2 = phase->transform(w2); - w1 = phase->transform(w1); + Node* w2 = phase->transform(new (phase->C, 3) RShiftLNode(t, phase->intcon(N / 2))); // w1 = u0*v1 + w1; Node* u0v1 = phase->transform(new (phase->C, 3) MulLNode(u0, v1)); @@ -322,6 +322,16 @@ static Node* long_by_long_mulhi(PhaseGVN* phase, Node* dividend, jlong magic_con Node* temp1 = phase->transform(new (phase->C, 3) AddLNode(u1v1, w2)); Node* temp2 = phase->transform(new (phase->C, 3) RShiftLNode(w1, phase->intcon(N / 2))); + // Remove the bogus extra edges used to keep things alive + PhaseIterGVN* igvn = phase->is_IterGVN(); + if (igvn != NULL) { + igvn->remove_dead_node(hook); + } else { + for (int i = 0; i < 4; i++) { + hook->set_req(i, NULL); + } + } + return new (phase->C, 3) AddLNode(temp1, temp2); } diff --git a/hotspot/src/share/vm/opto/domgraph.cpp b/hotspot/src/share/vm/opto/domgraph.cpp index ef4e1b17d55..b3a367d53fb 100644 --- a/hotspot/src/share/vm/opto/domgraph.cpp +++ b/hotspot/src/share/vm/opto/domgraph.cpp @@ -465,15 +465,11 @@ void PhaseIdealLoop::Dominators() { // Kill dead input path assert( !visited.test(whead->in(i)->_idx), "input with no loop must be dead" ); - _igvn.hash_delete(whead); - whead->del_req(i); - _igvn._worklist.push(whead); + _igvn.delete_input_of(whead, i); for (DUIterator_Fast jmax, j = whead->fast_outs(jmax); j < jmax; j++) { Node* p = whead->fast_out(j); if( p->is_Phi() ) { - _igvn.hash_delete(p); - p->del_req(i); - _igvn._worklist.push(p); + _igvn.delete_input_of(p, i); } } i--; // Rerun same iteration diff --git a/hotspot/src/share/vm/opto/ifnode.cpp b/hotspot/src/share/vm/opto/ifnode.cpp index ce84f649f9b..c48e982bab9 100644 --- a/hotspot/src/share/vm/opto/ifnode.cpp +++ b/hotspot/src/share/vm/opto/ifnode.cpp @@ -338,8 +338,7 @@ static Node* split_if(IfNode *iff, PhaseIterGVN *igvn) { Node *phi_f = NULL; // do not construct unless needed for (DUIterator_Last i2min, i2 = phi->last_outs(i2min); i2 >= i2min; --i2) { Node* v = phi->last_out(i2);// User of the phi - igvn->hash_delete(v); // Have to fixup other Phi users - igvn->_worklist.push(v); + igvn->rehash_node_delayed(v); // Have to fixup other Phi users uint vop = v->Opcode(); Node *proj = NULL; if( vop == Op_Phi ) { // Remote merge point @@ -552,9 +551,8 @@ static void adjust_check(Node* proj, Node* range, Node* index, if( new_cmp == cmp ) return; // Else, adjust existing check Node *new_bol = gvn->transform( new (gvn->C, 2) BoolNode( new_cmp, bol->as_Bool()->_test._test ) ); - igvn->hash_delete( iff ); + igvn->rehash_node_delayed( iff ); iff->set_req_X( 1, new_bol, igvn ); - igvn->_worklist.push( iff ); } //------------------------------up_one_dom------------------------------------- @@ -732,9 +730,7 @@ Node* IfNode::fold_compares(PhaseGVN* phase) { Node* adjusted = phase->transform(new (phase->C, 3) SubINode(n, phase->intcon(failtype->_lo))); Node* newcmp = phase->transform(new (phase->C, 3) CmpUNode(adjusted, phase->intcon(bound))); Node* newbool = phase->transform(new (phase->C, 2) BoolNode(newcmp, cond)); - phase->hash_delete(dom_iff); - dom_iff->set_req(1, phase->intcon(ctrl->as_Proj()->_con)); - phase->is_IterGVN()->_worklist.push(dom_iff); + phase->is_IterGVN()->replace_input_of(dom_iff, 1, phase->intcon(ctrl->as_Proj()->_con)); phase->hash_delete(this); set_req(1, newbool); return this; @@ -1042,17 +1038,15 @@ void IfNode::dominated_by( Node *prev_dom, PhaseIterGVN *igvn ) { // Loop ends when projection has no more uses. for (DUIterator_Last jmin, j = ifp->last_outs(jmin); j >= jmin; --j) { Node* s = ifp->last_out(j); // Get child of IfTrue/IfFalse - igvn->hash_delete(s); // Yank from hash table before edge hacking if( !s->depends_only_on_test() ) { // Find the control input matching this def-use edge. // For Regions it may not be in slot 0. uint l; for( l = 0; s->in(l) != ifp; l++ ) { } - s->set_req(l, ctrl_target); + igvn->replace_input_of(s, l, ctrl_target); } else { // Else, for control producers, - s->set_req(0, data_target); // Move child to data-target + igvn->replace_input_of(s, 0, data_target); // Move child to data-target } - igvn->_worklist.push(s); // Revisit collapsed Phis } // End for each child of a projection igvn->remove_dead_node(ifp); diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp index 56ea23b484a..f9d740efd7b 100644 --- a/hotspot/src/share/vm/opto/library_call.cpp +++ b/hotspot/src/share/vm/opto/library_call.cpp @@ -192,8 +192,6 @@ class LibraryCallKit : public GraphKit { void copy_to_clone(Node* obj, Node* alloc_obj, Node* obj_size, bool is_array, bool card_mark); bool inline_native_clone(bool is_virtual); bool inline_native_Reflection_getCallerClass(); - bool inline_native_AtomicLong_get(); - bool inline_native_AtomicLong_attemptUpdate(); bool is_method_invoke_or_aux_frame(JVMState* jvms); // Helper function for inlining native object hash method bool inline_native_hashcode(bool is_virtual, bool is_static); @@ -331,11 +329,6 @@ CallGenerator* Compile::make_vm_intrinsic(ciMethod* m, bool is_virtual) { // We do not intrinsify this. The optimizer does fine with it. return NULL; - case vmIntrinsics::_get_AtomicLong: - case vmIntrinsics::_attemptUpdate: - if (!InlineAtomicLong) return NULL; - break; - case vmIntrinsics::_getCallerClass: if (!UseNewReflection) return NULL; if (!InlineReflectionGetCallerClass) return NULL; @@ -711,11 +704,6 @@ bool LibraryCallKit::try_to_inline() { case vmIntrinsics::_reverseBytes_c: return inline_reverseBytes((vmIntrinsics::ID) intrinsic_id()); - case vmIntrinsics::_get_AtomicLong: - return inline_native_AtomicLong_get(); - case vmIntrinsics::_attemptUpdate: - return inline_native_AtomicLong_attemptUpdate(); - case vmIntrinsics::_getCallerClass: return inline_native_Reflection_getCallerClass(); @@ -4006,113 +3994,6 @@ bool LibraryCallKit::is_method_invoke_or_aux_frame(JVMState* jvms) { return false; } -static int value_field_offset = -1; // offset of the "value" field of AtomicLongCSImpl. This is needed by - // inline_native_AtomicLong_attemptUpdate() but it has no way of - // computing it since there is no lookup field by name function in the - // CI interface. This is computed and set by inline_native_AtomicLong_get(). - // Using a static variable here is safe even if we have multiple compilation - // threads because the offset is constant. At worst the same offset will be - // computed and stored multiple - -bool LibraryCallKit::inline_native_AtomicLong_get() { - // Restore the stack and pop off the argument - _sp+=1; - Node *obj = pop(); - - // get the offset of the "value" field. Since the CI interfaces - // does not provide a way to look up a field by name, we scan the bytecodes - // to get the field index. We expect the first 2 instructions of the method - // to be: - // 0 aload_0 - // 1 getfield "value" - ciMethod* method = callee(); - if (value_field_offset == -1) - { - ciField* value_field; - ciBytecodeStream iter(method); - Bytecodes::Code bc = iter.next(); - - if ((bc != Bytecodes::_aload_0) && - ((bc != Bytecodes::_aload) || (iter.get_index() != 0))) - return false; - bc = iter.next(); - if (bc != Bytecodes::_getfield) - return false; - bool ignore; - value_field = iter.get_field(ignore); - value_field_offset = value_field->offset_in_bytes(); - } - - // Null check without removing any arguments. - _sp++; - obj = do_null_check(obj, T_OBJECT); - _sp--; - // Check for locking null object - if (stopped()) return true; - - Node *adr = basic_plus_adr(obj, obj, value_field_offset); - const TypePtr *adr_type = _gvn.type(adr)->is_ptr(); - int alias_idx = C->get_alias_index(adr_type); - - Node *result = _gvn.transform(new (C, 3) LoadLLockedNode(control(), memory(alias_idx), adr)); - - push_pair(result); - - return true; -} - -bool LibraryCallKit::inline_native_AtomicLong_attemptUpdate() { - // Restore the stack and pop off the arguments - _sp+=5; - Node *newVal = pop_pair(); - Node *oldVal = pop_pair(); - Node *obj = pop(); - - // we need the offset of the "value" field which was computed when - // inlining the get() method. Give up if we don't have it. - if (value_field_offset == -1) - return false; - - // Null check without removing any arguments. - _sp+=5; - obj = do_null_check(obj, T_OBJECT); - _sp-=5; - // Check for locking null object - if (stopped()) return true; - - Node *adr = basic_plus_adr(obj, obj, value_field_offset); - const TypePtr *adr_type = _gvn.type(adr)->is_ptr(); - int alias_idx = C->get_alias_index(adr_type); - - Node *cas = _gvn.transform(new (C, 5) StoreLConditionalNode(control(), memory(alias_idx), adr, newVal, oldVal)); - Node *store_proj = _gvn.transform( new (C, 1) SCMemProjNode(cas)); - set_memory(store_proj, alias_idx); - Node *bol = _gvn.transform( new (C, 2) BoolNode( cas, BoolTest::eq ) ); - - Node *result; - // CMove node is not used to be able fold a possible check code - // after attemptUpdate() call. This code could be transformed - // into CMove node by loop optimizations. - { - RegionNode *r = new (C, 3) RegionNode(3); - result = new (C, 3) PhiNode(r, TypeInt::BOOL); - - Node *iff = create_and_xform_if(control(), bol, PROB_FAIR, COUNT_UNKNOWN); - Node *iftrue = opt_iff(r, iff); - r->init_req(1, iftrue); - result->init_req(1, intcon(1)); - result->init_req(2, intcon(0)); - - set_control(_gvn.transform(r)); - record_for_igvn(r); - - C->set_has_split_ifs(true); // Has chance for split-if optimization - } - - push(_gvn.transform(result)); - return true; -} - bool LibraryCallKit::inline_fp_conversions(vmIntrinsics::ID id) { // restore the arguments _sp += arg_size(); diff --git a/hotspot/src/share/vm/opto/loopPredicate.cpp b/hotspot/src/share/vm/opto/loopPredicate.cpp index d4a575d7b55..048cba894f3 100644 --- a/hotspot/src/share/vm/opto/loopPredicate.cpp +++ b/hotspot/src/share/vm/opto/loopPredicate.cpp @@ -212,9 +212,8 @@ ProjNode* PhaseIdealLoop::create_new_if_for_predicate(ProjNode* cont_proj, Node* Node* use = rgn->fast_out(i); if (use->is_Phi() && use->outcnt() > 0) { assert(use->in(0) == rgn, ""); - _igvn.hash_delete(use); + _igvn.rehash_node_delayed(use); use->add_req(use->in(proj_index)); - _igvn._worklist.push(use); has_phi = true; } } @@ -284,9 +283,8 @@ ProjNode* PhaseIterGVN::create_new_if_for_predicate(ProjNode* cont_proj, Node* n for (DUIterator_Fast imax, i = rgn->fast_outs(imax); i < imax; i++) { Node* use = rgn->fast_out(i); if (use->is_Phi() && use->outcnt() > 0) { - hash_delete(use); + rehash_node_delayed(use); use->add_req(use->in(proj_index)); - _worklist.push(use); has_phi = true; } } diff --git a/hotspot/src/share/vm/opto/loopTransform.cpp b/hotspot/src/share/vm/opto/loopTransform.cpp index eee153a8904..0ee3436c73a 100644 --- a/hotspot/src/share/vm/opto/loopTransform.cpp +++ b/hotspot/src/share/vm/opto/loopTransform.cpp @@ -961,9 +961,7 @@ void PhaseIdealLoop::insert_pre_post_loops( IdealLoopTree *loop, Node_List &old_ set_loop(zer_iff, loop->_parent); // Plug in the false-path, taken if we need to skip post-loop - _igvn.hash_delete( main_exit ); - main_exit->set_req(0, zer_iff); - _igvn._worklist.push(main_exit); + _igvn.replace_input_of(main_exit, 0, zer_iff); set_idom(main_exit, zer_iff, dd_main_exit); set_idom(main_exit->unique_out(), zer_iff, dd_main_exit); // Make the true-path, must enter the post loop @@ -1956,9 +1954,7 @@ void PhaseIdealLoop::do_range_check( IdealLoopTree *loop, Node_List &old_new ) { C->set_major_progress(); Node *kill_con = _igvn.intcon( 1-flip ); set_ctrl(kill_con, C->root()); - _igvn.hash_delete(iff); - iff->set_req(1, kill_con); - _igvn._worklist.push(iff); + _igvn.replace_input_of(iff, 1, kill_con); // Find surviving projection assert(iff->is_If(), ""); ProjNode* dp = ((IfNode*)iff)->proj_out(1-flip); @@ -1966,11 +1962,9 @@ void PhaseIdealLoop::do_range_check( IdealLoopTree *loop, Node_List &old_new ) { for (DUIterator_Fast imax, i = dp->fast_outs(imax); i < imax; i++) { Node* cd = dp->fast_out(i); // Control-dependent node if( cd->is_Load() ) { // Loads can now float around in the loop - _igvn.hash_delete(cd); // Allow the load to float around in the loop, or before it // but NOT before the pre-loop. - cd->set_req(0, ctrl); // ctrl, not NULL - _igvn._worklist.push(cd); + _igvn.replace_input_of(cd, 0, ctrl); // ctrl, not NULL --i; --imax; } @@ -2029,14 +2023,10 @@ void PhaseIdealLoop::do_range_check( IdealLoopTree *loop, Node_List &old_new ) { main_bol->set_req(1,main_cmp); } // Hack the now-private loop bounds - _igvn.hash_delete(main_cmp); - main_cmp->set_req(2, main_limit); - _igvn._worklist.push(main_cmp); + _igvn.replace_input_of(main_cmp, 2, main_limit); // The OpaqueNode is unshared by design - _igvn.hash_delete(opqzm); assert( opqzm->outcnt() == 1, "cannot hack shared node" ); - opqzm->set_req(1,main_limit); - _igvn._worklist.push(opqzm); + _igvn.replace_input_of(opqzm, 1, main_limit); } //------------------------------DCE_loop_body---------------------------------- @@ -2178,9 +2168,7 @@ bool IdealLoopTree::policy_do_remove_empty_loop( PhaseIdealLoop *phase ) { Node* cmp = cl->loopexit()->cmp_node(); assert(cl->limit() == cmp->in(2), "sanity"); phase->_igvn._worklist.push(cmp->in(2)); // put limit on worklist - phase->_igvn.hash_delete(cmp); - cmp->set_req(2, exact_limit); - phase->_igvn._worklist.push(cmp); // put cmp on worklist + phase->_igvn.replace_input_of(cmp, 2, exact_limit); // put cmp on worklist } // Note: the final value after increment should not overflow since // counted loop has limit check predicate. diff --git a/hotspot/src/share/vm/opto/loopUnswitch.cpp b/hotspot/src/share/vm/opto/loopUnswitch.cpp index 20ddf782730..47e3990fd15 100644 --- a/hotspot/src/share/vm/opto/loopUnswitch.cpp +++ b/hotspot/src/share/vm/opto/loopUnswitch.cpp @@ -174,27 +174,21 @@ void PhaseIdealLoop::do_unswitching (IdealLoopTree *loop, Node_List &old_new) { Node* use = worklist.pop(); Node* nuse = use->clone(); nuse->set_req(0, invar_proj); - _igvn.hash_delete(use); - use->set_req(1, nuse); - _igvn._worklist.push(use); + _igvn.replace_input_of(use, 1, nuse); register_new_node(nuse, invar_proj); // Same for the clone Node* use_clone = old_new[use->_idx]; - _igvn.hash_delete(use_clone); - use_clone->set_req(1, nuse); - _igvn._worklist.push(use_clone); + _igvn.replace_input_of(use_clone, 1, nuse); } } // Hardwire the control paths in the loops into if(true) and if(false) - _igvn.hash_delete(unswitch_iff); + _igvn.rehash_node_delayed(unswitch_iff); short_circuit_if(unswitch_iff, proj_true); - _igvn._worklist.push(unswitch_iff); IfNode* unswitch_iff_clone = old_new[unswitch_iff->_idx]->as_If(); - _igvn.hash_delete(unswitch_iff_clone); + _igvn.rehash_node_delayed(unswitch_iff_clone); short_circuit_if(unswitch_iff_clone, proj_false); - _igvn._worklist.push(unswitch_iff_clone); // Reoptimize loops loop->record_for_igvn(); @@ -224,8 +218,7 @@ ProjNode* PhaseIdealLoop::create_slow_version_of_loop(IdealLoopTree *loop, LoopNode* head = loop->_head->as_Loop(); bool counted_loop = head->is_CountedLoop(); Node* entry = head->in(LoopNode::EntryControl); - _igvn.hash_delete(entry); - _igvn._worklist.push(entry); + _igvn.rehash_node_delayed(entry); IdealLoopTree* outer_loop = loop->_parent; Node *cont = _igvn.intcon(1); @@ -249,18 +242,14 @@ ProjNode* PhaseIdealLoop::create_slow_version_of_loop(IdealLoopTree *loop, // Fast (true) control Node* iffast_pred = clone_loop_predicates(entry, iffast, !counted_loop); - _igvn.hash_delete(head); - head->set_req(LoopNode::EntryControl, iffast_pred); + _igvn.replace_input_of(head, LoopNode::EntryControl, iffast_pred); set_idom(head, iffast_pred, dom_depth(head)); - _igvn._worklist.push(head); // Slow (false) control Node* ifslow_pred = clone_loop_predicates(entry, ifslow, !counted_loop); LoopNode* slow_head = old_new[head->_idx]->as_Loop(); - _igvn.hash_delete(slow_head); - slow_head->set_req(LoopNode::EntryControl, ifslow_pred); + _igvn.replace_input_of(slow_head, LoopNode::EntryControl, ifslow_pred); set_idom(slow_head, ifslow_pred, dom_depth(slow_head)); - _igvn._worklist.push(slow_head); recompute_dom_depth(); diff --git a/hotspot/src/share/vm/opto/loopnode.cpp b/hotspot/src/share/vm/opto/loopnode.cpp index 2d045e47d95..afd96045aa7 100644 --- a/hotspot/src/share/vm/opto/loopnode.cpp +++ b/hotspot/src/share/vm/opto/loopnode.cpp @@ -1129,8 +1129,7 @@ void IdealLoopTree::split_fall_in( PhaseIdealLoop *phase, int fall_in_cnt ) { // I'm mid-iteration over the Region's uses. for (DUIterator_Last imin, i = old_phi->last_outs(imin); i >= imin; ) { Node* use = old_phi->last_out(i); - igvn.hash_delete(use); - igvn._worklist.push(use); + igvn.rehash_node_delayed(use); uint uses_found = 0; for (uint j = 0; j < use->len(); j++) { if (use->in(j) == old_phi) { @@ -1186,10 +1185,8 @@ void IdealLoopTree::split_outer_loop( PhaseIdealLoop *phase ) { phi->init_req(LoopNode::LoopBackControl, old_phi->in(outer_idx)); phi = igvn.register_new_node_with_optimizer(phi, old_phi); // Make old Phi point to new Phi on the fall-in path - igvn.hash_delete(old_phi); - old_phi->set_req(LoopNode::EntryControl, phi); + igvn.replace_input_of(old_phi, LoopNode::EntryControl, phi); old_phi->del_req(outer_idx); - igvn._worklist.push(old_phi); } } @@ -1992,9 +1989,7 @@ void PhaseIdealLoop::build_and_optimize(bool do_split_ifs, bool skip_loop_opts) // we do it here. for( uint i = 1; i < C->root()->req(); i++ ) { if( !_nodes[C->root()->in(i)->_idx] ) { // Dead path into Root? - _igvn.hash_delete(C->root()); - C->root()->del_req(i); - _igvn._worklist.push(C->root()); + _igvn.delete_input_of(C->root(), i); i--; // Rerun same iteration on compressed edges } } diff --git a/hotspot/src/share/vm/opto/loopopts.cpp b/hotspot/src/share/vm/opto/loopopts.cpp index e93fb4d088d..ee6c36d22df 100644 --- a/hotspot/src/share/vm/opto/loopopts.cpp +++ b/hotspot/src/share/vm/opto/loopopts.cpp @@ -216,9 +216,7 @@ void PhaseIdealLoop::dominated_by( Node *prevdom, Node *iff, bool flip, bool exc Node *con = _igvn.makecon(pop == Op_IfTrue ? TypeInt::ONE : TypeInt::ZERO); set_ctrl(con, C->root()); // Constant gets a new use // Hack the dominated test - _igvn.hash_delete(iff); - iff->set_req(1, con); - _igvn._worklist.push(iff); + _igvn.replace_input_of(iff, 1, con); // If I dont have a reachable TRUE and FALSE path following the IfNode then // I can assume this path reaches an infinite loop. In this case it's not @@ -245,10 +243,8 @@ void PhaseIdealLoop::dominated_by( Node *prevdom, Node *iff, bool flip, bool exc Node* cd = dp->fast_out(i); // Control-dependent node if (cd->depends_only_on_test()) { assert(cd->in(0) == dp, ""); - _igvn.hash_delete(cd); - cd->set_req(0, prevdom); + _igvn.replace_input_of(cd, 0, prevdom); set_early_ctrl(cd); - _igvn._worklist.push(cd); IdealLoopTree *new_loop = get_loop(get_ctrl(cd)); if (old_loop != new_loop) { if (!old_loop->_child) old_loop->_body.yank(cd); @@ -952,8 +948,7 @@ void PhaseIdealLoop::split_if_with_blocks_post( Node *n ) { if (!n->is_Load() || late_load_ctrl != n_ctrl) { for (DUIterator_Last jmin, j = n->last_outs(jmin); j >= jmin; ) { Node *u = n->last_out(j); // Clone private computation per use - _igvn.hash_delete(u); - _igvn._worklist.push(u); + _igvn.rehash_node_delayed(u); Node *x = n->clone(); // Clone computation Node *x_ctrl = NULL; if( u->is_Phi() ) { @@ -1089,9 +1084,7 @@ BoolNode *PhaseIdealLoop::clone_iff( PhiNode *phi, IdealLoopTree *loop ) { for( i = 1; i < phi->req(); i++ ) { Node *b = phi->in(i); if( b->is_Phi() ) { - _igvn.hash_delete(phi); - _igvn._worklist.push(phi); - phi->set_req(i, clone_iff( b->as_Phi(), loop )); + _igvn.replace_input_of(phi, i, clone_iff( b->as_Phi(), loop )); } else { assert( b->is_Bool(), "" ); } @@ -1161,9 +1154,7 @@ CmpNode *PhaseIdealLoop::clone_bool( PhiNode *phi, IdealLoopTree *loop ) { for( i = 1; i < phi->req(); i++ ) { Node *b = phi->in(i); if( b->is_Phi() ) { - _igvn.hash_delete(phi); - _igvn._worklist.push(phi); - phi->set_req(i, clone_bool( b->as_Phi(), loop )); + _igvn.replace_input_of(phi, i, clone_bool( b->as_Phi(), loop )); } else { assert( b->is_Cmp() || b->is_top(), "inputs are all Cmp or TOP" ); } @@ -1347,8 +1338,7 @@ void PhaseIdealLoop::clone_loop( IdealLoopTree *loop, Node_List &old_new, int dd // The original user of 'use' uses 'r' instead. for (DUIterator_Last lmin, l = use->last_outs(lmin); l >= lmin;) { Node* useuse = use->last_out(l); - _igvn.hash_delete(useuse); - _igvn._worklist.push(useuse); + _igvn.rehash_node_delayed(useuse); uint uses_found = 0; if( useuse->in(0) == use ) { useuse->set_req(0, r); @@ -1435,9 +1425,7 @@ void PhaseIdealLoop::clone_loop( IdealLoopTree *loop, Node_List &old_new, int dd if( use->is_Phi() ) // Phi use is in prior block cfg = prev->in(idx); // NOT in block of Phi itself if (cfg->is_top()) { // Use is dead? - _igvn.hash_delete(use); - _igvn._worklist.push(use); - use->set_req(idx, C->top()); + _igvn.replace_input_of(use, idx, C->top()); continue; } @@ -1487,9 +1475,7 @@ void PhaseIdealLoop::clone_loop( IdealLoopTree *loop, Node_List &old_new, int dd set_ctrl(phi, prev); } // Make 'use' use the Phi instead of the old loop body exit value - _igvn.hash_delete(use); - _igvn._worklist.push(use); - use->set_req(idx, phi); + _igvn.replace_input_of(use, idx, phi); if( use->_idx >= new_counter ) { // If updating new phis // Not needed for correctness, but prevents a weak assert // in AddPNode from tripping (when we end up with different @@ -1517,9 +1503,7 @@ void PhaseIdealLoop::clone_loop( IdealLoopTree *loop, Node_List &old_new, int dd Node *iff = split_if_set->pop(); if( iff->in(1)->is_Phi() ) { BoolNode *b = clone_iff( iff->in(1)->as_Phi(), loop ); - _igvn.hash_delete(iff); - _igvn._worklist.push(iff); - iff->set_req(1, b); + _igvn.replace_input_of(iff, 1, b); } } } @@ -1529,9 +1513,7 @@ void PhaseIdealLoop::clone_loop( IdealLoopTree *loop, Node_List &old_new, int dd Node *phi = b->in(1); assert( phi->is_Phi(), "" ); CmpNode *cmp = clone_bool( (PhiNode*)phi, loop ); - _igvn.hash_delete(b); - _igvn._worklist.push(b); - b->set_req(1, cmp); + _igvn.replace_input_of(b, 1, cmp); } } if( split_cex_set ) { @@ -1686,10 +1668,8 @@ ProjNode* PhaseIdealLoop::insert_if_before_proj(Node* left, bool Signed, BoolTes ProjNode *other_proj = iff->proj_out(!proj->is_IfTrue())->as_Proj(); int ddepth = dom_depth(proj); - _igvn.hash_delete(iff); - _igvn._worklist.push(iff); - _igvn.hash_delete(proj); - _igvn._worklist.push(proj); + _igvn.rehash_node_delayed(iff); + _igvn.rehash_node_delayed(proj); proj->set_req(0, NULL); // temporary disconnect ProjNode* proj2 = proj_clone(proj, iff); @@ -1745,10 +1725,8 @@ RegionNode* PhaseIdealLoop::insert_region_before_proj(ProjNode* proj) { ProjNode *other_proj = iff->proj_out(!proj->is_IfTrue())->as_Proj(); int ddepth = dom_depth(proj); - _igvn.hash_delete(iff); - _igvn._worklist.push(iff); - _igvn.hash_delete(proj); - _igvn._worklist.push(proj); + _igvn.rehash_node_delayed(iff); + _igvn.rehash_node_delayed(proj); proj->set_req(0, NULL); // temporary disconnect ProjNode* proj2 = proj_clone(proj, iff); @@ -1970,9 +1948,7 @@ void PhaseIdealLoop::clone_for_use_outside_loop( IdealLoopTree *loop, Node* n, N // clone "n" and insert it between the inputs of "n" and the use outside the loop Node* n_clone = n->clone(); - _igvn.hash_delete(use); - use->set_req(j, n_clone); - _igvn._worklist.push(use); + _igvn.replace_input_of(use, j, n_clone); Node* use_c; if (!use->is_Phi()) { use_c = has_ctrl(use) ? get_ctrl(use) : use->in(0); @@ -2028,8 +2004,7 @@ void PhaseIdealLoop::clone_for_special_use_inside_loop( IdealLoopTree *loop, Nod #endif while( worklist.size() ) { Node *use = worklist.pop(); - _igvn.hash_delete(use); - _igvn._worklist.push(use); + _igvn.rehash_node_delayed(use); for (uint j = 1; j < use->req(); j++) { if (use->in(j) == n) { use->set_req(j, n_clone); @@ -2055,9 +2030,7 @@ void PhaseIdealLoop::insert_phi_for_loop( Node* use, uint idx, Node* lp_entry_va _igvn.remove_dead_node(phi); phi = hit; } - _igvn.hash_delete(use); - _igvn._worklist.push(use); - use->set_req(idx, phi); + _igvn.replace_input_of(use, idx, phi); } #ifdef ASSERT @@ -2630,9 +2603,7 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) { // use is in loop if (old_new[use->_idx] != NULL) { // null for dead code Node* use_clone = old_new[use->_idx]; - _igvn.hash_delete(use); - use->set_req(j, C->top()); - _igvn._worklist.push(use); + _igvn.replace_input_of(use, j, C->top()); insert_phi_for_loop( use_clone, j, old_new[def->_idx], def, new_head_clone ); } } else { @@ -2667,46 +2638,35 @@ bool PhaseIdealLoop::partial_peel( IdealLoopTree *loop, Node_List &old_new ) { if (!n->is_CFG() && n->in(0) != NULL && not_peel.test(n->_idx) && peel.test(n->in(0)->_idx)) { Node* n_clone = old_new[n->_idx]; - _igvn.hash_delete(n_clone); - n_clone->set_req(0, new_head_clone); - _igvn._worklist.push(n_clone); + _igvn.replace_input_of(n_clone, 0, new_head_clone); } } // Backedge of the surviving new_head (the clone) is original last_peel - _igvn.hash_delete(new_head_clone); - new_head_clone->set_req(LoopNode::LoopBackControl, last_peel); - _igvn._worklist.push(new_head_clone); + _igvn.replace_input_of(new_head_clone, LoopNode::LoopBackControl, last_peel); // Cut first node in original not_peel set - _igvn.hash_delete(new_head); - new_head->set_req(LoopNode::EntryControl, C->top()); - new_head->set_req(LoopNode::LoopBackControl, C->top()); - _igvn._worklist.push(new_head); + _igvn.rehash_node_delayed(new_head); // Multiple edge updates: + new_head->set_req(LoopNode::EntryControl, C->top()); // use rehash_node_delayed / set_req instead of + new_head->set_req(LoopNode::LoopBackControl, C->top()); // multiple replace_input_of calls // Copy head_clone back-branch info to original head // and remove original head's loop entry and // clone head's back-branch - _igvn.hash_delete(head); - _igvn.hash_delete(head_clone); - head->set_req(LoopNode::EntryControl, head_clone->in(LoopNode::LoopBackControl)); + _igvn.rehash_node_delayed(head); // Multiple edge updates + head->set_req(LoopNode::EntryControl, head_clone->in(LoopNode::LoopBackControl)); head->set_req(LoopNode::LoopBackControl, C->top()); - head_clone->set_req(LoopNode::LoopBackControl, C->top()); - _igvn._worklist.push(head); - _igvn._worklist.push(head_clone); + _igvn.replace_input_of(head_clone, LoopNode::LoopBackControl, C->top()); // Similarly modify the phis for (DUIterator_Fast kmax, k = head->fast_outs(kmax); k < kmax; k++) { Node* use = head->fast_out(k); if (use->is_Phi() && use->outcnt() > 0) { Node* use_clone = old_new[use->_idx]; - _igvn.hash_delete(use); - _igvn.hash_delete(use_clone); - use->set_req(LoopNode::EntryControl, use_clone->in(LoopNode::LoopBackControl)); + _igvn.rehash_node_delayed(use); // Multiple edge updates + use->set_req(LoopNode::EntryControl, use_clone->in(LoopNode::LoopBackControl)); use->set_req(LoopNode::LoopBackControl, C->top()); - use_clone->set_req(LoopNode::LoopBackControl, C->top()); - _igvn._worklist.push(use); - _igvn._worklist.push(use_clone); + _igvn.replace_input_of(use_clone, LoopNode::LoopBackControl, C->top()); } } @@ -2792,8 +2752,7 @@ void PhaseIdealLoop::reorg_offsets(IdealLoopTree *loop) { set_ctrl(neg_stride, C->root()); Node *post = new (C, 3) AddINode( opaq, neg_stride); register_new_node( post, u_ctrl ); - _igvn.hash_delete(use); - _igvn._worklist.push(use); + _igvn.rehash_node_delayed(use); for (uint j = 1; j < use->req(); j++) { if (use->in(j) == phi) use->set_req(j, post); diff --git a/hotspot/src/share/vm/opto/macro.cpp b/hotspot/src/share/vm/opto/macro.cpp index 11416ac4758..b4d54f7e9af 100644 --- a/hotspot/src/share/vm/opto/macro.cpp +++ b/hotspot/src/share/vm/opto/macro.cpp @@ -1447,9 +1447,8 @@ void PhaseMacroExpand::expand_allocate_common( if (!always_slow && _memproj_fallthrough != NULL) { for (DUIterator_Fast imax, i = _memproj_fallthrough->fast_outs(imax); i < imax; i++) { Node *use = _memproj_fallthrough->fast_out(i); - _igvn.hash_delete(use); + _igvn.rehash_node_delayed(use); imax -= replace_input(use, _memproj_fallthrough, result_phi_rawmem); - _igvn._worklist.push(use); // back up iterator --i; } @@ -1463,9 +1462,8 @@ void PhaseMacroExpand::expand_allocate_common( } for (DUIterator_Fast imax, i = _memproj_catchall->fast_outs(imax); i < imax; i++) { Node *use = _memproj_catchall->fast_out(i); - _igvn.hash_delete(use); + _igvn.rehash_node_delayed(use); imax -= replace_input(use, _memproj_catchall, _memproj_fallthrough); - _igvn._worklist.push(use); // back up iterator --i; } @@ -1481,9 +1479,8 @@ void PhaseMacroExpand::expand_allocate_common( if (_ioproj_fallthrough != NULL) { for (DUIterator_Fast imax, i = _ioproj_fallthrough->fast_outs(imax); i < imax; i++) { Node *use = _ioproj_fallthrough->fast_out(i); - _igvn.hash_delete(use); + _igvn.rehash_node_delayed(use); imax -= replace_input(use, _ioproj_fallthrough, result_phi_i_o); - _igvn._worklist.push(use); // back up iterator --i; } @@ -1497,9 +1494,8 @@ void PhaseMacroExpand::expand_allocate_common( } for (DUIterator_Fast imax, i = _ioproj_catchall->fast_outs(imax); i < imax; i++) { Node *use = _ioproj_catchall->fast_out(i); - _igvn.hash_delete(use); + _igvn.rehash_node_delayed(use); imax -= replace_input(use, _ioproj_catchall, _ioproj_fallthrough); - _igvn._worklist.push(use); // back up iterator --i; } @@ -1857,18 +1853,16 @@ void PhaseMacroExpand::mark_eliminated_box(Node* oldbox, Node* obj) { if (alock->box_node() == oldbox && alock->obj_node()->eqv_uncast(obj)) { // Replace Box and mark eliminated all related locks and unlocks. alock->set_non_esc_obj(); - _igvn.hash_delete(alock); + _igvn.rehash_node_delayed(alock); alock->set_box_node(newbox); - _igvn._worklist.push(alock); next_edge = false; } } if (u->is_FastLock() && u->as_FastLock()->obj_node()->eqv_uncast(obj)) { FastLockNode* flock = u->as_FastLock(); assert(flock->box_node() == oldbox, "sanity"); - _igvn.hash_delete(flock); + _igvn.rehash_node_delayed(flock); flock->set_box_node(newbox); - _igvn._worklist.push(flock); next_edge = false; } @@ -1886,9 +1880,7 @@ void PhaseMacroExpand::mark_eliminated_box(Node* oldbox, Node* obj) { Node* box_node = sfn->monitor_box(jvms, idx); if (box_node == oldbox && obj_node->eqv_uncast(obj)) { int j = jvms->monitor_box_offset(idx); - _igvn.hash_delete(u); - u->set_req(j, newbox); - _igvn._worklist.push(u); + _igvn.replace_input_of(u, j, newbox); next_edge = false; } } diff --git a/hotspot/src/share/vm/opto/memnode.cpp b/hotspot/src/share/vm/opto/memnode.cpp index 8c40e9c0fe2..e28e09226ad 100644 --- a/hotspot/src/share/vm/opto/memnode.cpp +++ b/hotspot/src/share/vm/opto/memnode.cpp @@ -717,6 +717,22 @@ Node *MemNode::Ideal_common_DU_postCCP( PhaseCCP *ccp, Node* n, Node* adr ) { adr = adr->in(1); continue; + case Op_EncodeP: + // EncodeP node's control edge could be set by this method + // when EncodeP node depends on CastPP node. + // + // Use its control edge for memory op because EncodeP may go away + // later when it is folded with following or preceding DecodeN node. + if (adr->in(0) == NULL) { + // Keep looking for cast nodes. + adr = adr->in(1); + continue; + } + ccp->hash_delete(n); + n->set_req(MemNode::Control, adr->in(0)); + ccp->hash_insert(n); + return n; + case Op_CastPP: // If the CastPP is useless, just peek on through it. if( ccp->type(adr) == ccp->type(adr->in(1)) ) { diff --git a/hotspot/src/share/vm/opto/memnode.hpp b/hotspot/src/share/vm/opto/memnode.hpp index 36623a87a6d..f79f615d18f 100644 --- a/hotspot/src/share/vm/opto/memnode.hpp +++ b/hotspot/src/share/vm/opto/memnode.hpp @@ -636,17 +636,6 @@ public: virtual bool depends_only_on_test() const { return true; } }; -//------------------------------LoadLLockedNode--------------------------------- -// Load-locked a pointer from memory (either object or array). -// On Sparc & Intel this is implemented as a normal long load. -class LoadLLockedNode : public LoadLNode { -public: - LoadLLockedNode( Node *c, Node *mem, Node *adr ) - : LoadLNode(c,mem,adr,TypeRawPtr::BOTTOM, TypeLong::LONG) {} - virtual int Opcode() const; - virtual int store_Opcode() const { return Op_StoreLConditional; } -}; - //------------------------------SCMemProjNode--------------------------------------- // This class defines a projection of the memory state of a store conditional node. // These nodes return a value, but also update memory. diff --git a/hotspot/src/share/vm/opto/parse.hpp b/hotspot/src/share/vm/opto/parse.hpp index ec9a08358c5..d05ed9b9b60 100644 --- a/hotspot/src/share/vm/opto/parse.hpp +++ b/hotspot/src/share/vm/opto/parse.hpp @@ -527,6 +527,9 @@ class Parse : public GraphKit { int repush_if_args(); void adjust_map_after_if(BoolTest::mask btest, Node* c, float prob, Block* path, Block* other_path); + void sharpen_type_after_if(BoolTest::mask btest, + Node* con, const Type* tcon, + Node* val, const Type* tval); IfNode* jump_if_fork_int(Node* a, Node* b, BoolTest::mask mask); Node* jump_if_join(Node* iffalse, Node* iftrue); void jump_if_true_fork(IfNode *ifNode, int dest_bci_if_true, int prof_table_index); diff --git a/hotspot/src/share/vm/opto/parse2.cpp b/hotspot/src/share/vm/opto/parse2.cpp index 5e8007da298..541f26dd537 100644 --- a/hotspot/src/share/vm/opto/parse2.cpp +++ b/hotspot/src/share/vm/opto/parse2.cpp @@ -1233,6 +1233,71 @@ void Parse::adjust_map_after_if(BoolTest::mask btest, Node* c, float prob, if (!have_con) // remaining adjustments need a con return; + sharpen_type_after_if(btest, con, tcon, val, tval); +} + + +static Node* extract_obj_from_klass_load(PhaseGVN* gvn, Node* n) { + Node* ldk; + if (n->is_DecodeN()) { + if (n->in(1)->Opcode() != Op_LoadNKlass) { + return NULL; + } else { + ldk = n->in(1); + } + } else if (n->Opcode() != Op_LoadKlass) { + return NULL; + } else { + ldk = n; + } + assert(ldk != NULL && ldk->is_Load(), "should have found a LoadKlass or LoadNKlass node"); + + Node* adr = ldk->in(MemNode::Address); + intptr_t off = 0; + Node* obj = AddPNode::Ideal_base_and_offset(adr, gvn, off); + if (obj == NULL || off != oopDesc::klass_offset_in_bytes()) // loading oopDesc::_klass? + return NULL; + const TypePtr* tp = gvn->type(obj)->is_ptr(); + if (tp == NULL || !(tp->isa_instptr() || tp->isa_aryptr())) // is obj a Java object ptr? + return NULL; + + return obj; +} + +void Parse::sharpen_type_after_if(BoolTest::mask btest, + Node* con, const Type* tcon, + Node* val, const Type* tval) { + // Look for opportunities to sharpen the type of a node + // whose klass is compared with a constant klass. + if (btest == BoolTest::eq && tcon->isa_klassptr()) { + Node* obj = extract_obj_from_klass_load(&_gvn, val); + const TypeOopPtr* con_type = tcon->isa_klassptr()->as_instance_type(); + if (obj != NULL && (con_type->isa_instptr() || con_type->isa_aryptr())) { + // Found: + // Bool(CmpP(LoadKlass(obj._klass), ConP(Foo.klass)), [eq]) + // or the narrowOop equivalent. + const Type* obj_type = _gvn.type(obj); + const TypeOopPtr* tboth = obj_type->join(con_type)->isa_oopptr(); + if (tboth != NULL && tboth != obj_type && tboth->higher_equal(obj_type)) { + // obj has to be of the exact type Foo if the CmpP succeeds. + assert(tboth->klass_is_exact(), "klass should be exact"); + int obj_in_map = map()->find_edge(obj); + JVMState* jvms = this->jvms(); + if (obj_in_map >= 0 && + (jvms->is_loc(obj_in_map) || jvms->is_stk(obj_in_map))) { + TypeNode* ccast = new (C, 2) CheckCastPPNode(control(), obj, tboth); + const Type* tcc = ccast->as_Type()->type(); + assert(tcc != obj_type && tcc->higher_equal(obj_type), "must improve"); + // Delay transform() call to allow recovery of pre-cast value + // at the control merge. + _gvn.set_type_bottom(ccast); + record_for_igvn(ccast); + // Here's the payoff. + replace_in_map(obj, ccast); + } + } + } + } int val_in_map = map()->find_edge(val); if (val_in_map < 0) return; // replace_in_map would be useless @@ -1265,6 +1330,7 @@ void Parse::adjust_map_after_if(BoolTest::mask btest, Node* c, float prob, // Exclude tests vs float/double 0 as these could be // either +0 or -0. Just because you are equal to +0 // doesn't mean you ARE +0! + // Note, following code also replaces Long and Oop values. if ((!tf || tf->_f != 0.0) && (!td || td->_d != 0.0)) cast = con; // Replace non-constant val by con. diff --git a/hotspot/src/share/vm/opto/phaseX.hpp b/hotspot/src/share/vm/opto/phaseX.hpp index ef5bbb55fc3..1affa5c15b6 100644 --- a/hotspot/src/share/vm/opto/phaseX.hpp +++ b/hotspot/src/share/vm/opto/phaseX.hpp @@ -460,6 +460,25 @@ public: subsume_node(old, nn); } + // Delayed node rehash: remove a node from the hash table and rehash it during + // next optimizing pass + void rehash_node_delayed(Node* n) { + hash_delete(n); + _worklist.push(n); + } + + // Replace ith edge of "n" with "in" + void replace_input_of(Node* n, int i, Node* in) { + rehash_node_delayed(n); + n->set_req(i, in); + } + + // Delete ith edge of "n" + void delete_input_of(Node* n, int i) { + rehash_node_delayed(n); + n->del_req(i); + } + bool delay_transform() const { return _delay_transform; } void set_delay_transform(bool delay) { diff --git a/hotspot/src/share/vm/opto/split_if.cpp b/hotspot/src/share/vm/opto/split_if.cpp index 55de3d70ef8..bd5eec94215 100644 --- a/hotspot/src/share/vm/opto/split_if.cpp +++ b/hotspot/src/share/vm/opto/split_if.cpp @@ -137,9 +137,7 @@ bool PhaseIdealLoop::split_up( Node *n, Node *blk1, Node *blk2 ) { Node *iff_ctrl = iff->is_If() ? iff->in(0) : get_ctrl(iff); Node *x = bol->clone(); register_new_node(x, iff_ctrl); - _igvn.hash_delete(iff); - iff->set_req(1, x); - _igvn._worklist.push(iff); + _igvn.replace_input_of(iff, 1, x); } _igvn.remove_dead_node( bol ); --i; @@ -151,9 +149,7 @@ bool PhaseIdealLoop::split_up( Node *n, Node *blk1, Node *blk2 ) { assert( bol->in(1) == n, "" ); Node *x = n->clone(); register_new_node(x, get_ctrl(bol)); - _igvn.hash_delete(bol); - bol->set_req(1, x); - _igvn._worklist.push(bol); + _igvn.replace_input_of(bol, 1, x); } _igvn.remove_dead_node( n ); @@ -387,9 +383,7 @@ void PhaseIdealLoop::handle_use( Node *use, Node *def, small_cache *cache, Node if( use->in(i) == def ) break; assert( i < use->req(), "def should be among use's inputs" ); - _igvn.hash_delete(use); - use->set_req(i, new_def); - _igvn._worklist.push(use); + _igvn.replace_input_of(use, i, new_def); } //------------------------------do_split_if------------------------------------ diff --git a/hotspot/src/share/vm/opto/subnode.cpp b/hotspot/src/share/vm/opto/subnode.cpp index 73eede48d03..4fbf5435394 100644 --- a/hotspot/src/share/vm/opto/subnode.cpp +++ b/hotspot/src/share/vm/opto/subnode.cpp @@ -702,12 +702,84 @@ const Type *CmpPNode::sub( const Type *t1, const Type *t2 ) const { return TypeInt::CC; } +static inline Node* isa_java_mirror_load(PhaseGVN* phase, Node* n) { + // Return the klass node for + // LoadP(AddP(foo:Klass, #java_mirror)) + // or NULL if not matching. + if (n->Opcode() != Op_LoadP) return NULL; + + const TypeInstPtr* tp = phase->type(n)->isa_instptr(); + if (!tp || tp->klass() != phase->C->env()->Class_klass()) return NULL; + + Node* adr = n->in(MemNode::Address); + intptr_t off = 0; + Node* k = AddPNode::Ideal_base_and_offset(adr, phase, off); + if (k == NULL) return NULL; + const TypeKlassPtr* tkp = phase->type(k)->isa_klassptr(); + if (!tkp || off != in_bytes(Klass::java_mirror_offset())) return NULL; + + // We've found the klass node of a Java mirror load. + return k; +} + +static inline Node* isa_const_java_mirror(PhaseGVN* phase, Node* n) { + // for ConP(Foo.class) return ConP(Foo.klass) + // otherwise return NULL + if (!n->is_Con()) return NULL; + + const TypeInstPtr* tp = phase->type(n)->isa_instptr(); + if (!tp) return NULL; + + ciType* mirror_type = tp->java_mirror_type(); + // TypeInstPtr::java_mirror_type() returns non-NULL for compile- + // time Class constants only. + if (!mirror_type) return NULL; + + // x.getClass() == int.class can never be true (for all primitive types) + // Return a ConP(NULL) node for this case. + if (mirror_type->is_classless()) { + return phase->makecon(TypePtr::NULL_PTR); + } + + // return the ConP(Foo.klass) + assert(mirror_type->is_klass(), "mirror_type should represent a klassOop"); + return phase->makecon(TypeKlassPtr::make(mirror_type->as_klass())); +} + //------------------------------Ideal------------------------------------------ -// Check for the case of comparing an unknown klass loaded from the primary +// Normalize comparisons between Java mirror loads to compare the klass instead. +// +// Also check for the case of comparing an unknown klass loaded from the primary // super-type array vs a known klass with no subtypes. This amounts to // checking to see an unknown klass subtypes a known klass with no subtypes; // this only happens on an exact match. We can shorten this test by 1 load. Node *CmpPNode::Ideal( PhaseGVN *phase, bool can_reshape ) { + // Normalize comparisons between Java mirrors into comparisons of the low- + // level klass, where a dependent load could be shortened. + // + // The new pattern has a nice effect of matching the same pattern used in the + // fast path of instanceof/checkcast/Class.isInstance(), which allows + // redundant exact type check be optimized away by GVN. + // For example, in + // if (x.getClass() == Foo.class) { + // Foo foo = (Foo) x; + // // ... use a ... + // } + // a CmpPNode could be shared between if_acmpne and checkcast + { + Node* k1 = isa_java_mirror_load(phase, in(1)); + Node* k2 = isa_java_mirror_load(phase, in(2)); + Node* conk2 = isa_const_java_mirror(phase, in(2)); + + if (k1 && (k2 || conk2)) { + Node* lhs = k1; + Node* rhs = (k2 != NULL) ? k2 : conk2; + this->set_req(1, lhs); + this->set_req(2, rhs); + return this; + } + } + // Constant pointer on right? const TypeKlassPtr* t2 = phase->type(in(2))->isa_klassptr(); if (t2 == NULL || !t2->klass_is_exact()) diff --git a/hotspot/src/share/vm/opto/superword.cpp b/hotspot/src/share/vm/opto/superword.cpp index 28c4cfe4153..ae46e7f17c8 100644 --- a/hotspot/src/share/vm/opto/superword.cpp +++ b/hotspot/src/share/vm/opto/superword.cpp @@ -944,7 +944,7 @@ void SuperWord::schedule() { void SuperWord::remove_and_insert(MemNode *current, MemNode *prev, MemNode *lip, Node *uip, Unique_Node_List &sched_before) { Node* my_mem = current->in(MemNode::Memory); - _igvn.hash_delete(current); + _igvn.rehash_node_delayed(current); _igvn.hash_delete(my_mem); //remove current_store from its current position in the memmory graph @@ -952,7 +952,7 @@ void SuperWord::remove_and_insert(MemNode *current, MemNode *prev, MemNode *lip, Node* use = current->out(i); if (use->is_Mem()) { assert(use->in(MemNode::Memory) == current, "must be"); - _igvn.hash_delete(use); + _igvn.rehash_node_delayed(use); if (use == prev) { // connect prev to my_mem use->set_req(MemNode::Memory, my_mem); } else if (sched_before.member(use)) { @@ -962,7 +962,6 @@ void SuperWord::remove_and_insert(MemNode *current, MemNode *prev, MemNode *lip, _igvn.hash_delete(lip); use->set_req(MemNode::Memory, lip); } - _igvn._worklist.push(use); --i; //deleted this edge; rescan position } } @@ -976,25 +975,20 @@ void SuperWord::remove_and_insert(MemNode *current, MemNode *prev, MemNode *lip, Node* use = insert_pt->out(i); if (use->is_Mem()) { assert(use->in(MemNode::Memory) == insert_pt, "must be"); - _igvn.hash_delete(use); - use->set_req(MemNode::Memory, current); - _igvn._worklist.push(use); + _igvn.replace_input_of(use, MemNode::Memory, current); --i; //deleted this edge; rescan position } else if (!sched_up && use->is_Phi() && use->bottom_type() == Type::MEMORY) { uint pos; //lip (lower insert point) must be the last one in the memory slice - _igvn.hash_delete(use); for (pos=1; pos < use->req(); pos++) { if (use->in(pos) == insert_pt) break; } - use->set_req(pos, current); - _igvn._worklist.push(use); + _igvn.replace_input_of(use, pos, current); --i; } } //connect current to insert_pt current->set_req(MemNode::Memory, insert_pt); - _igvn._worklist.push(current); } //------------------------------co_locate_pack---------------------------------- @@ -1077,15 +1071,13 @@ void SuperWord::co_locate_pack(Node_List* pk) { Node* use = current->out(i); if (use->is_Mem() && use != previous) { assert(use->in(MemNode::Memory) == current, "must be"); - _igvn.hash_delete(use); if (schedule_before_pack.member(use)) { _igvn.hash_delete(upper_insert_pt); - use->set_req(MemNode::Memory, upper_insert_pt); + _igvn.replace_input_of(use, MemNode::Memory, upper_insert_pt); } else { _igvn.hash_delete(lower_insert_pt); - use->set_req(MemNode::Memory, lower_insert_pt); + _igvn.replace_input_of(use, MemNode::Memory, lower_insert_pt); } - _igvn._worklist.push(use); --i; // deleted this edge; rescan position } } @@ -1122,9 +1114,7 @@ void SuperWord::co_locate_pack(Node_List* pk) { // Give each load the same memory state for (uint i = 0; i < pk->size(); i++) { LoadNode* ld = pk->at(i)->as_Load(); - _igvn.hash_delete(ld); - ld->set_req(MemNode::Memory, mem_input); - _igvn._worklist.push(ld); + _igvn.replace_input_of(ld, MemNode::Memory, mem_input); } } } @@ -1282,16 +1272,14 @@ void SuperWord::insert_extracts(Node_List* p) { // Insert extract operation _igvn.hash_delete(def); - _igvn.hash_delete(use); int def_pos = alignment(def) / data_size(def); const Type* def_t = velt_type(def); Node* ex = ExtractNode::make(_phase->C, def, def_pos, def_t); _phase->_igvn.register_new_node_with_optimizer(ex); _phase->set_ctrl(ex, _phase->get_ctrl(def)); - use->set_req(idx, ex); + _igvn.replace_input_of(use, idx, ex); _igvn._worklist.push(def); - _igvn._worklist.push(use); bb_insert_after(ex, bb_idx(def)); set_velt_type(ex, def_t); diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp index 833f6f1810c..b37f44a9120 100644 --- a/hotspot/src/share/vm/prims/jni.cpp +++ b/hotspot/src/share/vm/prims/jni.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -378,6 +378,7 @@ JNI_ENTRY(jclass, jni_DefineClass(JNIEnv *env, const char *name, jobject loaderR jclass cls = NULL; DT_RETURN_MARK(DefineClass, jclass, (const jclass&)cls); + TempNewSymbol class_name = NULL; // Since exceptions can be thrown, class initialization can take place // if name is NULL no check for class name in .class stream has to be made. if (name != NULL) { @@ -387,9 +388,8 @@ JNI_ENTRY(jclass, jni_DefineClass(JNIEnv *env, const char *name, jobject loaderR // into the constant pool. THROW_MSG_0(vmSymbols::java_lang_NoClassDefFoundError(), name); } + class_name = SymbolTable::new_symbol(name, CHECK_NULL); } - TempNewSymbol class_name = SymbolTable::new_symbol(name, THREAD); - ResourceMark rm(THREAD); ClassFileStream st((u1*) buf, bufLen, NULL); Handle class_loader (THREAD, JNIHandles::resolve(loaderRef)); diff --git a/hotspot/src/share/vm/prims/jvm.h b/hotspot/src/share/vm/prims/jvm.h index a9b322c2ce1..a514f374a6f 100644 --- a/hotspot/src/share/vm/prims/jvm.h +++ b/hotspot/src/share/vm/prims/jvm.h @@ -634,7 +634,7 @@ JNIEXPORT jobject JNICALL JVM_AssertionStatusDirectives(JNIEnv *env, jclass unused); /* - * sun.misc.AtomicLong + * java.util.concurrent.atomic.AtomicLong */ JNIEXPORT jboolean JNICALL JVM_SupportsCX8(void); diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp index 1838252c37b..758f0983163 100644 --- a/hotspot/src/share/vm/runtime/globals.hpp +++ b/hotspot/src/share/vm/runtime/globals.hpp @@ -631,9 +631,6 @@ class CommandLineFlags { develop(bool, InlineClassNatives, true, \ "inline Class.isInstance, etc") \ \ - develop(bool, InlineAtomicLong, true, \ - "inline sun.misc.AtomicLong") \ - \ develop(bool, InlineThreadNatives, true, \ "inline Thread.currentThread, etc") \ \ diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp index 921945a9532..7045fa8b3ce 100644 --- a/hotspot/src/share/vm/runtime/vmStructs.cpp +++ b/hotspot/src/share/vm/runtime/vmStructs.cpp @@ -358,7 +358,6 @@ static inline uint64_t cast_uint64_t(size_t x) nonstatic_field(methodDataOopDesc, _arg_stack, intx) \ nonstatic_field(methodDataOopDesc, _arg_returned, intx) \ nonstatic_field(methodOopDesc, _constMethod, constMethodOop) \ - nonstatic_field(methodOopDesc, _constants, constantPoolOop) \ nonstatic_field(methodOopDesc, _method_data, methodDataOop) \ nonstatic_field(methodOopDesc, _interpreter_invocation_count, int) \ nonstatic_field(methodOopDesc, _access_flags, AccessFlags) \ @@ -378,7 +377,7 @@ static inline uint64_t cast_uint64_t(size_t x) volatile_nonstatic_field(methodOopDesc, _from_compiled_entry, address) \ volatile_nonstatic_field(methodOopDesc, _from_interpreted_entry, address) \ volatile_nonstatic_field(constMethodOopDesc, _fingerprint, uint64_t) \ - nonstatic_field(constMethodOopDesc, _method, methodOop) \ + nonstatic_field(constMethodOopDesc, _constants, constantPoolOop) \ nonstatic_field(constMethodOopDesc, _stackmap_data, typeArrayOop) \ nonstatic_field(constMethodOopDesc, _exception_table, typeArrayOop) \ nonstatic_field(constMethodOopDesc, _constMethod_size, int) \ @@ -1876,7 +1875,6 @@ static inline uint64_t cast_uint64_t(size_t x) declare_c2_type(StoreNNode, StoreNode) \ declare_c2_type(StoreCMNode, StoreNode) \ declare_c2_type(LoadPLockedNode, LoadPNode) \ - declare_c2_type(LoadLLockedNode, LoadLNode) \ declare_c2_type(SCMemProjNode, ProjNode) \ declare_c2_type(LoadStoreNode, Node) \ declare_c2_type(StorePConditionalNode, LoadStoreNode) \ diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp index 60ebb118ee9..22e99cb3da8 100644 --- a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp +++ b/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp @@ -220,9 +220,15 @@ inline int vsnprintf(char* buf, size_t count, const char* fmt, va_list argptr) { #define PRIu64 "I64u" #define PRIx64 "I64x" +#ifdef _LP64 +#define PRIdPTR "I64d" +#define PRIuPTR "I64u" +#define PRIxPTR "I64x" +#else #define PRIdPTR "d" #define PRIuPTR "u" #define PRIxPTR "x" +#endif #define offset_of(klass,field) offsetof(klass,field) diff --git a/hotspot/test/compiler/6732154/Test6732154.java b/hotspot/test/compiler/6732154/Test6732154.java new file mode 100644 index 00000000000..3618f678455 --- /dev/null +++ b/hotspot/test/compiler/6732154/Test6732154.java @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/** + * @test + * @bug 6732154 + * @summary REG: Printing an Image using image/gif doc flavor crashes the VM, Solsparc + * + * @run main/othervm -Xcomp -XX:CompileOnly="Test6732154::ascii85Encode" Test6732154 + */ +public class Test6732154 { + + // Exact copy of sun.print.PSPrinterJob.ascii85Encode([b)[b + private byte[] ascii85Encode(byte[] inArr) { + byte[] outArr = new byte[((inArr.length+4) * 5 / 4) + 2]; + long p1 = 85; + long p2 = p1*p1; + long p3 = p1*p2; + long p4 = p1*p3; + byte pling = '!'; + + int i = 0; + int olen = 0; + long val, rem; + + while (i+3 < inArr.length) { + val = ((long)((inArr[i++]&0xff))<<24) + + ((long)((inArr[i++]&0xff))<<16) + + ((long)((inArr[i++]&0xff))<< 8) + + ((long)(inArr[i++]&0xff)); + if (val == 0) { + outArr[olen++] = 'z'; + } else { + rem = val; + outArr[olen++] = (byte)(rem / p4 + pling); rem = rem % p4; + outArr[olen++] = (byte)(rem / p3 + pling); rem = rem % p3; + outArr[olen++] = (byte)(rem / p2 + pling); rem = rem % p2; + outArr[olen++] = (byte)(rem / p1 + pling); rem = rem % p1; + outArr[olen++] = (byte)(rem + pling); + } + } + // input not a multiple of 4 bytes, write partial output. + if (i < inArr.length) { + int n = inArr.length - i; // n bytes remain to be written + + val = 0; + while (i < inArr.length) { + val = (val << 8) + (inArr[i++]&0xff); + } + + int append = 4 - n; + while (append-- > 0) { + val = val << 8; + } + byte []c = new byte[5]; + rem = val; + c[0] = (byte)(rem / p4 + pling); rem = rem % p4; + c[1] = (byte)(rem / p3 + pling); rem = rem % p3; + c[2] = (byte)(rem / p2 + pling); rem = rem % p2; + c[3] = (byte)(rem / p1 + pling); rem = rem % p1; + c[4] = (byte)(rem + pling); + + for (int b = 0; b < n+1 ; b++) { + outArr[olen++] = c[b]; + } + } + + // write EOD marker. + outArr[olen++]='~'; outArr[olen++]='>'; + + /* The original intention was to insert a newline after every 78 bytes. + * This was mainly intended for legibility but I decided against this + * partially because of the (small) amount of extra space, and + * partially because for line breaks either would have to hardwire + * ascii 10 (newline) or calculate space in bytes to allocate for + * the platform's newline byte sequence. Also need to be careful + * about where its inserted: + * Ascii 85 decoder ignores white space except for one special case: + * you must ensure you do not split the EOD marker across lines. + */ + byte[] retArr = new byte[olen]; + System.arraycopy(outArr, 0, retArr, 0, olen); + return retArr; + } + + public static void main(String[] args) { + new Test6732154().ascii85Encode(new byte[0]); + System.out.println("Test passed."); + } +} diff --git a/langtools/test/tools/javac/diags/examples/FullInstSig.java b/hotspot/test/compiler/7169782/Test7169782.java similarity index 67% rename from langtools/test/tools/javac/diags/examples/FullInstSig.java rename to hotspot/test/compiler/7169782/Test7169782.java index fc0d642b278..381c4c903fb 100644 --- a/langtools/test/tools/javac/diags/examples/FullInstSig.java +++ b/hotspot/test/compiler/7169782/Test7169782.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -19,16 +19,25 @@ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. + * */ -// key: compiler.misc.applicable.method.found.1 -// key: compiler.note.verbose.resolve.multi -// key: compiler.misc.full.inst.sig -// options: -XDverboseResolution=applicable,success +/** + * @test + * @bug 7169782 + * @summary C2: SIGSEGV in LShiftLNode::Ideal(PhaseGVN*, bool) + * + * @run main/othervm -Xcomp -XX:CompileOnly="Test7169782::" Test7169782 + */ -class FullInstSig { +public class Test7169782 { + static long var_8; - void m(X x) {} + static { + var_8 /= (long)(1E100 + ("".startsWith("a", 0) ? 1 : 2)); + } - { m(1); } + public static void main(String[] args) { + System.out.println("Test passed."); + } } diff --git a/jaxp/.hgtags b/jaxp/.hgtags index e7bf7362fd7..f6225f6671b 100644 --- a/jaxp/.hgtags +++ b/jaxp/.hgtags @@ -163,3 +163,5 @@ cfd288fe1d3e2b700838342e70d71d44ac991af5 jdk8-b36 f95fdbe525c88ef0d57dc1390be6582a8af5e07c jdk8-b39 9ecfdbd6aed4702674eaede2023b4a19513d6b36 jdk8-b40 6f5c0e17415de7a9c74900ef4ba12f47accdf88b jdk8-b41 +39ee03c1602155ff02e5feb6cd44869452f24cf7 jdk8-b42 +eff4ece9c8bc43b3ce2b3758574c4c20147f0689 jdk8-b43 diff --git a/jaxp/makefiles/Makefile b/jaxp/makefiles/Makefile index 6d258386a08..e2e359f25c1 100644 --- a/jaxp/makefiles/Makefile +++ b/jaxp/makefiles/Makefile @@ -23,12 +23,13 @@ # questions. # +# This must be the first rule +default: all + -include $(SPEC) include MakeBase.gmk include JavaCompilation.gmk -default: all - JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar DISABLE_JAXP_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough diff --git a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java index c1ddeb6cb59..7f3295d1479 100644 --- a/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java +++ b/jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java @@ -182,7 +182,8 @@ protected static final String PARSER_SETTINGS = EXTERNAL_GENERAL_ENTITIES, EXTERNAL_PARAMETER_ENTITIES, ALLOW_JAVA_ENCODINGS, - WARN_ON_DUPLICATE_ENTITYDEF + WARN_ON_DUPLICATE_ENTITYDEF, + STANDARD_URI_CONFORMANT }; /** Feature defaults. */ @@ -192,6 +193,7 @@ protected static final String PARSER_SETTINGS = Boolean.TRUE, Boolean.TRUE, Boolean.FALSE, + Boolean.FALSE }; /** Recognized properties. */ diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java b/jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java index 99c05b901bf..ab138efa477 100644 --- a/jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java +++ b/jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java @@ -55,7 +55,7 @@ import com.sun.org.apache.xalan.internal.utils.ObjectFactory; final class CharInfo { /** Given a character, lookup a String to output (e.g. a decorated entity reference). */ - private HashMap m_charToString; + private HashMap m_charToString = new HashMap(); /** * The name of the HTML entities file. @@ -72,50 +72,42 @@ final class CharInfo "com.sun.org.apache.xml.internal.serializer.XMLEntities"; /** The horizontal tab character, which the parser should always normalize. */ - static final char S_HORIZONAL_TAB = 0x09; + public static final char S_HORIZONAL_TAB = 0x09; /** The linefeed character, which the parser should always normalize. */ - static final char S_LINEFEED = 0x0A; + public static final char S_LINEFEED = 0x0A; /** The carriage return character, which the parser should always normalize. */ - static final char S_CARRIAGERETURN = 0x0D; - static final char S_SPACE = 0x20; - static final char S_QUOTE = 0x22; - static final char S_LT = 0x3C; - static final char S_GT = 0x3E; - static final char S_NEL = 0x85; - static final char S_LINE_SEPARATOR = 0x2028; + public static final char S_CARRIAGERETURN = 0x0D; /** This flag is an optimization for HTML entities. It false if entities * other than quot (34), amp (38), lt (60) and gt (62) are defined * in the range 0 to 127. * @xsl.usage internal */ - boolean onlyQuotAmpLtGt; + final boolean onlyQuotAmpLtGt; /** Copy the first 0,1 ... ASCII_MAX values into an array */ - static final int ASCII_MAX = 128; + private static final int ASCII_MAX = 128; /** Array of values is faster access than a set of bits - * to quickly check ASCII characters in attribute values, - * the value is true if the character in an attribute value - * should be mapped to a String. + * to quickly check ASCII characters in attribute values. */ - private final boolean[] shouldMapAttrChar_ASCII; + private boolean[] isSpecialAttrASCII = new boolean[ASCII_MAX]; /** Array of values is faster access than a set of bits - * to quickly check ASCII characters in text nodes, - * the value is true if the character in a text node - * should be mapped to a String. + * to quickly check ASCII characters in text nodes. */ - private final boolean[] shouldMapTextChar_ASCII; + private boolean[] isSpecialTextASCII = new boolean[ASCII_MAX]; + + private boolean[] isCleanTextASCII = new boolean[ASCII_MAX]; /** An array of bits to record if the character is in the set. * Although information in this array is complete, the * isSpecialAttrASCII array is used first because access to its values * is common and faster. */ - private final int array_of_bits[]; + private int array_of_bits[] = createEmptySetOfIntegers(65535); // 5 for 32 bit words, 6 for 64 bit words ... @@ -146,38 +138,33 @@ final class CharInfo /** - * A base constructor just to explicitly create the fields, - * with the exception of m_charToString which is handled - * by the constructor that delegates base construction to this one. - *

    - * m_charToString is not created here only for performance reasons, - * to avoid creating a Hashtable that will be replaced when - * making a mutable copy, {@link #mutableCopyOf(CharInfo)}. + * Constructor that reads in a resource file that describes the mapping of + * characters to entity references. + * This constructor is private, just to force the use + * of the getCharInfo(entitiesResource) factory * + * Resource files must be encoded in UTF-8 and can either be properties + * files with a .properties extension assumed. Alternatively, they can + * have the following form, with no particular extension assumed: + * + * 

    +     * # First char # is a comment
+     * Entity numericValue
+     * quot 34
+     * amp 38
+     *
    + * + * @param entitiesResource Name of properties or resource file that should + * be loaded, which describes that mapping of characters to entity + * references. */ - private CharInfo() + private CharInfo(String entitiesResource, String method) { - this.array_of_bits = createEmptySetOfIntegers(65535); - this.firstWordNotUsed = 0; - this.shouldMapAttrChar_ASCII = new boolean[ASCII_MAX]; - this.shouldMapTextChar_ASCII = new boolean[ASCII_MAX]; - this.m_charKey = new CharKey(); - - // Not set here, but in a constructor that uses this one - // this.m_charToString = new Hashtable(); - - this.onlyQuotAmpLtGt = true; - - - return; + this(entitiesResource, method, false); } private CharInfo(String entitiesResource, String method, boolean internal) { - // call the default constructor to create the fields - this(); - m_charToString = new HashMap(); - ResourceBundle entities = null; boolean noExtraEntities = true; @@ -203,10 +190,12 @@ final class CharInfo String name = (String) keys.nextElement(); String value = entities.getString(name); int code = Integer.parseInt(value); - boolean extra = defineEntity(name, (char) code); - if (extra) + defineEntity(name, (char) code); + if (extraEntity(code)) noExtraEntities = false; } + set(S_LINEFEED); + set(S_CARRIAGERETURN); } else { InputStream is = null; @@ -290,8 +279,8 @@ final class CharInfo int code = Integer.parseInt(value); - boolean extra = defineEntity(name, (char) code); - if (extra) + defineEntity(name, (char) code); + if (extraEntity(code)) noExtraEntities = false; } } @@ -300,6 +289,8 @@ final class CharInfo } is.close(); + set(S_LINEFEED); + set(S_CARRIAGERETURN); } catch (Exception e) { throw new RuntimeException( Utils.messages.createMessage( @@ -317,8 +308,31 @@ final class CharInfo } } + /* initialize the array isCleanTextASCII[] with a cache of values + * for use by ToStream.character(char[], int , int) + * and the array isSpecialTextASCII[] with the opposite values + * (all in the name of performance!) + */ + for (int ch = 0; ch Unlike internal entities, character references are a string to single * character mapping. They are used to map non-ASCII characters both on - * parsing and printing, primarily for HTML documents. '&lt;' is an + * parsing and printing, primarily for HTML documents. '<amp;' is an * example of a character reference.

    * * @param name The entity's name * @param value The entity's value - * @return true if the mapping is not one of: - *
      - *
    • '<' to "<" - *
    • '>' to ">" - *
    • '&' to "&" - *
    • '"' to """ - *
    */ - private boolean defineEntity(String name, char value) + private void defineEntity(String name, char value) { StringBuilder sb = new StringBuilder("&"); sb.append(name); sb.append(';'); String entityString = sb.toString(); - boolean extra = defineChar2StringMapping(entityString, value); - return extra; + defineChar2StringMapping(entityString, value); } - /** - * A utility object, just used to map characters to output Strings, - * needed because a HashMap needs to map an object as a key, not a - * Java primitive type, like a char, so this object gets around that - * and it is reusable. - */ - private final CharKey m_charKey; - /** * Map a character to a String. For example given * the character '>' this method would return the fully decorated @@ -413,21 +400,21 @@ final class CharInfo /** * Tell if the character argument that is from - * an attribute value has a mapping to a String. + * an attribute value should have special treatment. * * @param value the value of a character that is in an attribute value * @return true if the character should have any special treatment, * such as when writing out attribute values, - * such as when writing out entity references. + * or entity references. * @xsl.usage internal */ - final boolean shouldMapAttrChar(int value) + final boolean isSpecialAttrChar(int value) { // for performance try the values in the boolean array first, // this is faster access than the BitSet for common ASCII values if (value < ASCII_MAX) - return shouldMapAttrChar_ASCII[value]; + return isSpecialAttrASCII[value]; // rather than java.util.BitSet, our private // implementation is faster (and less general). @@ -436,27 +423,48 @@ final class CharInfo /** * Tell if the character argument that is from a - * text node has a mapping to a String, for example - * to map '<' to "<". + * text node should have special treatment. * * @param value the value of a character that is in a text node - * @return true if the character has a mapping to a String, - * such as when writing out entity references. + * @return true if the character should have any special treatment, + * such as when writing out attribute values, + * or entity references. * @xsl.usage internal */ - final boolean shouldMapTextChar(int value) + final boolean isSpecialTextChar(int value) { // for performance try the values in the boolean array first, // this is faster access than the BitSet for common ASCII values if (value < ASCII_MAX) - return shouldMapTextChar_ASCII[value]; + return isSpecialTextASCII[value]; // rather than java.util.BitSet, our private // implementation is faster (and less general). return get(value); } + /** + * This method is used to determine if an ASCII character in + * a text node (not an attribute value) is "clean". + * @param value the character to check (0 to 127). + * @return true if the character can go to the writer as-is + * @xsl.usage internal + */ + final boolean isTextASCIIClean(int value) + { + return isCleanTextASCII[value]; + } + +// In the future one might want to use the array directly and avoid +// the method call, but I think the JIT alreay inlines this well enough +// so don't do it (for now) - bjm +// public final boolean[] getASCIIClean() +// { +// return isCleanTextASCII; +// } + + private static CharInfo getCharInfoBasedOnPrivilege( final String entitiesFileName, final String method, final boolean internal){ @@ -491,17 +499,15 @@ final class CharInfo { CharInfo charInfo = (CharInfo) m_getCharInfoCache.get(entitiesFileName); if (charInfo != null) { - return mutableCopyOf(charInfo); + return charInfo; } // try to load it internally - cache try { charInfo = getCharInfoBasedOnPrivilege(entitiesFileName, method, true); - // Put the common copy of charInfo in the cache, but return - // a copy of it. m_getCharInfoCache.put(entitiesFileName, charInfo); - return mutableCopyOf(charInfo); + return charInfo; } catch (Exception e) {} // try to load it externally - do not cache @@ -528,41 +534,7 @@ final class CharInfo method, false); } - /** - * Create a mutable copy of the cached one. - * @param charInfo The cached one. - * @return - */ - private static CharInfo mutableCopyOf(CharInfo charInfo) { - CharInfo copy = new CharInfo(); - - int max = charInfo.array_of_bits.length; - System.arraycopy(charInfo.array_of_bits,0,copy.array_of_bits,0,max); - - copy.firstWordNotUsed = charInfo.firstWordNotUsed; - - max = charInfo.shouldMapAttrChar_ASCII.length; - System.arraycopy(charInfo.shouldMapAttrChar_ASCII,0,copy.shouldMapAttrChar_ASCII,0,max); - - max = charInfo.shouldMapTextChar_ASCII.length; - System.arraycopy(charInfo.shouldMapTextChar_ASCII,0,copy.shouldMapTextChar_ASCII,0,max); - - // utility field copy.m_charKey is already created in the default constructor - - copy.m_charToString = (HashMap) charInfo.m_charToString.clone(); - - copy.onlyQuotAmpLtGt = charInfo.onlyQuotAmpLtGt; - - return copy; - } - - /** - * Table of user-specified char infos. - * The table maps entify file names (the name of the - * property file without the .properties extension) - * to CharInfo objects populated with entities defined in - * corresponding property file. - */ + /** Table of user-specified char infos. */ private static HashMap m_getCharInfoCache = new HashMap(); /** @@ -604,8 +576,7 @@ final class CharInfo * the creation of the set. */ private final void set(int i) { - setASCIItextDirty(i); - setASCIIattrDirty(i); + setASCIIdirty(i); int j = (i >> SHIFT_PER_WORD); // this word is used int k = j + 1; @@ -640,43 +611,24 @@ final class CharInfo return in_the_set; } + // record if there are any entities other than + // quot, amp, lt, gt (probably user defined) /** - * This method returns true if there are some non-standard mappings to - * entities other than quot, amp, lt, gt, and its only purpose is for - * performance. - * @param charToMap The value of the character that is mapped to a String - * @param outputString The String to which the character is mapped, usually - * an entity reference such as "<". - * @return true if the mapping is not one of: - *
      - *
    • '<' to "<" - *
    • '>' to ">" - *
    • '&' to "&" - *
    • '"' to """ - *
    + * @return true if the entity + * @param code The value of the character that has an entity defined + * for it. */ - private boolean extraEntity(String outputString, int charToMap) + private boolean extraEntity(int entityValue) { boolean extra = false; - if (charToMap < ASCII_MAX) + if (entityValue < 128) { - switch (charToMap) + switch (entityValue) { - case '"' : // quot - if (!outputString.equals(""")) - extra = true; - break; - case '&' : // amp - if (!outputString.equals("&")) - extra = true; - break; - case '<' : // lt - if (!outputString.equals("<")) - extra = true; - break; - case '>' : // gt - if (!outputString.equals(">")) - extra = true; + case 34 : // quot + case 38 : // amp + case 60 : // lt + case 62 : // gt break; default : // other entity in range 0 to 127 extra = true; @@ -686,61 +638,49 @@ final class CharInfo } /** - * If the character is in the ASCII range then - * mark it as needing replacement with - * a String on output if it occurs in a text node. + * If the character is a printable ASCII character then + * mark it as not clean and needing replacement with + * a String on output. * @param ch */ - private void setASCIItextDirty(int j) + private void setASCIIdirty(int j) { if (0 <= j && j < ASCII_MAX) { - shouldMapTextChar_ASCII[j] = true; + isCleanTextASCII[j] = false; + isSpecialTextASCII[j] = true; } } /** - * If the character is in the ASCII range then - * mark it as needing replacement with - * a String on output if it occurs in a attribute value. + * If the character is a printable ASCII character then + * mark it as and not needing replacement with + * a String on output. * @param ch */ - private void setASCIIattrDirty(int j) + private void setASCIIclean(int j) { if (0 <= j && j < ASCII_MAX) { - shouldMapAttrChar_ASCII[j] = true; + isCleanTextASCII[j] = true; + isSpecialTextASCII[j] = false; } } - /** - * Call this method to register a char to String mapping, for example - * to map '<' to "<". - * @param outputString The String to map to. - * @param inputChar The char to map from. - * @return true if the mapping is not one of: - *
      - *
    • '<' to "<" - *
    • '>' to ">" - *
    • '&' to "&" - *
    • '"' to """ - *
    - */ - boolean defineChar2StringMapping(String outputString, char inputChar) + private void defineChar2StringMapping(String outputString, char inputChar) { CharKey character = new CharKey(inputChar); m_charToString.put(character, outputString); - set(inputChar); // mark the character has having a mapping to a String - - boolean extraMapping = extraEntity(outputString, inputChar); - return extraMapping; - + set(inputChar); } /** * Simple class for fast lookup of char values, when used with * hashtables. You can set the char, then use it as a key. * + * This class is a copy of the one in com.sun.org.apache.xml.internal.utils. + * It exists to cut the serializers dependancy on that package. + * * @xsl.usage internal */ private static class CharKey extends Object diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java b/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java index 94fbce6d64e..aa48eaed8b4 100644 --- a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java +++ b/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java @@ -58,7 +58,7 @@ public final class ToHTMLStream extends ToStream * Map that tells which XML characters should have special treatment, and it * provides character to entity name lookup. */ - private final CharInfo m_htmlcharInfo = + private static final CharInfo m_htmlcharInfo = // new CharInfo(CharInfo.HTML_ENTITIES_RESOURCE); CharInfo.getCharInfo(CharInfo.HTML_ENTITIES_RESOURCE, Method.HTML); @@ -1369,7 +1369,7 @@ public final class ToHTMLStream extends ToStream // System.out.println("ch: "+(int)ch); // System.out.println("m_maxCharacter: "+(int)m_maxCharacter); // System.out.println("m_attrCharsMap[ch]: "+(int)m_attrCharsMap[ch]); - if (escapingNotNeeded(ch) && (!m_charInfo.shouldMapAttrChar(ch))) + if (escapingNotNeeded(ch) && (!m_charInfo.isSpecialAttrChar(ch))) { cleanLength++; } diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToStream.java b/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToStream.java index cf07a695c83..8c4c2ec8892 100644 --- a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToStream.java +++ b/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToStream.java @@ -919,8 +919,7 @@ abstract public class ToStream extends SerializerBase { // This is the old/fast code here, but is this // correct for all encodings? - if (ch >= CharInfo.S_SPACE || (CharInfo.S_LINEFEED == ch || - CharInfo.S_CARRIAGERETURN == ch || CharInfo.S_HORIZONAL_TAB == ch)) + if (ch >= 0x20 || (0x0A == ch || 0x0D == ch || 0x09 == ch)) ret= true; else ret = false; @@ -1029,7 +1028,7 @@ abstract public class ToStream extends SerializerBase * * @throws java.io.IOException */ - int accumDefaultEntity( + protected int accumDefaultEntity( java.io.Writer writer, char ch, int i, @@ -1048,7 +1047,7 @@ abstract public class ToStream extends SerializerBase { // if this is text node character and a special one of those, // or if this is a character from attribute value and a special one of those - if ((fromTextNode && m_charInfo.shouldMapTextChar(ch)) || (!fromTextNode && m_charInfo.shouldMapAttrChar(ch))) + if ((fromTextNode && m_charInfo.isSpecialTextChar(ch)) || (!fromTextNode && m_charInfo.isSpecialAttrChar(ch))) { String outputStringForChar = m_charInfo.getOutputStringForChar(ch); @@ -1399,6 +1398,7 @@ abstract public class ToStream extends SerializerBase if (m_cdataTagOpen) closeCDATA(); + // the check with _escaping is a bit of a hack for XLSTC if (m_disableOutputEscapingStates.peekOrFalse() || (!m_escaping)) { @@ -1421,173 +1421,82 @@ abstract public class ToStream extends SerializerBase try { int i; + char ch1; int startClean; // skip any leading whitspace // don't go off the end and use a hand inlined version // of isWhitespace(ch) final int end = start + length; - int lastDirtyCharProcessed = start - 1; // last non-clean character that was processed - // that was processed - final Writer writer = m_writer; - boolean isAllWhitespace = true; - - // process any leading whitspace - i = start; - while (i < end && isAllWhitespace) { - char ch1 = chars[i]; - - if (m_charInfo.shouldMapTextChar(ch1)) { - // The character is supposed to be replaced by a String - // so write out the clean whitespace characters accumulated - // so far - // then the String. - writeOutCleanChars(chars, i, lastDirtyCharProcessed); - String outputStringForChar = m_charInfo - .getOutputStringForChar(ch1); - writer.write(outputStringForChar); - // We can't say that everything we are writing out is - // all whitespace, we just wrote out a String. - isAllWhitespace = false; - lastDirtyCharProcessed = i; // mark the last non-clean - // character processed - i++; - } else { - // The character is clean, but is it a whitespace ? - switch (ch1) { - // TODO: Any other whitespace to consider? - case CharInfo.S_SPACE: - // Just accumulate the clean whitespace - i++; - break; - case CharInfo.S_LINEFEED: - lastDirtyCharProcessed = processLineFeed(chars, i, - lastDirtyCharProcessed, writer); - i++; - break; - case CharInfo.S_CARRIAGERETURN: - writeOutCleanChars(chars, i, lastDirtyCharProcessed); - writer.write(" "); - lastDirtyCharProcessed = i; - i++; - break; - case CharInfo.S_HORIZONAL_TAB: - // Just accumulate the clean whitespace - i++; - break; - default: - // The character was clean, but not a whitespace - // so break the loop to continue with this character - // (we don't increment index i !!) - isAllWhitespace = false; - break; + int lastDirty = start - 1; // last character that needed processing + for (i = start; + ((i < end) + && ((ch1 = chars[i]) == 0x20 + || (ch1 == 0xA && m_lineSepUse) + || ch1 == 0xD + || ch1 == 0x09)); + i++) + { + /* + * We are processing leading whitespace, but are doing the same + * processing for dirty characters here as for non-whitespace. + * + */ + if (!m_charInfo.isTextASCIIClean(ch1)) + { + lastDirty = processDirty(chars,end, i,ch1, lastDirty, true); + i = lastDirty; } } - } /* If there is some non-whitespace, mark that we may need * to preserve this. This is only important if we have indentation on. */ - if (i < end || !isAllWhitespace) + if (i < end) m_ispreserve = true; + +// int lengthClean; // number of clean characters in a row +// final boolean[] isAsciiClean = m_charInfo.getASCIIClean(); + + final boolean isXML10 = XMLVERSION10.equals(getVersion()); + // we've skipped the leading whitespace, now deal with the rest for (; i < end; i++) { - char ch = chars[i]; - - if (m_charInfo.shouldMapTextChar(ch)) { - // The character is supposed to be replaced by a String - // e.g. '&' --> "&" - // e.g. '<' --> "<" - writeOutCleanChars(chars, i, lastDirtyCharProcessed); - String outputStringForChar = m_charInfo.getOutputStringForChar(ch); - writer.write(outputStringForChar); - lastDirtyCharProcessed = i; - } - else { - if (ch <= 0x1F) { - // Range 0x00 through 0x1F inclusive - // - // This covers the non-whitespace control characters - // in the range 0x1 to 0x1F inclusive. - // It also covers the whitespace control characters in the same way: - // 0x9 TAB - // 0xA NEW LINE - // 0xD CARRIAGE RETURN - // - // We also cover 0x0 ... It isn't valid - // but we will output "�" - - // The default will handle this just fine, but this - // is a little performance boost to handle the more - // common TAB, NEW-LINE, CARRIAGE-RETURN - switch (ch) { - - case CharInfo.S_HORIZONAL_TAB: - // Leave whitespace TAB as a real character + { + // A tight loop to skip over common clean chars + // This tight loop makes it easier for the JIT + // to optimize. + char ch2; + while (i startClean) { int lengthClean = i - startClean; @@ -1606,32 +1515,6 @@ abstract public class ToStream extends SerializerBase if (m_tracer != null) super.fireCharEvent(chars, start, length); } - - private int processLineFeed(final char[] chars, int i, int lastProcessed, final Writer writer) throws IOException { - if (!m_lineSepUse - || (m_lineSepLen ==1 && m_lineSep[0] == CharInfo.S_LINEFEED)){ - // We are leaving the new-line alone, and it is just - // being added to the 'clean' characters, - // so the last dirty character processed remains unchanged - } - else { - writeOutCleanChars(chars, i, lastProcessed); - writer.write(m_lineSep, 0, m_lineSepLen); - lastProcessed = i; - } - return lastProcessed; - } - - private void writeOutCleanChars(final char[] chars, int i, int lastProcessed) throws IOException { - int startClean; - startClean = lastProcessed + 1; - if (startClean < i) - { - int lengthClean = i - startClean; - m_writer.write(chars, startClean, lengthClean); - } - } - /** * This method checks if a given character is between C0 or C1 range * of Control characters. @@ -1751,7 +1634,7 @@ abstract public class ToStream extends SerializerBase * * @throws org.xml.sax.SAXException */ - private int accumDefaultEscape( + protected int accumDefaultEscape( Writer writer, char ch, int i, @@ -1815,15 +1698,16 @@ abstract public class ToStream extends SerializerBase * to write it out as Numeric Character Reference(NCR) regardless of XML Version * being used for output document. */ - if (isCharacterInC0orC1Range(ch) || isNELorLSEPCharacter(ch)) + if (isCharacterInC0orC1Range(ch) || + (XMLVERSION11.equals(getVersion()) && isNELorLSEPCharacter(ch))) { writer.write("&#"); writer.write(Integer.toString(ch)); writer.write(';'); } else if ((!escapingNotNeeded(ch) || - ( (fromTextNode && m_charInfo.shouldMapTextChar(ch)) - || (!fromTextNode && m_charInfo.shouldMapAttrChar(ch)))) + ( (fromTextNode && m_charInfo.isSpecialTextChar(ch)) + || (!fromTextNode && m_charInfo.isSpecialAttrChar(ch)))) && m_elemContext.m_currentElemDepth > 0) { writer.write("&#"); @@ -2087,86 +1971,28 @@ abstract public class ToStream extends SerializerBase string.getChars(0,len, m_attrBuff, 0); final char[] stringChars = m_attrBuff; - for (int i = 0; i < len;) + for (int i = 0; i < len; ) { char ch = stringChars[i]; + if (escapingNotNeeded(ch) && (!m_charInfo.isSpecialAttrChar(ch))) + { + writer.write(ch); + i++; + } + else + { // I guess the parser doesn't normalize cr/lf in attributes. -sb +// if ((CharInfo.S_CARRIAGERETURN == ch) +// && ((i + 1) < len) +// && (CharInfo.S_LINEFEED == stringChars[i + 1])) +// { +// i++; +// ch = CharInfo.S_LINEFEED; +// } - if (m_charInfo.shouldMapAttrChar(ch) || !(escapingNotNeeded(ch))) { - // The character is supposed to be replaced by a String - // e.g. '&' --> "&" - // e.g. '<' --> "<" i = accumDefaultEscape(writer, ch, i, stringChars, len, false, true); } - else { - i++; - if (0x0 <= ch && ch <= 0x1F) { - // Range 0x00 through 0x1F inclusive - // This covers the non-whitespace control characters - // in the range 0x1 to 0x1F inclusive. - // It also covers the whitespace control characters in the same way: - // 0x9 TAB - // 0xA NEW LINE - // 0xD CARRIAGE RETURN - // - // We also cover 0x0 ... It isn't valid - // but we will output "�" - - // The default will handle this just fine, but this - // is a little performance boost to handle the more - // common TAB, NEW-LINE, CARRIAGE-RETURN - switch (ch) { - - case CharInfo.S_HORIZONAL_TAB: - writer.write(" "); - break; - case CharInfo.S_LINEFEED: - writer.write(" "); - break; - case CharInfo.S_CARRIAGERETURN: - writer.write(" "); - break; - default: - writer.write("&#"); - writer.write(Integer.toString(ch)); - writer.write(';'); - break; - } - } - else if (ch < 0x7F) { - // Range 0x20 through 0x7E inclusive - // Normal ASCII chars - writer.write(ch); - } - else if (ch <= 0x9F){ - // Range 0x7F through 0x9F inclusive - // More control characters - writer.write("&#"); - writer.write(Integer.toString(ch)); - writer.write(';'); - } - else if (ch == CharInfo.S_LINE_SEPARATOR) { - // LINE SEPARATOR - writer.write("
"); - } - else if (m_encodingInfo.isInEncoding(ch)) { - // If the character is in the encoding, and - // not in the normal ASCII range, we also - // just write it out - writer.write(ch); - } - else { - // This is a fallback plan, we should never get here - // but if the character wasn't previously handled - // (i.e. isn't in the encoding, etc.) then what - // should we do? We choose to write out a character ref - writer.write("&#"); - writer.write(Integer.toString(ch)); - writer.write(';'); - } - } - } } /** @@ -2936,14 +2762,6 @@ abstract public class ToStream extends SerializerBase closeCDATA(); m_cdataTagOpen = false; } - if (m_writer != null) { - try { - m_writer.flush(); - } - catch(IOException e) { - // what? me worry? - } - } } public void setContentHandler(ContentHandler ch) diff --git a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java b/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java index 51e1331144a..e64cc3face8 100644 --- a/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java +++ b/jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java @@ -56,7 +56,7 @@ public final class ToXMLStream extends ToStream * Map that tells which XML characters should have special treatment, and it * provides character to entity name lookup. */ - private CharInfo m_xmlcharInfo = + private static CharInfo m_xmlcharInfo = // new CharInfo(CharInfo.XML_ENTITIES_RESOURCE); CharInfo.getCharInfo(CharInfo.XML_ENTITIES_RESOURCE, Method.XML); @@ -329,11 +329,12 @@ public final class ToXMLStream extends ToStream /** * Before Xalan 1497, a newline char was printed out if not inside of an - * element. The whitespace is not significant if the output is standalone + * element. The whitespace is not significant is the output is standalone */ if (m_elemContext.m_currentElemDepth <= 0 && m_isStandalone) writer.write(m_lineSep, 0, m_lineSepLen); + /* * Don't write out any indentation whitespace now, * because there may be non-whitespace text after this. diff --git a/jaxws/.hgtags b/jaxws/.hgtags index c6d6f79b536..b54cf5b44f3 100644 --- a/jaxws/.hgtags +++ b/jaxws/.hgtags @@ -163,3 +163,5 @@ ac1ba3b56775e3cdcd91b7a48793b59f6a3c18b5 jdk8-b38 7f6b44fd303478caa83575dbc225de187c509c50 jdk8-b39 09a0ddda03cb36deb6ee9edf789da12aa4674c6b jdk8-b40 f2072b164b0519227833a2994f78e3988ee67827 jdk8-b41 +1f20f37818a91b66eaeba268d0b785718598ee0e jdk8-b42 +f00c12994562c2f68d348a7c3e829374a89294e2 jdk8-b43 diff --git a/jaxws/makefiles/Makefile b/jaxws/makefiles/Makefile index f44d17d8068..bfb2c56b937 100644 --- a/jaxws/makefiles/Makefile +++ b/jaxws/makefiles/Makefile @@ -23,12 +23,13 @@ # questions. # +# This must be the first rule +default: all + include $(SPEC) include MakeBase.gmk include JavaCompilation.gmk -default: all - JAVAC_JARS ?= -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static diff --git a/jdk/.hgtags b/jdk/.hgtags index 67e484c4aba..edfcfe38137 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -163,3 +163,5 @@ c45f3509a70796c54b48f32910d1caf435763416 jdk8-b38 b6f52911752110a2889681923992c7a0baa52ccc jdk8-b39 b88fc3359dc7edabfa8a228855d8cebf8843c055 jdk8-b40 4eac56f073ea8179b1a35fcd2af9b48b0088be9f jdk8-b41 +cf5c1f6fbc5ba14163fe0ef8eb8601b33f951372 jdk8-b42 +b3246687c3695dff6f461bb407f9db88f7d072e7 jdk8-b43 diff --git a/jdk/make/com/oracle/Makefile b/jdk/make/com/oracle/Makefile index a657750b2c1..63718869a4f 100644 --- a/jdk/make/com/oracle/Makefile +++ b/jdk/make/com/oracle/Makefile @@ -30,6 +30,22 @@ PRODUCT = oracle #SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path include $(BUILDDIR)/common/Defs.gmk +JFR_SRCDIRS_EXIST := $(shell \ + if [ -d $(CLOSED_SHARE_SRC)/native/oracle/jfr ] ; then \ + echo true; \ + else \ + echo false; \ + fi) + +JFR = +ifndef OPENJDK + ifndef JAVASE_EMBEDDED + ifeq ($(JFR_SRCDIRS_EXIST), true) + JFR = jfr + endif + endif +endif + # build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds UCRYPTO = ifndef OPENJDK @@ -38,13 +54,6 @@ ifndef OPENJDK endif endif -JFR = -ifndef OPENJDK -ifndef JAVASE_EMBEDDED - JFR = jfr -endif -endif - SUBDIRS = $(JFR) net nio util $(UCRYPTO) include $(BUILDDIR)/common/Subdirs.gmk diff --git a/jdk/make/common/Defs-solaris.gmk b/jdk/make/common/Defs-solaris.gmk index 5c272be1c35..b08488f4277 100644 --- a/jdk/make/common/Defs-solaris.gmk +++ b/jdk/make/common/Defs-solaris.gmk @@ -99,6 +99,9 @@ CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required! # variable names because the incoming option value can be overridden # in some situations, e.g., a VARIANT != OPT build. +ADD_GNU_DEBUGLINK = $(ABS_BUILDTOOLBINDIR)/add_gnu_debuglink +FIX_EMPTY_SEC_HDR_FLAGS = $(ABS_BUILDTOOLBINDIR)/fix_empty_sec_hdr_flags + ifeq ($(VARIANT), OPT) FULL_DEBUG_SYMBOLS ?= 1 ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) @@ -113,26 +116,11 @@ _JUNK_ := $(shell \ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) # Default OBJCOPY comes from the SUNWbinutils package: DEF_OBJCOPY=/usr/sfw/bin/gobjcopy - ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64) - # On Solaris AMD64/X64, gobjcopy is not happy and fails: - # - # usr/sfw/bin/gobjcopy --add-gnu-debuglink=.debuginfo .so - # BFD: stKPaiop: Not enough room for program headers, try linking with -N - # /usr/sfw/bin/gobjcopy: stKPaiop: Bad value - # BFD: stKPaiop: Not enough room for program headers, try linking with -N - # /usr/sfw/bin/gobjcopy: libsaproc.debuginfo: Bad value - # BFD: stKPaiop: Not enough room for program headers, try linking with -N - # /usr/sfw/bin/gobjcopy: stKPaiop: Bad value - _JUNK_ := $(shell \ - echo >&2 "INFO: $(DEF_OBJCOPY) is not working on Solaris AMD64/X64") - OBJCOPY= - else - OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) - ifneq ($(ALT_OBJCOPY),) - _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)") - # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path - OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) - endif + OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) + ifneq ($(ALT_OBJCOPY),) + _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)") + # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path + OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) endif # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the @@ -243,18 +231,21 @@ endif # optimization flags as used by FASTDEBUG. We also want all the # debug info in one place (-xs). # +CFLAGS_COMMON= +CXXFLAGS_COMMON= ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1) ifeq ($(VARIANT), OPT) - CC_OPT = -g -xs $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) - CXX_OPT = -g0 -xs $(CXX_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) + OPTIMIZATION_LEVEL = $(FASTDEBUG_OPTIMIZATION_LEVEL) + CFLAGS_COMMON += -g -xs + CXXFLAGS_COMMON += -g0 -xs endif CFLAGS_DEBUG_OPTION += -xs CXXFLAGS_DEBUG_OPTION += -xs endif endif -CFLAGS_COMMON = -L$(OBJDIR) +CFLAGS_COMMON += -L$(OBJDIR) # Do not allow C99 language features like declarations in code etc. CFLAGS_COMMON += -xc99=%none diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk index e92eed9ae06..70ce7783053 100644 --- a/jdk/make/common/Defs.gmk +++ b/jdk/make/common/Defs.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -297,6 +297,7 @@ BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars # for generated tool class files BUILDTOOLBINDIR = $(OUTPUTDIR)/btbins +ABS_BUILDTOOLBINDIR = $(ABS_OUTPUTDIR)/btbins # for generated java source files GENSRCDIR = $(OUTPUTDIR)/gensrc # for generated C source files (not javah) diff --git a/jdk/make/common/Library.gmk b/jdk/make/common/Library.gmk index 2583e83dc5d..7b47adf7786 100644 --- a/jdk/make/common/Library.gmk +++ b/jdk/make/common/Library.gmk @@ -245,6 +245,12 @@ ifneq ($(PLATFORM), macosx) ARFLAGS = -r endif +ifeq ($(PLATFORM), solaris) + ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1) +$(ACTUAL_LIBRARY):: $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) + endif +endif + $(ACTUAL_LIBRARY):: $(COMPILE_FILES_o) $(FILES_m) $(FILES_reorder) @$(prep-target) @$(ECHO) "STATS: LIBRARY=$(LIBRARY), PRODUCT=$(PRODUCT), OPTIMIZATION_LEVEL=$(OPTIMIZATION_LEVEL)" @@ -260,11 +266,29 @@ endif # WRITE_LIBVERSION ifneq ($(PLATFORM), macosx) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1) + ifeq ($(PLATFORM), solaris) +# gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. +# Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from +# empty section headers until a fixed $(OBJCOPY) is available. +# An empty section header has sh_addr == 0 and sh_size == 0. +# This problem has only been seen on Solaris X64, but we call this tool +# on all Solaris builds just in case. +# +# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. +# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. (set -e ; \ $(CD) $(@D) ; \ - $(OBJCOPY) --only-keep-debug $(@F) $(LIBRARY).debuginfo ; \ - $(OBJCOPY) --add-gnu-debuglink=$(LIBRARY).debuginfo $(@F) ; \ + $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(ADD_GNU_DEBUGLINK) $(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ ) + else # PLATFORM != solaris + (set -e ; \ + $(CD) $(@D) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(OBJCOPY) --add-gnu-debuglink=$(LIB_PREFIX)$(LIBRARY).debuginfo $(@F) ; \ + ) + endif # PLATFORM == solaris ifeq ($(STRIP_POLICY),all_strip) $(STRIP) $@ else @@ -281,8 +305,8 @@ endif # WRITE_LIBVERSION ifeq ($(ZIP_DEBUGINFO_FILES),1) (set -e ; \ $(CD) $(@D) ; \ - $(ZIPEXE) -q $(LIBRARY).diz $(LIBRARY).debuginfo ; \ - $(RM) $(LIBRARY).debuginfo ; \ + $(ZIPEXE) -q $(LIB_PREFIX)$(LIBRARY).diz $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ + $(RM) $(LIB_PREFIX)$(LIBRARY).debuginfo ; \ ) endif endif # LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk index 4e211d84600..f6228d40a6d 100644 --- a/jdk/make/common/Program.gmk +++ b/jdk/make/common/Program.gmk @@ -230,6 +230,13 @@ else # # This rule only applies on unix. It supports quantify and its ilk. # + + ifeq ($(PLATFORM), solaris) + ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1) + $(ACTUAL_PROGRAM):: $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) + endif + endif + $(ACTUAL_PROGRAM):: $(FILES_o) @$(prep-target) @set -- $?; \ @@ -244,11 +251,29 @@ else ifneq ($(PLATFORM), macosx) ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS),1) + ifeq ($(PLATFORM), solaris) +# gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. +# Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from +# empty section headers until a fixed $(OBJCOPY) is available. +# An empty section header has sh_addr == 0 and sh_size == 0. +# This problem has only been seen on Solaris X64, but we call this tool +# on all Solaris builds just in case. +# +# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. +# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. + (set -e ; \ + $(CD) $(@D) ; \ + $(FIX_EMPTY_SEC_HDR_FLAGS) $(@F) ; \ + $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \ + $(ADD_GNU_DEBUGLINK) $(@F).debuginfo $(@F) ; \ + ) + else # PLATFORM != solaris (set -e ; \ $(CD) $(@D) ; \ $(OBJCOPY) --only-keep-debug $(@F) $(@F).debuginfo ; \ $(OBJCOPY) --add-gnu-debuglink=$(@F).debuginfo $(@F) ; \ ) + endif # PLATFORM == solaris ifeq ($(STRIP_POLICY),all_strip) $(STRIP) $@ else diff --git a/jdk/make/java/java/FILES_c.gmk b/jdk/make/java/java/FILES_c.gmk index a8256b78e16..2fa706bc825 100644 --- a/jdk/make/java/java/FILES_c.gmk +++ b/jdk/make/java/java/FILES_c.gmk @@ -69,7 +69,6 @@ FILES_c = \ jdk_util_md.c \ check_version.c \ java_props_md.c \ - DriverManager.c \ ConstantPool.c \ MessageUtils.c \ GC.c \ diff --git a/jdk/make/java/java/FILES_java.gmk b/jdk/make/java/java/FILES_java.gmk index 01529b4f9b1..ddcc92e7852 100644 --- a/jdk/make/java/java/FILES_java.gmk +++ b/jdk/make/java/java/FILES_java.gmk @@ -482,6 +482,7 @@ JAVA_JAVA_java = \ sun/misc/JavaNioAccess.java \ sun/misc/Perf.java \ sun/misc/PerfCounter.java \ + sun/misc/Hashing.java \ sun/net/www/protocol/jar/Handler.java \ sun/net/www/protocol/jar/JarURLConnection.java \ sun/net/www/protocol/file/Handler.java \ diff --git a/jdk/make/java/java/mapfile-vers b/jdk/make/java/java/mapfile-vers index 8517e713dd9..23cca532fd7 100644 --- a/jdk/make/java/java/mapfile-vers +++ b/jdk/make/java/java/mapfile-vers @@ -232,7 +232,6 @@ SUNWprivate_1.1 { Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2; Java_java_security_AccessController_getStackAccessControlContext; Java_java_security_AccessController_getInheritedAccessControlContext; - Java_java_sql_DriverManager_getCallerClassLoader; Java_java_util_ResourceBundle_getClassContext; Java_java_util_TimeZone_getSystemTimeZoneID; Java_java_util_TimeZone_getSystemGMTOffsetID; diff --git a/jdk/make/java/nio/Makefile b/jdk/make/java/nio/Makefile index 76f746c73e4..9b9ef88a47c 100644 --- a/jdk/make/java/nio/Makefile +++ b/jdk/make/java/nio/Makefile @@ -55,6 +55,9 @@ FILES_java += \ sun/nio/ch/DevPollArrayWrapper.java \ sun/nio/ch/DevPollSelectorImpl.java \ sun/nio/ch/DevPollSelectorProvider.java \ + sun/nio/ch/EventPortSelectorImpl.java \ + sun/nio/ch/EventPortSelectorProvider.java \ + sun/nio/ch/EventPortWrapper.java \ sun/nio/ch/InheritedChannel.java \ sun/nio/ch/PollSelectorProvider.java \ sun/nio/ch/PollSelectorImpl.java \ diff --git a/jdk/make/java/nio/mapfile-linux b/jdk/make/java/nio/mapfile-linux index d72244170b9..61153101df7 100644 --- a/jdk/make/java/nio/mapfile-linux +++ b/jdk/make/java/nio/mapfile-linux @@ -39,7 +39,6 @@ SUNWprivate_1.1 { Java_sun_nio_ch_EPollArrayWrapper_epollCreate; Java_sun_nio_ch_EPollArrayWrapper_epollCtl; Java_sun_nio_ch_EPollArrayWrapper_epollWait; - Java_sun_nio_ch_EPollArrayWrapper_fdLimit; Java_sun_nio_ch_EPollArrayWrapper_init; Java_sun_nio_ch_EPollArrayWrapper_interrupt; Java_sun_nio_ch_EPollArrayWrapper_offsetofData; @@ -87,6 +86,7 @@ SUNWprivate_1.1 { Java_sun_nio_ch_IOUtil_configureBlocking; Java_sun_nio_ch_IOUtil_drain; Java_sun_nio_ch_IOUtil_fdVal; + Java_sun_nio_ch_IOUtil_fdLimit; Java_sun_nio_ch_IOUtil_initIDs; Java_sun_nio_ch_IOUtil_makePipe; Java_sun_nio_ch_IOUtil_randomBytes; diff --git a/jdk/make/java/nio/mapfile-solaris b/jdk/make/java/nio/mapfile-solaris index 4d86f28a566..7767d13a78e 100644 --- a/jdk/make/java/nio/mapfile-solaris +++ b/jdk/make/java/nio/mapfile-solaris @@ -36,7 +36,6 @@ SUNWprivate_1.1 { Java_sun_nio_ch_DatagramDispatcher_readv0; Java_sun_nio_ch_DatagramDispatcher_write0; Java_sun_nio_ch_DatagramDispatcher_writev0; - Java_sun_nio_ch_DevPollArrayWrapper_fdLimit; Java_sun_nio_ch_DevPollArrayWrapper_init; Java_sun_nio_ch_DevPollArrayWrapper_interrupt; Java_sun_nio_ch_DevPollArrayWrapper_poll0; @@ -74,6 +73,7 @@ SUNWprivate_1.1 { Java_sun_nio_ch_InheritedChannel_soType0; Java_sun_nio_ch_IOUtil_configureBlocking; Java_sun_nio_ch_IOUtil_drain; + Java_sun_nio_ch_IOUtil_fdLimit; Java_sun_nio_ch_IOUtil_fdVal; Java_sun_nio_ch_IOUtil_initIDs; Java_sun_nio_ch_IOUtil_makePipe; @@ -112,13 +112,13 @@ SUNWprivate_1.1 { Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_accept0; Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_initIDs; Java_sun_nio_ch_UnixAsynchronousSocketChannelImpl_checkConnect; - Java_sun_nio_ch_SolarisEventPort_init; - Java_sun_nio_ch_SolarisEventPort_portCreate; - Java_sun_nio_ch_SolarisEventPort_portClose; - Java_sun_nio_ch_SolarisEventPort_portAssociate; - Java_sun_nio_ch_SolarisEventPort_portGet; - Java_sun_nio_ch_SolarisEventPort_portGetn; - Java_sun_nio_ch_SolarisEventPort_portSend; + Java_sun_nio_ch_SolarisEventPort_port_1create; + Java_sun_nio_ch_SolarisEventPort_port_1close; + Java_sun_nio_ch_SolarisEventPort_port_1associate; + Java_sun_nio_ch_SolarisEventPort_port_1dissociate; + Java_sun_nio_ch_SolarisEventPort_port_1get; + Java_sun_nio_ch_SolarisEventPort_port_1getn; + Java_sun_nio_ch_SolarisEventPort_port_1send; Java_sun_nio_fs_GnomeFileTypeDetector_initializeGio; Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio; Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs; diff --git a/jdk/make/jprt.properties b/jdk/make/jprt.properties index 2e4e0fb8ac7..f41a227d30e 100644 --- a/jdk/make/jprt.properties +++ b/jdk/make/jprt.properties @@ -89,6 +89,7 @@ jprt.make.rule.core.test.targets= \ ${jprt.my.test.target.set:TESTNAME=jdk_text}, \ ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \ ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \ + ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \ ${jprt.my.test.target.set:TESTNAME=jdk_misc} # All vm test targets (testset=all) diff --git a/jdk/make/netbeans/jconsole/build.xml b/jdk/make/netbeans/jconsole/build.xml index a6960676510..9c1fc9515d2 100644 --- a/jdk/make/netbeans/jconsole/build.xml +++ b/jdk/make/netbeans/jconsole/build.xml @@ -50,6 +50,7 @@ + diff --git a/jdk/make/sun/jconsole/FILES.gmk b/jdk/make/sun/jconsole/FILES.gmk index 61085e65681..8fc34acb6d9 100644 --- a/jdk/make/sun/jconsole/FILES.gmk +++ b/jdk/make/sun/jconsole/FILES.gmk @@ -30,17 +30,22 @@ MANIFEST = sun/tools/jconsole/manifest PNG_FILES = \ - sun/tools/jconsole/resources/brandlogo.png \ - sun/tools/jconsole/resources/collapse-winlf.png \ - sun/tools/jconsole/resources/connected16.png \ - sun/tools/jconsole/resources/connected24.png \ - sun/tools/jconsole/resources/disconnected16.png \ - sun/tools/jconsole/resources/disconnected24.png \ - sun/tools/jconsole/resources/expand-winlf.png \ - sun/tools/jconsole/resources/masthead-left.png \ - sun/tools/jconsole/resources/masthead-right.png + sun/tools/jconsole/resources/brandlogo.png \ + sun/tools/jconsole/resources/collapse-winlf.png \ + sun/tools/jconsole/resources/connected16.png \ + sun/tools/jconsole/resources/connected24.png \ + sun/tools/jconsole/resources/disconnected16.png \ + sun/tools/jconsole/resources/disconnected24.png \ + sun/tools/jconsole/resources/expand-winlf.png \ + sun/tools/jconsole/resources/masthead-left.png \ + sun/tools/jconsole/resources/masthead-right.png GIF_FILES = \ - sun/tools/jconsole/resources/mbean.gif \ - sun/tools/jconsole/resources/mbeanserverdelegate.gif \ - sun/tools/jconsole/resources/xobject.gif + sun/tools/jconsole/resources/mbean.gif \ + sun/tools/jconsole/resources/mbeanserverdelegate.gif \ + sun/tools/jconsole/resources/xobject.gif + +PROP_FILES = \ + sun/tools/jconsole/resources/messages.properties \ + sun/tools/jconsole/resources/messages_ja.properties \ + sun/tools/jconsole/resources/messages_zh_CN.properties diff --git a/jdk/make/sun/jconsole/Makefile b/jdk/make/sun/jconsole/Makefile index da0200d7d20..c2651ce70e8 100644 --- a/jdk/make/sun/jconsole/Makefile +++ b/jdk/make/sun/jconsole/Makefile @@ -53,21 +53,21 @@ AUTO_FILES_JAVA_DIRS = sun/tools/jconsole \ FILES_png = $(PNG_FILES:%.png=$(CLASSBINDIR)/%.png) FILES_gif = $(GIF_FILES:%.gif=$(CLASSBINDIR)/%.gif) - +FILES_prop = $(PROP_FILES:%.properties=$(CLASSBINDIR)/%.properties) build: $(GENSRCDIR)/sun/tools/jconsole/Version.java # # Resources # LOCALE_SET_DEFINITION = jdk -RESOURCE_BUNDLES_JAVA = $(PKGDIR)/resources/JConsoleResources.java +RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = $(PKGDIR)/resources/messages.properties # # Rules. # include $(BUILDDIR)/common/Classes.gmk -build: $(FILES_png) $(FILES_gif) $(TEMPDIR)/manifest $(JARFILE) +build: $(FILES_png) $(FILES_gif) $(FILES_prop) $(TEMPDIR)/manifest $(JARFILE) $(GENSRCDIR)/sun/tools/jconsole/Version.java: \ $(SHARE_SRC)/classes/sun/tools/jconsole/Version.java.template @@ -85,7 +85,7 @@ $(TEMPDIR)/manifest: $(SHARE_SRC)/classes/$(PKGDIR)/manifest # Extra rule to build jconsole.jar # -$(JARFILE): $(LIBDIR) $(FILES_class) $(FILES_png) $(FILES_gif) $(TEMPDIR)/manifest +$(JARFILE): $(LIBDIR) $(FILES_class) $(FILES_png) $(FILES_gif) $(FILES_prop) $(TEMPDIR)/manifest $(BOOT_JAR_CMD) -cfm $(JARFILE) $(TEMPDIR)/manifest \ -C $(CLASSBINDIR) sun/tools/jconsole \ -C $(CLASSBINDIR) com/sun/tools/jconsole \ diff --git a/jdk/make/tools/CharsetMapping/GBK.map b/jdk/make/tools/CharsetMapping/GBK.map index 153f2386a48..edef5878a42 100644 --- a/jdk/make/tools/CharsetMapping/GBK.map +++ b/jdk/make/tools/CharsetMapping/GBK.map @@ -3,6 +3,10 @@ # (1)sorted # (2)added the singlebyte entries # +# (3)updated 0xA140-0xA7A0 mappings to follow GB18030/MS936 +# (4)added euro sign entry A2E3 20AC (instead of 0xA2E3 0xE76C) +# this is what gb18030 does. +# 0x00 0x0000 0x01 0x0001 0x02 0x0002 @@ -6508,12 +6512,12 @@ 0xA2A8 0x2177 0xA2A9 0x2178 0xA2AA 0x2179 -0xA2AB 0xE586 -0xA2AC 0xE587 -0xA2AD 0xE588 -0xA2AE 0xE589 -0xA2AF 0xE58A -0xA2B0 0xE58B +0xA2AB 0xE766 +0xA2AC 0xE767 +0xA2AD 0xE768 +0xA2AE 0xE769 +0xA2AF 0xE76A +0xA2B0 0xE76B 0xA2B1 0x2488 0xA2B2 0x2489 0xA2B3 0x248A @@ -6564,8 +6568,8 @@ 0xA2E0 0x2467 0xA2E1 0x2468 0xA2E2 0x2469 -0xA2E3 0xE58C -0xA2E4 0xE58D +0xA2E3 0x20AC +0xA2E4 0xE76D 0xA2E5 0x3220 0xA2E6 0x3221 0xA2E7 0x3222 @@ -6576,8 +6580,8 @@ 0xA2EC 0x3227 0xA2ED 0x3228 0xA2EE 0x3229 -0xA2EF 0xE58E -0xA2F0 0xE58F +0xA2EF 0xE76E +0xA2F0 0xE76F 0xA2F1 0x2160 0xA2F2 0x2161 0xA2F3 0x2162 @@ -6590,104 +6594,104 @@ 0xA2FA 0x2169 0xA2FB 0x216A 0xA2FC 0x216B -0xA2FD 0xE590 -0xA2FE 0xE591 -0xA340 0xE592 -0xA341 0xE593 -0xA342 0xE594 -0xA343 0xE595 -0xA344 0xE596 -0xA345 0xE597 -0xA346 0xE598 -0xA347 0xE599 -0xA348 0xE59A -0xA349 0xE59B -0xA34A 0xE59C -0xA34B 0xE59D -0xA34C 0xE59E -0xA34D 0xE59F -0xA34E 0xE5A0 -0xA34F 0xE5A1 -0xA350 0xE5A2 -0xA351 0xE5A3 -0xA352 0xE5A4 -0xA353 0xE5A5 -0xA354 0xE5A6 -0xA355 0xE5A7 -0xA356 0xE5A8 -0xA357 0xE5A9 -0xA358 0xE5AA -0xA359 0xE5AB -0xA35A 0xE5AC -0xA35B 0xE5AD -0xA35C 0xE5AE -0xA35D 0xE5AF -0xA35E 0xE5B0 -0xA35F 0xE5B1 -0xA360 0xE5B2 -0xA361 0xE5B3 -0xA362 0xE5B4 -0xA363 0xE5B5 -0xA364 0xE5B6 -0xA365 0xE5B7 -0xA366 0xE5B8 -0xA367 0xE5B9 -0xA368 0xE5BA -0xA369 0xE5BB -0xA36A 0xE5BC -0xA36B 0xE5BD -0xA36C 0xE5BE -0xA36D 0xE5BF -0xA36E 0xE5C0 -0xA36F 0xE5C1 -0xA370 0xE5C2 -0xA371 0xE5C3 -0xA372 0xE5C4 -0xA373 0xE5C5 -0xA374 0xE5C6 -0xA375 0xE5C7 -0xA376 0xE5C8 -0xA377 0xE5C9 -0xA378 0xE5CA -0xA379 0xE5CB -0xA37A 0xE5CC -0xA37B 0xE5CD -0xA37C 0xE5CE -0xA37D 0xE5CF -0xA37E 0xE5D0 -0xA380 0xE5D1 -0xA381 0xE5D2 -0xA382 0xE5D3 -0xA383 0xE5D4 -0xA384 0xE5D5 -0xA385 0xE5D6 -0xA386 0xE5D7 -0xA387 0xE5D8 -0xA388 0xE5D9 -0xA389 0xE5DA -0xA38A 0xE5DB -0xA38B 0xE5DC -0xA38C 0xE5DD -0xA38D 0xE5DE -0xA38E 0xE5DF -0xA38F 0xE5E0 -0xA390 0xE5E1 -0xA391 0xE5E2 -0xA392 0xE5E3 -0xA393 0xE5E4 -0xA394 0xE5E5 -0xA395 0xE5E6 -0xA396 0xE5E7 -0xA397 0xE5E8 -0xA398 0xE5E9 -0xA399 0xE5EA -0xA39A 0xE5EB -0xA39B 0xE5EC -0xA39C 0xE5ED -0xA39D 0xE5EE -0xA39E 0xE5EF -0xA39F 0xE5F0 -0xA3A0 0xE5F1 +0xA2FD 0xE770 +0xA2FE 0xE771 +0xA340 0xE586 +0xA341 0xE587 +0xA342 0xE588 +0xA343 0xE589 +0xA344 0xE58A +0xA345 0xE58B +0xA346 0xE58C +0xA347 0xE58D +0xA348 0xE58E +0xA349 0xE58F +0xA34A 0xE590 +0xA34B 0xE591 +0xA34C 0xE592 +0xA34D 0xE593 +0xA34E 0xE594 +0xA34F 0xE595 +0xA350 0xE596 +0xA351 0xE597 +0xA352 0xE598 +0xA353 0xE599 +0xA354 0xE59A +0xA355 0xE59B +0xA356 0xE59C +0xA357 0xE59D +0xA358 0xE59E +0xA359 0xE59F +0xA35A 0xE5A0 +0xA35B 0xE5A1 +0xA35C 0xE5A2 +0xA35D 0xE5A3 +0xA35E 0xE5A4 +0xA35F 0xE5A5 +0xA360 0xE5A6 +0xA361 0xE5A7 +0xA362 0xE5A8 +0xA363 0xE5A9 +0xA364 0xE5AA +0xA365 0xE5AB +0xA366 0xE5AC +0xA367 0xE5AD +0xA368 0xE5AE +0xA369 0xE5AF +0xA36A 0xE5B0 +0xA36B 0xE5B1 +0xA36C 0xE5B2 +0xA36D 0xE5B3 +0xA36E 0xE5B4 +0xA36F 0xE5B5 +0xA370 0xE5B6 +0xA371 0xE5B7 +0xA372 0xE5B8 +0xA373 0xE5B9 +0xA374 0xE5BA +0xA375 0xE5BB +0xA376 0xE5BC +0xA377 0xE5BD +0xA378 0xE5BE +0xA379 0xE5BF +0xA37A 0xE5C0 +0xA37B 0xE5C1 +0xA37C 0xE5C2 +0xA37D 0xE5C3 +0xA37E 0xE5C4 +0xA380 0xE5C5 +0xA381 0xE5C6 +0xA382 0xE5C7 +0xA383 0xE5C8 +0xA384 0xE5C9 +0xA385 0xE5CA +0xA386 0xE5CB +0xA387 0xE5CC +0xA388 0xE5CD +0xA389 0xE5CE +0xA38A 0xE5CF +0xA38B 0xE5D0 +0xA38C 0xE5D1 +0xA38D 0xE5D2 +0xA38E 0xE5D3 +0xA38F 0xE5D4 +0xA390 0xE5D5 +0xA391 0xE5D6 +0xA392 0xE5D7 +0xA393 0xE5D8 +0xA394 0xE5D9 +0xA395 0xE5DA +0xA396 0xE5DB +0xA397 0xE5DC +0xA398 0xE5DD +0xA399 0xE5DE +0xA39A 0xE5DF +0xA39B 0xE5E0 +0xA39C 0xE5E1 +0xA39D 0xE5E2 +0xA39E 0xE5E3 +0xA39F 0xE5E4 +0xA3A0 0xE5E5 0xA3A1 0xFF01 0xA3A2 0xFF02 0xA3A3 0xFF03 @@ -6782,102 +6786,102 @@ 0xA3FC 0xFF5C 0xA3FD 0xFF5D 0xA3FE 0xFFE3 -0xA440 0xE5F2 -0xA441 0xE5F3 -0xA442 0xE5F4 -0xA443 0xE5F5 -0xA444 0xE5F6 -0xA445 0xE5F7 -0xA446 0xE5F8 -0xA447 0xE5F9 -0xA448 0xE5FA -0xA449 0xE5FB -0xA44A 0xE5FC -0xA44B 0xE5FD -0xA44C 0xE5FE -0xA44D 0xE5FF -0xA44E 0xE600 -0xA44F 0xE601 -0xA450 0xE602 -0xA451 0xE603 -0xA452 0xE604 -0xA453 0xE605 -0xA454 0xE606 -0xA455 0xE607 -0xA456 0xE608 -0xA457 0xE609 -0xA458 0xE60A -0xA459 0xE60B -0xA45A 0xE60C -0xA45B 0xE60D -0xA45C 0xE60E -0xA45D 0xE60F -0xA45E 0xE610 -0xA45F 0xE611 -0xA460 0xE612 -0xA461 0xE613 -0xA462 0xE614 -0xA463 0xE615 -0xA464 0xE616 -0xA465 0xE617 -0xA466 0xE618 -0xA467 0xE619 -0xA468 0xE61A -0xA469 0xE61B -0xA46A 0xE61C -0xA46B 0xE61D -0xA46C 0xE61E -0xA46D 0xE61F -0xA46E 0xE620 -0xA46F 0xE621 -0xA470 0xE622 -0xA471 0xE623 -0xA472 0xE624 -0xA473 0xE625 -0xA474 0xE626 -0xA475 0xE627 -0xA476 0xE628 -0xA477 0xE629 -0xA478 0xE62A -0xA479 0xE62B -0xA47A 0xE62C -0xA47B 0xE62D -0xA47C 0xE62E -0xA47D 0xE62F -0xA47E 0xE630 -0xA480 0xE631 -0xA481 0xE632 -0xA482 0xE633 -0xA483 0xE634 -0xA484 0xE635 -0xA485 0xE636 -0xA486 0xE637 -0xA487 0xE638 -0xA488 0xE639 -0xA489 0xE63A -0xA48A 0xE63B -0xA48B 0xE63C -0xA48C 0xE63D -0xA48D 0xE63E -0xA48E 0xE63F -0xA48F 0xE640 -0xA490 0xE641 -0xA491 0xE642 -0xA492 0xE643 -0xA493 0xE644 -0xA494 0xE645 -0xA495 0xE646 -0xA496 0xE647 -0xA497 0xE648 -0xA498 0xE649 -0xA499 0xE64A -0xA49A 0xE64B -0xA49B 0xE64C -0xA49C 0xE64D -0xA49D 0xE64E -0xA49E 0xE64F -0xA49F 0xE650 -0xA4A0 0xE651 +0xA440 0xE5E6 +0xA441 0xE5E7 +0xA442 0xE5E8 +0xA443 0xE5E9 +0xA444 0xE5EA +0xA445 0xE5EB +0xA446 0xE5EC +0xA447 0xE5ED +0xA448 0xE5EE +0xA449 0xE5EF +0xA44A 0xE5F0 +0xA44B 0xE5F1 +0xA44C 0xE5F2 +0xA44D 0xE5F3 +0xA44E 0xE5F4 +0xA44F 0xE5F5 +0xA450 0xE5F6 +0xA451 0xE5F7 +0xA452 0xE5F8 +0xA453 0xE5F9 +0xA454 0xE5FA +0xA455 0xE5FB +0xA456 0xE5FC +0xA457 0xE5FD +0xA458 0xE5FE +0xA459 0xE5FF +0xA45A 0xE600 +0xA45B 0xE601 +0xA45C 0xE602 +0xA45D 0xE603 +0xA45E 0xE604 +0xA45F 0xE605 +0xA460 0xE606 +0xA461 0xE607 +0xA462 0xE608 +0xA463 0xE609 +0xA464 0xE60A +0xA465 0xE60B +0xA466 0xE60C +0xA467 0xE60D +0xA468 0xE60E +0xA469 0xE60F +0xA46A 0xE610 +0xA46B 0xE611 +0xA46C 0xE612 +0xA46D 0xE613 +0xA46E 0xE614 +0xA46F 0xE615 +0xA470 0xE616 +0xA471 0xE617 +0xA472 0xE618 +0xA473 0xE619 +0xA474 0xE61A +0xA475 0xE61B +0xA476 0xE61C +0xA477 0xE61D +0xA478 0xE61E +0xA479 0xE61F +0xA47A 0xE620 +0xA47B 0xE621 +0xA47C 0xE622 +0xA47D 0xE623 +0xA47E 0xE624 +0xA480 0xE625 +0xA481 0xE626 +0xA482 0xE627 +0xA483 0xE628 +0xA484 0xE629 +0xA485 0xE62A +0xA486 0xE62B +0xA487 0xE62C +0xA488 0xE62D +0xA489 0xE62E +0xA48A 0xE62F +0xA48B 0xE630 +0xA48C 0xE631 +0xA48D 0xE632 +0xA48E 0xE633 +0xA48F 0xE634 +0xA490 0xE635 +0xA491 0xE636 +0xA492 0xE637 +0xA493 0xE638 +0xA494 0xE639 +0xA495 0xE63A +0xA496 0xE63B +0xA497 0xE63C +0xA498 0xE63D +0xA499 0xE63E +0xA49A 0xE63F +0xA49B 0xE640 +0xA49C 0xE641 +0xA49D 0xE642 +0xA49E 0xE643 +0xA49F 0xE644 +0xA4A0 0xE645 0xA4A1 0x3041 0xA4A2 0x3042 0xA4A3 0x3043 @@ -6961,113 +6965,113 @@ 0xA4F1 0x3091 0xA4F2 0x3092 0xA4F3 0x3093 -0xA4F4 0xE652 -0xA4F5 0xE653 -0xA4F6 0xE654 -0xA4F7 0xE655 -0xA4F8 0xE656 -0xA4F9 0xE657 -0xA4FA 0xE658 -0xA4FB 0xE659 -0xA4FC 0xE65A -0xA4FD 0xE65B -0xA4FE 0xE65C -0xA540 0xE65D -0xA541 0xE65E -0xA542 0xE65F -0xA543 0xE660 -0xA544 0xE661 -0xA545 0xE662 -0xA546 0xE663 -0xA547 0xE664 -0xA548 0xE665 -0xA549 0xE666 -0xA54A 0xE667 -0xA54B 0xE668 -0xA54C 0xE669 -0xA54D 0xE66A -0xA54E 0xE66B -0xA54F 0xE66C -0xA550 0xE66D -0xA551 0xE66E -0xA552 0xE66F -0xA553 0xE670 -0xA554 0xE671 -0xA555 0xE672 -0xA556 0xE673 -0xA557 0xE674 -0xA558 0xE675 -0xA559 0xE676 -0xA55A 0xE677 -0xA55B 0xE678 -0xA55C 0xE679 -0xA55D 0xE67A -0xA55E 0xE67B -0xA55F 0xE67C -0xA560 0xE67D -0xA561 0xE67E -0xA562 0xE67F -0xA563 0xE680 -0xA564 0xE681 -0xA565 0xE682 -0xA566 0xE683 -0xA567 0xE684 -0xA568 0xE685 -0xA569 0xE686 -0xA56A 0xE687 -0xA56B 0xE688 -0xA56C 0xE689 -0xA56D 0xE68A -0xA56E 0xE68B -0xA56F 0xE68C -0xA570 0xE68D -0xA571 0xE68E -0xA572 0xE68F -0xA573 0xE690 -0xA574 0xE691 -0xA575 0xE692 -0xA576 0xE693 -0xA577 0xE694 -0xA578 0xE695 -0xA579 0xE696 -0xA57A 0xE697 -0xA57B 0xE698 -0xA57C 0xE699 -0xA57D 0xE69A -0xA57E 0xE69B -0xA580 0xE69C -0xA581 0xE69D -0xA582 0xE69E -0xA583 0xE69F -0xA584 0xE6A0 -0xA585 0xE6A1 -0xA586 0xE6A2 -0xA587 0xE6A3 -0xA588 0xE6A4 -0xA589 0xE6A5 -0xA58A 0xE6A6 -0xA58B 0xE6A7 -0xA58C 0xE6A8 -0xA58D 0xE6A9 -0xA58E 0xE6AA -0xA58F 0xE6AB -0xA590 0xE6AC -0xA591 0xE6AD -0xA592 0xE6AE -0xA593 0xE6AF -0xA594 0xE6B0 -0xA595 0xE6B1 -0xA596 0xE6B2 -0xA597 0xE6B3 -0xA598 0xE6B4 -0xA599 0xE6B5 -0xA59A 0xE6B6 -0xA59B 0xE6B7 -0xA59C 0xE6B8 -0xA59D 0xE6B9 -0xA59E 0xE6BA -0xA59F 0xE6BB -0xA5A0 0xE6BC +0xA4F4 0xE772 +0xA4F5 0xE773 +0xA4F6 0xE774 +0xA4F7 0xE775 +0xA4F8 0xE776 +0xA4F9 0xE777 +0xA4FA 0xE778 +0xA4FB 0xE779 +0xA4FC 0xE77A +0xA4FD 0xE77B +0xA4FE 0xE77C +0xA540 0xE646 +0xA541 0xE647 +0xA542 0xE648 +0xA543 0xE649 +0xA544 0xE64A +0xA545 0xE64B +0xA546 0xE64C +0xA547 0xE64D +0xA548 0xE64E +0xA549 0xE64F +0xA54A 0xE650 +0xA54B 0xE651 +0xA54C 0xE652 +0xA54D 0xE653 +0xA54E 0xE654 +0xA54F 0xE655 +0xA550 0xE656 +0xA551 0xE657 +0xA552 0xE658 +0xA553 0xE659 +0xA554 0xE65A +0xA555 0xE65B +0xA556 0xE65C +0xA557 0xE65D +0xA558 0xE65E +0xA559 0xE65F +0xA55A 0xE660 +0xA55B 0xE661 +0xA55C 0xE662 +0xA55D 0xE663 +0xA55E 0xE664 +0xA55F 0xE665 +0xA560 0xE666 +0xA561 0xE667 +0xA562 0xE668 +0xA563 0xE669 +0xA564 0xE66A +0xA565 0xE66B +0xA566 0xE66C +0xA567 0xE66D +0xA568 0xE66E +0xA569 0xE66F +0xA56A 0xE670 +0xA56B 0xE671 +0xA56C 0xE672 +0xA56D 0xE673 +0xA56E 0xE674 +0xA56F 0xE675 +0xA570 0xE676 +0xA571 0xE677 +0xA572 0xE678 +0xA573 0xE679 +0xA574 0xE67A +0xA575 0xE67B +0xA576 0xE67C +0xA577 0xE67D +0xA578 0xE67E +0xA579 0xE67F +0xA57A 0xE680 +0xA57B 0xE681 +0xA57C 0xE682 +0xA57D 0xE683 +0xA57E 0xE684 +0xA580 0xE685 +0xA581 0xE686 +0xA582 0xE687 +0xA583 0xE688 +0xA584 0xE689 +0xA585 0xE68A +0xA586 0xE68B +0xA587 0xE68C +0xA588 0xE68D +0xA589 0xE68E +0xA58A 0xE68F +0xA58B 0xE690 +0xA58C 0xE691 +0xA58D 0xE692 +0xA58E 0xE693 +0xA58F 0xE694 +0xA590 0xE695 +0xA591 0xE696 +0xA592 0xE697 +0xA593 0xE698 +0xA594 0xE699 +0xA595 0xE69A +0xA596 0xE69B +0xA597 0xE69C +0xA598 0xE69D +0xA599 0xE69E +0xA59A 0xE69F +0xA59B 0xE6A0 +0xA59C 0xE6A1 +0xA59D 0xE6A2 +0xA59E 0xE6A3 +0xA59F 0xE6A4 +0xA5A0 0xE6A5 0xA5A1 0x30A1 0xA5A2 0x30A2 0xA5A3 0x30A3 @@ -7154,110 +7158,110 @@ 0xA5F4 0x30F4 0xA5F5 0x30F5 0xA5F6 0x30F6 -0xA5F7 0xE6BD -0xA5F8 0xE6BE -0xA5F9 0xE6BF -0xA5FA 0xE6C0 -0xA5FB 0xE6C1 -0xA5FC 0xE6C2 -0xA5FD 0xE6C3 -0xA5FE 0xE6C4 -0xA640 0xE6C5 -0xA641 0xE6C6 -0xA642 0xE6C7 -0xA643 0xE6C8 -0xA644 0xE6C9 -0xA645 0xE6CA -0xA646 0xE6CB -0xA647 0xE6CC -0xA648 0xE6CD -0xA649 0xE6CE -0xA64A 0xE6CF -0xA64B 0xE6D0 -0xA64C 0xE6D1 -0xA64D 0xE6D2 -0xA64E 0xE6D3 -0xA64F 0xE6D4 -0xA650 0xE6D5 -0xA651 0xE6D6 -0xA652 0xE6D7 -0xA653 0xE6D8 -0xA654 0xE6D9 -0xA655 0xE6DA -0xA656 0xE6DB -0xA657 0xE6DC -0xA658 0xE6DD -0xA659 0xE6DE -0xA65A 0xE6DF -0xA65B 0xE6E0 -0xA65C 0xE6E1 -0xA65D 0xE6E2 -0xA65E 0xE6E3 -0xA65F 0xE6E4 -0xA660 0xE6E5 -0xA661 0xE6E6 -0xA662 0xE6E7 -0xA663 0xE6E8 -0xA664 0xE6E9 -0xA665 0xE6EA -0xA666 0xE6EB -0xA667 0xE6EC -0xA668 0xE6ED -0xA669 0xE6EE -0xA66A 0xE6EF -0xA66B 0xE6F0 -0xA66C 0xE6F1 -0xA66D 0xE6F2 -0xA66E 0xE6F3 -0xA66F 0xE6F4 -0xA670 0xE6F5 -0xA671 0xE6F6 -0xA672 0xE6F7 -0xA673 0xE6F8 -0xA674 0xE6F9 -0xA675 0xE6FA -0xA676 0xE6FB -0xA677 0xE6FC -0xA678 0xE6FD -0xA679 0xE6FE -0xA67A 0xE6FF -0xA67B 0xE700 -0xA67C 0xE701 -0xA67D 0xE702 -0xA67E 0xE703 -0xA680 0xE704 -0xA681 0xE705 -0xA682 0xE706 -0xA683 0xE707 -0xA684 0xE708 -0xA685 0xE709 -0xA686 0xE70A -0xA687 0xE70B -0xA688 0xE70C -0xA689 0xE70D -0xA68A 0xE70E -0xA68B 0xE70F -0xA68C 0xE710 -0xA68D 0xE711 -0xA68E 0xE712 -0xA68F 0xE713 -0xA690 0xE714 -0xA691 0xE715 -0xA692 0xE716 -0xA693 0xE717 -0xA694 0xE718 -0xA695 0xE719 -0xA696 0xE71A -0xA697 0xE71B -0xA698 0xE71C -0xA699 0xE71D -0xA69A 0xE71E -0xA69B 0xE71F -0xA69C 0xE720 -0xA69D 0xE721 -0xA69E 0xE722 -0xA69F 0xE723 -0xA6A0 0xE724 +0xA5F7 0xE77D +0xA5F8 0xE77E +0xA5F9 0xE77F +0xA5FA 0xE780 +0xA5FB 0xE781 +0xA5FC 0xE782 +0xA5FD 0xE783 +0xA5FE 0xE784 +0xA640 0xE6A6 +0xA641 0xE6A7 +0xA642 0xE6A8 +0xA643 0xE6A9 +0xA644 0xE6AA +0xA645 0xE6AB +0xA646 0xE6AC +0xA647 0xE6AD +0xA648 0xE6AE +0xA649 0xE6AF +0xA64A 0xE6B0 +0xA64B 0xE6B1 +0xA64C 0xE6B2 +0xA64D 0xE6B3 +0xA64E 0xE6B4 +0xA64F 0xE6B5 +0xA650 0xE6B6 +0xA651 0xE6B7 +0xA652 0xE6B8 +0xA653 0xE6B9 +0xA654 0xE6BA +0xA655 0xE6BB +0xA656 0xE6BC +0xA657 0xE6BD +0xA658 0xE6BE +0xA659 0xE6BF +0xA65A 0xE6C0 +0xA65B 0xE6C1 +0xA65C 0xE6C2 +0xA65D 0xE6C3 +0xA65E 0xE6C4 +0xA65F 0xE6C5 +0xA660 0xE6C6 +0xA661 0xE6C7 +0xA662 0xE6C8 +0xA663 0xE6C9 +0xA664 0xE6CA +0xA665 0xE6CB +0xA666 0xE6CC +0xA667 0xE6CD +0xA668 0xE6CE +0xA669 0xE6CF +0xA66A 0xE6D0 +0xA66B 0xE6D1 +0xA66C 0xE6D2 +0xA66D 0xE6D3 +0xA66E 0xE6D4 +0xA66F 0xE6D5 +0xA670 0xE6D6 +0xA671 0xE6D7 +0xA672 0xE6D8 +0xA673 0xE6D9 +0xA674 0xE6DA +0xA675 0xE6DB +0xA676 0xE6DC +0xA677 0xE6DD +0xA678 0xE6DE +0xA679 0xE6DF +0xA67A 0xE6E0 +0xA67B 0xE6E1 +0xA67C 0xE6E2 +0xA67D 0xE6E3 +0xA67E 0xE6E4 +0xA680 0xE6E5 +0xA681 0xE6E6 +0xA682 0xE6E7 +0xA683 0xE6E8 +0xA684 0xE6E9 +0xA685 0xE6EA +0xA686 0xE6EB +0xA687 0xE6EC +0xA688 0xE6ED +0xA689 0xE6EE +0xA68A 0xE6EF +0xA68B 0xE6F0 +0xA68C 0xE6F1 +0xA68D 0xE6F2 +0xA68E 0xE6F3 +0xA68F 0xE6F4 +0xA690 0xE6F5 +0xA691 0xE6F6 +0xA692 0xE6F7 +0xA693 0xE6F8 +0xA694 0xE6F9 +0xA695 0xE6FA +0xA696 0xE6FB +0xA697 0xE6FC +0xA698 0xE6FD +0xA699 0xE6FE +0xA69A 0xE6FF +0xA69B 0xE700 +0xA69C 0xE701 +0xA69D 0xE702 +0xA69E 0xE703 +0xA69F 0xE704 +0xA6A0 0xE705 0xA6A1 0x0391 0xA6A2 0x0392 0xA6A3 0x0393 @@ -7282,14 +7286,14 @@ 0xA6B6 0x03A7 0xA6B7 0x03A8 0xA6B8 0x03A9 -0xA6B9 0xE725 -0xA6BA 0xE726 -0xA6BB 0xE727 -0xA6BC 0xE728 -0xA6BD 0xE729 -0xA6BE 0xE72A -0xA6BF 0xE72B -0xA6C0 0xE72C +0xA6B9 0xE785 +0xA6BA 0xE786 +0xA6BB 0xE787 +0xA6BC 0xE788 +0xA6BD 0xE789 +0xA6BE 0xE78A +0xA6BF 0xE78B +0xA6C0 0xE78C 0xA6C1 0x03B1 0xA6C2 0x03B2 0xA6C3 0x03B3 @@ -7314,13 +7318,13 @@ 0xA6D6 0x03C7 0xA6D7 0x03C8 0xA6D8 0x03C9 -0xA6D9 0xE72D -0xA6DA 0xE72E -0xA6DB 0xE72F -0xA6DC 0xE730 -0xA6DD 0xE731 -0xA6DE 0xE732 -0xA6DF 0xE733 +0xA6D9 0xE78D +0xA6DA 0xE78E +0xA6DB 0xE78F +0xA6DC 0xE790 +0xA6DD 0xE791 +0xA6DE 0xE792 +0xA6DF 0xE793 0xA6E0 0xFE35 0xA6E1 0xFE36 0xA6E2 0xFE39 @@ -7333,121 +7337,121 @@ 0xA6E9 0xFE42 0xA6EA 0xFE43 0xA6EB 0xFE44 -0xA6EC 0xE734 -0xA6ED 0xE735 +0xA6EC 0xE794 +0xA6ED 0xE795 0xA6EE 0xFE3B 0xA6EF 0xFE3C 0xA6F0 0xFE37 0xA6F1 0xFE38 0xA6F2 0xFE31 -0xA6F3 0xE736 +0xA6F3 0xE796 0xA6F4 0xFE33 0xA6F5 0xFE34 -0xA6F6 0xE737 -0xA6F7 0xE738 -0xA6F8 0xE739 -0xA6F9 0xE73A -0xA6FA 0xE73B -0xA6FB 0xE73C -0xA6FC 0xE73D -0xA6FD 0xE73E -0xA6FE 0xE73F -0xA740 0xE740 -0xA741 0xE741 -0xA742 0xE742 -0xA743 0xE743 -0xA744 0xE744 -0xA745 0xE745 -0xA746 0xE746 -0xA747 0xE747 -0xA748 0xE748 -0xA749 0xE749 -0xA74A 0xE74A -0xA74B 0xE74B -0xA74C 0xE74C -0xA74D 0xE74D -0xA74E 0xE74E -0xA74F 0xE74F -0xA750 0xE750 -0xA751 0xE751 -0xA752 0xE752 -0xA753 0xE753 -0xA754 0xE754 -0xA755 0xE755 -0xA756 0xE756 -0xA757 0xE757 -0xA758 0xE758 -0xA759 0xE759 -0xA75A 0xE75A -0xA75B 0xE75B -0xA75C 0xE75C -0xA75D 0xE75D -0xA75E 0xE75E -0xA75F 0xE75F -0xA760 0xE760 -0xA761 0xE761 -0xA762 0xE762 -0xA763 0xE763 -0xA764 0xE764 -0xA765 0xE765 -0xA766 0xE766 -0xA767 0xE767 -0xA768 0xE768 -0xA769 0xE769 -0xA76A 0xE76A -0xA76B 0xE76B -0xA76C 0xE76C -0xA76D 0xE76D -0xA76E 0xE76E -0xA76F 0xE76F -0xA770 0xE770 -0xA771 0xE771 -0xA772 0xE772 -0xA773 0xE773 -0xA774 0xE774 -0xA775 0xE775 -0xA776 0xE776 -0xA777 0xE777 -0xA778 0xE778 -0xA779 0xE779 -0xA77A 0xE77A -0xA77B 0xE77B -0xA77C 0xE77C -0xA77D 0xE77D -0xA77E 0xE77E -0xA780 0xE77F -0xA781 0xE780 -0xA782 0xE781 -0xA783 0xE782 -0xA784 0xE783 -0xA785 0xE784 -0xA786 0xE785 -0xA787 0xE786 -0xA788 0xE787 -0xA789 0xE788 -0xA78A 0xE789 -0xA78B 0xE78A -0xA78C 0xE78B -0xA78D 0xE78C -0xA78E 0xE78D -0xA78F 0xE78E -0xA790 0xE78F -0xA791 0xE790 -0xA792 0xE791 -0xA793 0xE792 -0xA794 0xE793 -0xA795 0xE794 -0xA796 0xE795 -0xA797 0xE796 -0xA798 0xE797 -0xA799 0xE798 -0xA79A 0xE799 -0xA79B 0xE79A -0xA79C 0xE79B -0xA79D 0xE79C -0xA79E 0xE79D -0xA79F 0xE79E -0xA7A0 0xE79F +0xA6F6 0xE797 +0xA6F7 0xE798 +0xA6F8 0xE799 +0xA6F9 0xE79A +0xA6FA 0xE79B +0xA6FB 0xE79C +0xA6FC 0xE79D +0xA6FD 0xE79E +0xA6FE 0xE79F +0xA740 0xE706 +0xA741 0xE707 +0xA742 0xE708 +0xA743 0xE709 +0xA744 0xE70A +0xA745 0xE70B +0xA746 0xE70C +0xA747 0xE70D +0xA748 0xE70E +0xA749 0xE70F +0xA74A 0xE710 +0xA74B 0xE711 +0xA74C 0xE712 +0xA74D 0xE713 +0xA74E 0xE714 +0xA74F 0xE715 +0xA750 0xE716 +0xA751 0xE717 +0xA752 0xE718 +0xA753 0xE719 +0xA754 0xE71A +0xA755 0xE71B +0xA756 0xE71C +0xA757 0xE71D +0xA758 0xE71E +0xA759 0xE71F +0xA75A 0xE720 +0xA75B 0xE721 +0xA75C 0xE722 +0xA75D 0xE723 +0xA75E 0xE724 +0xA75F 0xE725 +0xA760 0xE726 +0xA761 0xE727 +0xA762 0xE728 +0xA763 0xE729 +0xA764 0xE72A +0xA765 0xE72B +0xA766 0xE72C +0xA767 0xE72D +0xA768 0xE72E +0xA769 0xE72F +0xA76A 0xE730 +0xA76B 0xE731 +0xA76C 0xE732 +0xA76D 0xE733 +0xA76E 0xE734 +0xA76F 0xE735 +0xA770 0xE736 +0xA771 0xE737 +0xA772 0xE738 +0xA773 0xE739 +0xA774 0xE73A +0xA775 0xE73B +0xA776 0xE73C +0xA777 0xE73D +0xA778 0xE73E +0xA779 0xE73F +0xA77A 0xE740 +0xA77B 0xE741 +0xA77C 0xE742 +0xA77D 0xE743 +0xA77E 0xE744 +0xA780 0xE745 +0xA781 0xE746 +0xA782 0xE747 +0xA783 0xE748 +0xA784 0xE749 +0xA785 0xE74A +0xA786 0xE74B +0xA787 0xE74C +0xA788 0xE74D +0xA789 0xE74E +0xA78A 0xE74F +0xA78B 0xE750 +0xA78C 0xE751 +0xA78D 0xE752 +0xA78E 0xE753 +0xA78F 0xE754 +0xA790 0xE755 +0xA791 0xE756 +0xA792 0xE757 +0xA793 0xE758 +0xA794 0xE759 +0xA795 0xE75A +0xA796 0xE75B +0xA797 0xE75C +0xA798 0xE75D +0xA799 0xE75E +0xA79A 0xE75F +0xA79B 0xE760 +0xA79C 0xE761 +0xA79D 0xE762 +0xA79E 0xE763 +0xA79F 0xE764 +0xA7A0 0xE765 0xA7A1 0x0410 0xA7A2 0x0411 0xA7A3 0x0412 diff --git a/jdk/make/tools/CharsetMapping/MS936.map b/jdk/make/tools/CharsetMapping/MS936.map index f5df8d50854..b37fd9d240e 100644 --- a/jdk/make/tools/CharsetMapping/MS936.map +++ b/jdk/make/tools/CharsetMapping/MS936.map @@ -1,31 +1,8 @@ -# Copy/pasted from MS936.b2c # -# This table comes from MS CP936 table posted on unicode.org webpage -# with the modifications of +# This table comes from MultiByteToWideChar, the only entry +# not included is # -# (1)added Euro sign -# 0x80 - 0x20ac -# (2)removed DBCS lead byte entries -# 0x80 - 0xff -# (3)added GBK UDC block (1894) -# 0xAAA1 - 0xAFFE U+E000 - U+E233 -# 0xF8A1 - 0xFEFE U+E234 - U+E4C5 -# 0xA140 - 0xA7A0 U+E4C6 - U+E79F -# (4)added Microsoft defined "not GBK" EUDC -# a: u+E586 - u+E591 -# b: u+E652 - u+E65C -# c: u+E6BD - u+E6C4 -# d: u+E725 - u+E73F -# e: u+E7A0 - u+E864 -# -# Mapping of (3) and (4) comes from Masayuki Fuse at FUSE@jp.ibm.com -# -# Format: Three tab-separated columns -# Column #1 is the cp936 code (in hex) -# Column #2 is the Unicode (in hex as 0xXXXX) -# Column #3 is the Unicode name (follows a comment sign, '#') -# -# The entries are in unicode order +# 0xFF 0xF8F5 # 0x00 0x0000 0x01 0x0001 @@ -6533,12 +6510,12 @@ 0xA2A8 0x2177 #SMALL ROMAN NUMERAL EIGHT 0xA2A9 0x2178 #SMALL ROMAN NUMERAL NINE 0xA2AA 0x2179 #SMALL ROMAN NUMERAL TEN -0xA2AB 0xE586 #PRIVATE USE AREA-E586 -0xA2AC 0xE587 #PRIVATE USE AREA-E587 -0xA2AD 0xE588 #PRIVATE USE AREA-E588 -0xA2AE 0xE589 #PRIVATE USE AREA-E589 -0xA2AF 0xE58A #PRIVATE USE AREA-E58A -0xA2B0 0xE58B #PRIVATE USE AREA-E58B +0xA2AB 0xE766 #PRIVATE USE AREA-E766 +0xA2AC 0xE767 #PRIVATE USE AREA-E767 +0xA2AD 0xE768 #PRIVATE USE AREA-E768 +0xA2AE 0xE769 #PRIVATE USE AREA-E769 +0xA2AF 0xE76A #PRIVATE USE AREA-E76A +0xA2B0 0xE76B #PRIVATE USE AREA-E76B 0xA2B1 0x2488 #DIGIT ONE FULL STOP 0xA2B2 0x2489 #DIGIT TWO FULL STOP 0xA2B3 0x248A #DIGIT THREE FULL STOP @@ -6589,8 +6566,8 @@ 0xA2E0 0x2467 #CIRCLED DIGIT EIGHT 0xA2E1 0x2468 #CIRCLED DIGIT NINE 0xA2E2 0x2469 #CIRCLED NUMBER TEN -0xA2E3 0xE58C #PRIVATE USE AREA-E58C -0xA2E4 0xE58D #PRIVATE USE AREA-E58D +0xA2E3 0xE76C #PRIVATE USE AREA-E76C +0xA2E4 0xE76D #PRIVATE USE AREA-E76D 0xA2E5 0x3220 #PARENTHESIZED IDEOGRAPH ONE 0xA2E6 0x3221 #PARENTHESIZED IDEOGRAPH TWO 0xA2E7 0x3222 #PARENTHESIZED IDEOGRAPH THREE @@ -6601,8 +6578,8 @@ 0xA2EC 0x3227 #PARENTHESIZED IDEOGRAPH EIGHT 0xA2ED 0x3228 #PARENTHESIZED IDEOGRAPH NINE 0xA2EE 0x3229 #PARENTHESIZED IDEOGRAPH TEN -0xA2EF 0xE58E #PRIVATE USE AREA-E58E -0xA2F0 0xE58F #PRIVATE USE AREA-E58F +0xA2EF 0xE76E #PRIVATE USE AREA-E76E +0xA2F0 0xE76F #PRIVATE USE AREA-E76F 0xA2F1 0x2160 #ROMAN NUMERAL ONE 0xA2F2 0x2161 #ROMAN NUMERAL TWO 0xA2F3 0x2162 #ROMAN NUMERAL THREE @@ -6615,104 +6592,104 @@ 0xA2FA 0x2169 #ROMAN NUMERAL TEN 0xA2FB 0x216A #ROMAN NUMERAL ELEVEN 0xA2FC 0x216B #ROMAN NUMERAL TWELVE -0xA2FD 0xE590 #PRIVATE USE AREA-E590 -0xA2FE 0xE591 #PRIVATE USE AREA-E591 -0xA340 0xE592 #PRIVATE USE AREA-E592 -0xA341 0xE593 #PRIVATE USE AREA-E593 -0xA342 0xE594 #PRIVATE USE AREA-E594 -0xA343 0xE595 #PRIVATE USE AREA-E595 -0xA344 0xE596 #PRIVATE USE AREA-E596 -0xA345 0xE597 #PRIVATE USE AREA-E597 -0xA346 0xE598 #PRIVATE USE AREA-E598 -0xA347 0xE599 #PRIVATE USE AREA-E599 -0xA348 0xE59A #PRIVATE USE AREA-E59A -0xA349 0xE59B #PRIVATE USE AREA-E59B -0xA34A 0xE59C #PRIVATE USE AREA-E59C -0xA34B 0xE59D #PRIVATE USE AREA-E59D -0xA34C 0xE59E #PRIVATE USE AREA-E59E -0xA34D 0xE59F #PRIVATE USE AREA-E59F -0xA34E 0xE5A0 #PRIVATE USE AREA-E5A0 -0xA34F 0xE5A1 #PRIVATE USE AREA-E5A1 -0xA350 0xE5A2 #PRIVATE USE AREA-E5A2 -0xA351 0xE5A3 #PRIVATE USE AREA-E5A3 -0xA352 0xE5A4 #PRIVATE USE AREA-E5A4 -0xA353 0xE5A5 #PRIVATE USE AREA-E5A5 -0xA354 0xE5A6 #PRIVATE USE AREA-E5A6 -0xA355 0xE5A7 #PRIVATE USE AREA-E5A7 -0xA356 0xE5A8 #PRIVATE USE AREA-E5A8 -0xA357 0xE5A9 #PRIVATE USE AREA-E5A9 -0xA358 0xE5AA #PRIVATE USE AREA-E5AA -0xA359 0xE5AB #PRIVATE USE AREA-E5AB -0xA35A 0xE5AC #PRIVATE USE AREA-E5AC -0xA35B 0xE5AD #PRIVATE USE AREA-E5AD -0xA35C 0xE5AE #PRIVATE USE AREA-E5AE -0xA35D 0xE5AF #PRIVATE USE AREA-E5AF -0xA35E 0xE5B0 #PRIVATE USE AREA-E5B0 -0xA35F 0xE5B1 #PRIVATE USE AREA-E5B1 -0xA360 0xE5B2 #PRIVATE USE AREA-E5B2 -0xA361 0xE5B3 #PRIVATE USE AREA-E5B3 -0xA362 0xE5B4 #PRIVATE USE AREA-E5B4 -0xA363 0xE5B5 #PRIVATE USE AREA-E5B5 -0xA364 0xE5B6 #PRIVATE USE AREA-E5B6 -0xA365 0xE5B7 #PRIVATE USE AREA-E5B7 -0xA366 0xE5B8 #PRIVATE USE AREA-E5B8 -0xA367 0xE5B9 #PRIVATE USE AREA-E5B9 -0xA368 0xE5BA #PRIVATE USE AREA-E5BA -0xA369 0xE5BB #PRIVATE USE AREA-E5BB -0xA36A 0xE5BC #PRIVATE USE AREA-E5BC -0xA36B 0xE5BD #PRIVATE USE AREA-E5BD -0xA36C 0xE5BE #PRIVATE USE AREA-E5BE -0xA36D 0xE5BF #PRIVATE USE AREA-E5BF -0xA36E 0xE5C0 #PRIVATE USE AREA-E5C0 -0xA36F 0xE5C1 #PRIVATE USE AREA-E5C1 -0xA370 0xE5C2 #PRIVATE USE AREA-E5C2 -0xA371 0xE5C3 #PRIVATE USE AREA-E5C3 -0xA372 0xE5C4 #PRIVATE USE AREA-E5C4 -0xA373 0xE5C5 #PRIVATE USE AREA-E5C5 -0xA374 0xE5C6 #PRIVATE USE AREA-E5C6 -0xA375 0xE5C7 #PRIVATE USE AREA-E5C7 -0xA376 0xE5C8 #PRIVATE USE AREA-E5C8 -0xA377 0xE5C9 #PRIVATE USE AREA-E5C9 -0xA378 0xE5CA #PRIVATE USE AREA-E5CA -0xA379 0xE5CB #PRIVATE USE AREA-E5CB -0xA37A 0xE5CC #PRIVATE USE AREA-E5CC -0xA37B 0xE5CD #PRIVATE USE AREA-E5CD -0xA37C 0xE5CE #PRIVATE USE AREA-E5CE -0xA37D 0xE5CF #PRIVATE USE AREA-E5CF -0xA37E 0xE5D0 #PRIVATE USE AREA-E5D0 -0xA380 0xE5D1 #PRIVATE USE AREA-E5D1 -0xA381 0xE5D2 #PRIVATE USE AREA-E5D2 -0xA382 0xE5D3 #PRIVATE USE AREA-E5D3 -0xA383 0xE5D4 #PRIVATE USE AREA-E5D4 -0xA384 0xE5D5 #PRIVATE USE AREA-E5D5 -0xA385 0xE5D6 #PRIVATE USE AREA-E5D6 -0xA386 0xE5D7 #PRIVATE USE AREA-E5D7 -0xA387 0xE5D8 #PRIVATE USE AREA-E5D8 -0xA388 0xE5D9 #PRIVATE USE AREA-E5D9 -0xA389 0xE5DA #PRIVATE USE AREA-E5DA -0xA38A 0xE5DB #PRIVATE USE AREA-E5DB -0xA38B 0xE5DC #PRIVATE USE AREA-E5DC -0xA38C 0xE5DD #PRIVATE USE AREA-E5DD -0xA38D 0xE5DE #PRIVATE USE AREA-E5DE -0xA38E 0xE5DF #PRIVATE USE AREA-E5DF -0xA38F 0xE5E0 #PRIVATE USE AREA-E5E0 -0xA390 0xE5E1 #PRIVATE USE AREA-E5E1 -0xA391 0xE5E2 #PRIVATE USE AREA-E5E2 -0xA392 0xE5E3 #PRIVATE USE AREA-E5E3 -0xA393 0xE5E4 #PRIVATE USE AREA-E5E4 -0xA394 0xE5E5 #PRIVATE USE AREA-E5E5 -0xA395 0xE5E6 #PRIVATE USE AREA-E5E6 -0xA396 0xE5E7 #PRIVATE USE AREA-E5E7 -0xA397 0xE5E8 #PRIVATE USE AREA-E5E8 -0xA398 0xE5E9 #PRIVATE USE AREA-E5E9 -0xA399 0xE5EA #PRIVATE USE AREA-E5EA -0xA39A 0xE5EB #PRIVATE USE AREA-E5EB -0xA39B 0xE5EC #PRIVATE USE AREA-E5EC -0xA39C 0xE5ED #PRIVATE USE AREA-E5ED -0xA39D 0xE5EE #PRIVATE USE AREA-E5EE -0xA39E 0xE5EF #PRIVATE USE AREA-E5EF -0xA39F 0xE5F0 #PRIVATE USE AREA-E5F0 -0xA3A0 0xE5F1 #PRIVATE USE AREA-E5F1 +0xA2FD 0xE770 #PRIVATE USE AREA-E770 +0xA2FE 0xE771 #PRIVATE USE AREA-E771 +0xA340 0xE586 #PRIVATE USE AREA-E586 +0xA341 0xE587 #PRIVATE USE AREA-E587 +0xA342 0xE588 #PRIVATE USE AREA-E588 +0xA343 0xE589 #PRIVATE USE AREA-E589 +0xA344 0xE58A #PRIVATE USE AREA-E58A +0xA345 0xE58B #PRIVATE USE AREA-E58B +0xA346 0xE58C #PRIVATE USE AREA-E58C +0xA347 0xE58D #PRIVATE USE AREA-E58D +0xA348 0xE58E #PRIVATE USE AREA-E58E +0xA349 0xE58F #PRIVATE USE AREA-E58F +0xA34A 0xE590 #PRIVATE USE AREA-E590 +0xA34B 0xE591 #PRIVATE USE AREA-E591 +0xA34C 0xE592 #PRIVATE USE AREA-E592 +0xA34D 0xE593 #PRIVATE USE AREA-E593 +0xA34E 0xE594 #PRIVATE USE AREA-E594 +0xA34F 0xE595 #PRIVATE USE AREA-E595 +0xA350 0xE596 #PRIVATE USE AREA-E596 +0xA351 0xE597 #PRIVATE USE AREA-E597 +0xA352 0xE598 #PRIVATE USE AREA-E598 +0xA353 0xE599 #PRIVATE USE AREA-E599 +0xA354 0xE59A #PRIVATE USE AREA-E59A +0xA355 0xE59B #PRIVATE USE AREA-E59B +0xA356 0xE59C #PRIVATE USE AREA-E59C +0xA357 0xE59D #PRIVATE USE AREA-E59D +0xA358 0xE59E #PRIVATE USE AREA-E59E +0xA359 0xE59F #PRIVATE USE AREA-E59F +0xA35A 0xE5A0 #PRIVATE USE AREA-E5A0 +0xA35B 0xE5A1 #PRIVATE USE AREA-E5A1 +0xA35C 0xE5A2 #PRIVATE USE AREA-E5A2 +0xA35D 0xE5A3 #PRIVATE USE AREA-E5A3 +0xA35E 0xE5A4 #PRIVATE USE AREA-E5A4 +0xA35F 0xE5A5 #PRIVATE USE AREA-E5A5 +0xA360 0xE5A6 #PRIVATE USE AREA-E5A6 +0xA361 0xE5A7 #PRIVATE USE AREA-E5A7 +0xA362 0xE5A8 #PRIVATE USE AREA-E5A8 +0xA363 0xE5A9 #PRIVATE USE AREA-E5A9 +0xA364 0xE5AA #PRIVATE USE AREA-E5AA +0xA365 0xE5AB #PRIVATE USE AREA-E5AB +0xA366 0xE5AC #PRIVATE USE AREA-E5AC +0xA367 0xE5AD #PRIVATE USE AREA-E5AD +0xA368 0xE5AE #PRIVATE USE AREA-E5AE +0xA369 0xE5AF #PRIVATE USE AREA-E5AF +0xA36A 0xE5B0 #PRIVATE USE AREA-E5B0 +0xA36B 0xE5B1 #PRIVATE USE AREA-E5B1 +0xA36C 0xE5B2 #PRIVATE USE AREA-E5B2 +0xA36D 0xE5B3 #PRIVATE USE AREA-E5B3 +0xA36E 0xE5B4 #PRIVATE USE AREA-E5B4 +0xA36F 0xE5B5 #PRIVATE USE AREA-E5B5 +0xA370 0xE5B6 #PRIVATE USE AREA-E5B6 +0xA371 0xE5B7 #PRIVATE USE AREA-E5B7 +0xA372 0xE5B8 #PRIVATE USE AREA-E5B8 +0xA373 0xE5B9 #PRIVATE USE AREA-E5B9 +0xA374 0xE5BA #PRIVATE USE AREA-E5BA +0xA375 0xE5BB #PRIVATE USE AREA-E5BB +0xA376 0xE5BC #PRIVATE USE AREA-E5BC +0xA377 0xE5BD #PRIVATE USE AREA-E5BD +0xA378 0xE5BE #PRIVATE USE AREA-E5BE +0xA379 0xE5BF #PRIVATE USE AREA-E5BF +0xA37A 0xE5C0 #PRIVATE USE AREA-E5C0 +0xA37B 0xE5C1 #PRIVATE USE AREA-E5C1 +0xA37C 0xE5C2 #PRIVATE USE AREA-E5C2 +0xA37D 0xE5C3 #PRIVATE USE AREA-E5C3 +0xA37E 0xE5C4 #PRIVATE USE AREA-E5C4 +0xA380 0xE5C5 #PRIVATE USE AREA-E5C5 +0xA381 0xE5C6 #PRIVATE USE AREA-E5C6 +0xA382 0xE5C7 #PRIVATE USE AREA-E5C7 +0xA383 0xE5C8 #PRIVATE USE AREA-E5C8 +0xA384 0xE5C9 #PRIVATE USE AREA-E5C9 +0xA385 0xE5CA #PRIVATE USE AREA-E5CA +0xA386 0xE5CB #PRIVATE USE AREA-E5CB +0xA387 0xE5CC #PRIVATE USE AREA-E5CC +0xA388 0xE5CD #PRIVATE USE AREA-E5CD +0xA389 0xE5CE #PRIVATE USE AREA-E5CE +0xA38A 0xE5CF #PRIVATE USE AREA-E5CF +0xA38B 0xE5D0 #PRIVATE USE AREA-E5D0 +0xA38C 0xE5D1 #PRIVATE USE AREA-E5D1 +0xA38D 0xE5D2 #PRIVATE USE AREA-E5D2 +0xA38E 0xE5D3 #PRIVATE USE AREA-E5D3 +0xA38F 0xE5D4 #PRIVATE USE AREA-E5D4 +0xA390 0xE5D5 #PRIVATE USE AREA-E5D5 +0xA391 0xE5D6 #PRIVATE USE AREA-E5D6 +0xA392 0xE5D7 #PRIVATE USE AREA-E5D7 +0xA393 0xE5D8 #PRIVATE USE AREA-E5D8 +0xA394 0xE5D9 #PRIVATE USE AREA-E5D9 +0xA395 0xE5DA #PRIVATE USE AREA-E5DA +0xA396 0xE5DB #PRIVATE USE AREA-E5DB +0xA397 0xE5DC #PRIVATE USE AREA-E5DC +0xA398 0xE5DD #PRIVATE USE AREA-E5DD +0xA399 0xE5DE #PRIVATE USE AREA-E5DE +0xA39A 0xE5DF #PRIVATE USE AREA-E5DF +0xA39B 0xE5E0 #PRIVATE USE AREA-E5E0 +0xA39C 0xE5E1 #PRIVATE USE AREA-E5E1 +0xA39D 0xE5E2 #PRIVATE USE AREA-E5E2 +0xA39E 0xE5E3 #PRIVATE USE AREA-E5E3 +0xA39F 0xE5E4 #PRIVATE USE AREA-E5E4 +0xA3A0 0xE5E5 #PRIVATE USE AREA-E5E5 0xA3A1 0xFF01 #FULLWIDTH EXCLAMATION MARK 0xA3A2 0xFF02 #FULLWIDTH QUOTATION MARK 0xA3A3 0xFF03 #FULLWIDTH NUMBER SIGN @@ -6807,102 +6784,102 @@ 0xA3FC 0xFF5C #FULLWIDTH VERTICAL LINE 0xA3FD 0xFF5D #FULLWIDTH RIGHT CURLY BRACKET 0xA3FE 0xFFE3 #FULLWIDTH MACRON -0xA440 0xE5F2 #PRIVATE USE AREA-E5F2 -0xA441 0xE5F3 #PRIVATE USE AREA-E5F3 -0xA442 0xE5F4 #PRIVATE USE AREA-E5F4 -0xA443 0xE5F5 #PRIVATE USE AREA-E5F5 -0xA444 0xE5F6 #PRIVATE USE AREA-E5F6 -0xA445 0xE5F7 #PRIVATE USE AREA-E5F7 -0xA446 0xE5F8 #PRIVATE USE AREA-E5F8 -0xA447 0xE5F9 #PRIVATE USE AREA-E5F9 -0xA448 0xE5FA #PRIVATE USE AREA-E5FA -0xA449 0xE5FB #PRIVATE USE AREA-E5FB -0xA44A 0xE5FC #PRIVATE USE AREA-E5FC -0xA44B 0xE5FD #PRIVATE USE AREA-E5FD -0xA44C 0xE5FE #PRIVATE USE AREA-E5FE -0xA44D 0xE5FF #PRIVATE USE AREA-E5FF -0xA44E 0xE600 #PRIVATE USE AREA-E600 -0xA44F 0xE601 #PRIVATE USE AREA-E601 -0xA450 0xE602 #PRIVATE USE AREA-E602 -0xA451 0xE603 #PRIVATE USE AREA-E603 -0xA452 0xE604 #PRIVATE USE AREA-E604 -0xA453 0xE605 #PRIVATE USE AREA-E605 -0xA454 0xE606 #PRIVATE USE AREA-E606 -0xA455 0xE607 #PRIVATE USE AREA-E607 -0xA456 0xE608 #PRIVATE USE AREA-E608 -0xA457 0xE609 #PRIVATE USE AREA-E609 -0xA458 0xE60A #PRIVATE USE AREA-E60A -0xA459 0xE60B #PRIVATE USE AREA-E60B -0xA45A 0xE60C #PRIVATE USE AREA-E60C -0xA45B 0xE60D #PRIVATE USE AREA-E60D -0xA45C 0xE60E #PRIVATE USE AREA-E60E -0xA45D 0xE60F #PRIVATE USE AREA-E60F -0xA45E 0xE610 #PRIVATE USE AREA-E610 -0xA45F 0xE611 #PRIVATE USE AREA-E611 -0xA460 0xE612 #PRIVATE USE AREA-E612 -0xA461 0xE613 #PRIVATE USE AREA-E613 -0xA462 0xE614 #PRIVATE USE AREA-E614 -0xA463 0xE615 #PRIVATE USE AREA-E615 -0xA464 0xE616 #PRIVATE USE AREA-E616 -0xA465 0xE617 #PRIVATE USE AREA-E617 -0xA466 0xE618 #PRIVATE USE AREA-E618 -0xA467 0xE619 #PRIVATE USE AREA-E619 -0xA468 0xE61A #PRIVATE USE AREA-E61A -0xA469 0xE61B #PRIVATE USE AREA-E61B -0xA46A 0xE61C #PRIVATE USE AREA-E61C -0xA46B 0xE61D #PRIVATE USE AREA-E61D -0xA46C 0xE61E #PRIVATE USE AREA-E61E -0xA46D 0xE61F #PRIVATE USE AREA-E61F -0xA46E 0xE620 #PRIVATE USE AREA-E620 -0xA46F 0xE621 #PRIVATE USE AREA-E621 -0xA470 0xE622 #PRIVATE USE AREA-E622 -0xA471 0xE623 #PRIVATE USE AREA-E623 -0xA472 0xE624 #PRIVATE USE AREA-E624 -0xA473 0xE625 #PRIVATE USE AREA-E625 -0xA474 0xE626 #PRIVATE USE AREA-E626 -0xA475 0xE627 #PRIVATE USE AREA-E627 -0xA476 0xE628 #PRIVATE USE AREA-E628 -0xA477 0xE629 #PRIVATE USE AREA-E629 -0xA478 0xE62A #PRIVATE USE AREA-E62A -0xA479 0xE62B #PRIVATE USE AREA-E62B -0xA47A 0xE62C #PRIVATE USE AREA-E62C -0xA47B 0xE62D #PRIVATE USE AREA-E62D -0xA47C 0xE62E #PRIVATE USE AREA-E62E -0xA47D 0xE62F #PRIVATE USE AREA-E62F -0xA47E 0xE630 #PRIVATE USE AREA-E630 -0xA480 0xE631 #PRIVATE USE AREA-E631 -0xA481 0xE632 #PRIVATE USE AREA-E632 -0xA482 0xE633 #PRIVATE USE AREA-E633 -0xA483 0xE634 #PRIVATE USE AREA-E634 -0xA484 0xE635 #PRIVATE USE AREA-E635 -0xA485 0xE636 #PRIVATE USE AREA-E636 -0xA486 0xE637 #PRIVATE USE AREA-E637 -0xA487 0xE638 #PRIVATE USE AREA-E638 -0xA488 0xE639 #PRIVATE USE AREA-E639 -0xA489 0xE63A #PRIVATE USE AREA-E63A -0xA48A 0xE63B #PRIVATE USE AREA-E63B -0xA48B 0xE63C #PRIVATE USE AREA-E63C -0xA48C 0xE63D #PRIVATE USE AREA-E63D -0xA48D 0xE63E #PRIVATE USE AREA-E63E -0xA48E 0xE63F #PRIVATE USE AREA-E63F -0xA48F 0xE640 #PRIVATE USE AREA-E640 -0xA490 0xE641 #PRIVATE USE AREA-E641 -0xA491 0xE642 #PRIVATE USE AREA-E642 -0xA492 0xE643 #PRIVATE USE AREA-E643 -0xA493 0xE644 #PRIVATE USE AREA-E644 -0xA494 0xE645 #PRIVATE USE AREA-E645 -0xA495 0xE646 #PRIVATE USE AREA-E646 -0xA496 0xE647 #PRIVATE USE AREA-E647 -0xA497 0xE648 #PRIVATE USE AREA-E648 -0xA498 0xE649 #PRIVATE USE AREA-E649 -0xA499 0xE64A #PRIVATE USE AREA-E64A -0xA49A 0xE64B #PRIVATE USE AREA-E64B -0xA49B 0xE64C #PRIVATE USE AREA-E64C -0xA49C 0xE64D #PRIVATE USE AREA-E64D -0xA49D 0xE64E #PRIVATE USE AREA-E64E -0xA49E 0xE64F #PRIVATE USE AREA-E64F -0xA49F 0xE650 #PRIVATE USE AREA-E650 -0xA4A0 0xE651 #PRIVATE USE AREA-E651 +0xA440 0xE5E6 #PRIVATE USE AREA-E5E6 +0xA441 0xE5E7 #PRIVATE USE AREA-E5E7 +0xA442 0xE5E8 #PRIVATE USE AREA-E5E8 +0xA443 0xE5E9 #PRIVATE USE AREA-E5E9 +0xA444 0xE5EA #PRIVATE USE AREA-E5EA +0xA445 0xE5EB #PRIVATE USE AREA-E5EB +0xA446 0xE5EC #PRIVATE USE AREA-E5EC +0xA447 0xE5ED #PRIVATE USE AREA-E5ED +0xA448 0xE5EE #PRIVATE USE AREA-E5EE +0xA449 0xE5EF #PRIVATE USE AREA-E5EF +0xA44A 0xE5F0 #PRIVATE USE AREA-E5F0 +0xA44B 0xE5F1 #PRIVATE USE AREA-E5F1 +0xA44C 0xE5F2 #PRIVATE USE AREA-E5F2 +0xA44D 0xE5F3 #PRIVATE USE AREA-E5F3 +0xA44E 0xE5F4 #PRIVATE USE AREA-E5F4 +0xA44F 0xE5F5 #PRIVATE USE AREA-E5F5 +0xA450 0xE5F6 #PRIVATE USE AREA-E5F6 +0xA451 0xE5F7 #PRIVATE USE AREA-E5F7 +0xA452 0xE5F8 #PRIVATE USE AREA-E5F8 +0xA453 0xE5F9 #PRIVATE USE AREA-E5F9 +0xA454 0xE5FA #PRIVATE USE AREA-E5FA +0xA455 0xE5FB #PRIVATE USE AREA-E5FB +0xA456 0xE5FC #PRIVATE USE AREA-E5FC +0xA457 0xE5FD #PRIVATE USE AREA-E5FD +0xA458 0xE5FE #PRIVATE USE AREA-E5FE +0xA459 0xE5FF #PRIVATE USE AREA-E5FF +0xA45A 0xE600 #PRIVATE USE AREA-E600 +0xA45B 0xE601 #PRIVATE USE AREA-E601 +0xA45C 0xE602 #PRIVATE USE AREA-E602 +0xA45D 0xE603 #PRIVATE USE AREA-E603 +0xA45E 0xE604 #PRIVATE USE AREA-E604 +0xA45F 0xE605 #PRIVATE USE AREA-E605 +0xA460 0xE606 #PRIVATE USE AREA-E606 +0xA461 0xE607 #PRIVATE USE AREA-E607 +0xA462 0xE608 #PRIVATE USE AREA-E608 +0xA463 0xE609 #PRIVATE USE AREA-E609 +0xA464 0xE60A #PRIVATE USE AREA-E60A +0xA465 0xE60B #PRIVATE USE AREA-E60B +0xA466 0xE60C #PRIVATE USE AREA-E60C +0xA467 0xE60D #PRIVATE USE AREA-E60D +0xA468 0xE60E #PRIVATE USE AREA-E60E +0xA469 0xE60F #PRIVATE USE AREA-E60F +0xA46A 0xE610 #PRIVATE USE AREA-E610 +0xA46B 0xE611 #PRIVATE USE AREA-E611 +0xA46C 0xE612 #PRIVATE USE AREA-E612 +0xA46D 0xE613 #PRIVATE USE AREA-E613 +0xA46E 0xE614 #PRIVATE USE AREA-E614 +0xA46F 0xE615 #PRIVATE USE AREA-E615 +0xA470 0xE616 #PRIVATE USE AREA-E616 +0xA471 0xE617 #PRIVATE USE AREA-E617 +0xA472 0xE618 #PRIVATE USE AREA-E618 +0xA473 0xE619 #PRIVATE USE AREA-E619 +0xA474 0xE61A #PRIVATE USE AREA-E61A +0xA475 0xE61B #PRIVATE USE AREA-E61B +0xA476 0xE61C #PRIVATE USE AREA-E61C +0xA477 0xE61D #PRIVATE USE AREA-E61D +0xA478 0xE61E #PRIVATE USE AREA-E61E +0xA479 0xE61F #PRIVATE USE AREA-E61F +0xA47A 0xE620 #PRIVATE USE AREA-E620 +0xA47B 0xE621 #PRIVATE USE AREA-E621 +0xA47C 0xE622 #PRIVATE USE AREA-E622 +0xA47D 0xE623 #PRIVATE USE AREA-E623 +0xA47E 0xE624 #PRIVATE USE AREA-E624 +0xA480 0xE625 #PRIVATE USE AREA-E625 +0xA481 0xE626 #PRIVATE USE AREA-E626 +0xA482 0xE627 #PRIVATE USE AREA-E627 +0xA483 0xE628 #PRIVATE USE AREA-E628 +0xA484 0xE629 #PRIVATE USE AREA-E629 +0xA485 0xE62A #PRIVATE USE AREA-E62A +0xA486 0xE62B #PRIVATE USE AREA-E62B +0xA487 0xE62C #PRIVATE USE AREA-E62C +0xA488 0xE62D #PRIVATE USE AREA-E62D +0xA489 0xE62E #PRIVATE USE AREA-E62E +0xA48A 0xE62F #PRIVATE USE AREA-E62F +0xA48B 0xE630 #PRIVATE USE AREA-E630 +0xA48C 0xE631 #PRIVATE USE AREA-E631 +0xA48D 0xE632 #PRIVATE USE AREA-E632 +0xA48E 0xE633 #PRIVATE USE AREA-E633 +0xA48F 0xE634 #PRIVATE USE AREA-E634 +0xA490 0xE635 #PRIVATE USE AREA-E635 +0xA491 0xE636 #PRIVATE USE AREA-E636 +0xA492 0xE637 #PRIVATE USE AREA-E637 +0xA493 0xE638 #PRIVATE USE AREA-E638 +0xA494 0xE639 #PRIVATE USE AREA-E639 +0xA495 0xE63A #PRIVATE USE AREA-E63A +0xA496 0xE63B #PRIVATE USE AREA-E63B +0xA497 0xE63C #PRIVATE USE AREA-E63C +0xA498 0xE63D #PRIVATE USE AREA-E63D +0xA499 0xE63E #PRIVATE USE AREA-E63E +0xA49A 0xE63F #PRIVATE USE AREA-E63F +0xA49B 0xE640 #PRIVATE USE AREA-E640 +0xA49C 0xE641 #PRIVATE USE AREA-E641 +0xA49D 0xE642 #PRIVATE USE AREA-E642 +0xA49E 0xE643 #PRIVATE USE AREA-E643 +0xA49F 0xE644 #PRIVATE USE AREA-E644 +0xA4A0 0xE645 #PRIVATE USE AREA-E645 0xA4A1 0x3041 #HIRAGANA LETTER SMALL A 0xA4A2 0x3042 #HIRAGANA LETTER A 0xA4A3 0x3043 #HIRAGANA LETTER SMALL I @@ -6986,113 +6963,113 @@ 0xA4F1 0x3091 #HIRAGANA LETTER WE 0xA4F2 0x3092 #HIRAGANA LETTER WO 0xA4F3 0x3093 #HIRAGANA LETTER N -0xA4F4 0xE652 #PRIVATE USE AREA-E652 -0xA4F5 0xE653 #PRIVATE USE AREA-E653 -0xA4F6 0xE654 #PRIVATE USE AREA-E654 -0xA4F7 0xE655 #PRIVATE USE AREA-E655 -0xA4F8 0xE656 #PRIVATE USE AREA-E656 -0xA4F9 0xE657 #PRIVATE USE AREA-E657 -0xA4FA 0xE658 #PRIVATE USE AREA-E658 -0xA4FB 0xE659 #PRIVATE USE AREA-E659 -0xA4FC 0xE65A #PRIVATE USE AREA-E65A -0xA4FD 0xE65B #PRIVATE USE AREA-E65B -0xA4FE 0xE65C #PRIVATE USE AREA-E65C -0xA540 0xE65D #PRIVATE USE AREA-E65D -0xA541 0xE65E #PRIVATE USE AREA-E65E -0xA542 0xE65F #PRIVATE USE AREA-E65F -0xA543 0xE660 #PRIVATE USE AREA-E660 -0xA544 0xE661 #PRIVATE USE AREA-E661 -0xA545 0xE662 #PRIVATE USE AREA-E662 -0xA546 0xE663 #PRIVATE USE AREA-E663 -0xA547 0xE664 #PRIVATE USE AREA-E664 -0xA548 0xE665 #PRIVATE USE AREA-E665 -0xA549 0xE666 #PRIVATE USE AREA-E666 -0xA54A 0xE667 #PRIVATE USE AREA-E667 -0xA54B 0xE668 #PRIVATE USE AREA-E668 -0xA54C 0xE669 #PRIVATE USE AREA-E669 -0xA54D 0xE66A #PRIVATE USE AREA-E66A -0xA54E 0xE66B #PRIVATE USE AREA-E66B -0xA54F 0xE66C #PRIVATE USE AREA-E66C -0xA550 0xE66D #PRIVATE USE AREA-E66D -0xA551 0xE66E #PRIVATE USE AREA-E66E -0xA552 0xE66F #PRIVATE USE AREA-E66F -0xA553 0xE670 #PRIVATE USE AREA-E670 -0xA554 0xE671 #PRIVATE USE AREA-E671 -0xA555 0xE672 #PRIVATE USE AREA-E672 -0xA556 0xE673 #PRIVATE USE AREA-E673 -0xA557 0xE674 #PRIVATE USE AREA-E674 -0xA558 0xE675 #PRIVATE USE AREA-E675 -0xA559 0xE676 #PRIVATE USE AREA-E676 -0xA55A 0xE677 #PRIVATE USE AREA-E677 -0xA55B 0xE678 #PRIVATE USE AREA-E678 -0xA55C 0xE679 #PRIVATE USE AREA-E679 -0xA55D 0xE67A #PRIVATE USE AREA-E67A -0xA55E 0xE67B #PRIVATE USE AREA-E67B -0xA55F 0xE67C #PRIVATE USE AREA-E67C -0xA560 0xE67D #PRIVATE USE AREA-E67D -0xA561 0xE67E #PRIVATE USE AREA-E67E -0xA562 0xE67F #PRIVATE USE AREA-E67F -0xA563 0xE680 #PRIVATE USE AREA-E680 -0xA564 0xE681 #PRIVATE USE AREA-E681 -0xA565 0xE682 #PRIVATE USE AREA-E682 -0xA566 0xE683 #PRIVATE USE AREA-E683 -0xA567 0xE684 #PRIVATE USE AREA-E684 -0xA568 0xE685 #PRIVATE USE AREA-E685 -0xA569 0xE686 #PRIVATE USE AREA-E686 -0xA56A 0xE687 #PRIVATE USE AREA-E687 -0xA56B 0xE688 #PRIVATE USE AREA-E688 -0xA56C 0xE689 #PRIVATE USE AREA-E689 -0xA56D 0xE68A #PRIVATE USE AREA-E68A -0xA56E 0xE68B #PRIVATE USE AREA-E68B -0xA56F 0xE68C #PRIVATE USE AREA-E68C -0xA570 0xE68D #PRIVATE USE AREA-E68D -0xA571 0xE68E #PRIVATE USE AREA-E68E -0xA572 0xE68F #PRIVATE USE AREA-E68F -0xA573 0xE690 #PRIVATE USE AREA-E690 -0xA574 0xE691 #PRIVATE USE AREA-E691 -0xA575 0xE692 #PRIVATE USE AREA-E692 -0xA576 0xE693 #PRIVATE USE AREA-E693 -0xA577 0xE694 #PRIVATE USE AREA-E694 -0xA578 0xE695 #PRIVATE USE AREA-E695 -0xA579 0xE696 #PRIVATE USE AREA-E696 -0xA57A 0xE697 #PRIVATE USE AREA-E697 -0xA57B 0xE698 #PRIVATE USE AREA-E698 -0xA57C 0xE699 #PRIVATE USE AREA-E699 -0xA57D 0xE69A #PRIVATE USE AREA-E69A -0xA57E 0xE69B #PRIVATE USE AREA-E69B -0xA580 0xE69C #PRIVATE USE AREA-E69C -0xA581 0xE69D #PRIVATE USE AREA-E69D -0xA582 0xE69E #PRIVATE USE AREA-E69E -0xA583 0xE69F #PRIVATE USE AREA-E69F -0xA584 0xE6A0 #PRIVATE USE AREA-E6A0 -0xA585 0xE6A1 #PRIVATE USE AREA-E6A1 -0xA586 0xE6A2 #PRIVATE USE AREA-E6A2 -0xA587 0xE6A3 #PRIVATE USE AREA-E6A3 -0xA588 0xE6A4 #PRIVATE USE AREA-E6A4 -0xA589 0xE6A5 #PRIVATE USE AREA-E6A5 -0xA58A 0xE6A6 #PRIVATE USE AREA-E6A6 -0xA58B 0xE6A7 #PRIVATE USE AREA-E6A7 -0xA58C 0xE6A8 #PRIVATE USE AREA-E6A8 -0xA58D 0xE6A9 #PRIVATE USE AREA-E6A9 -0xA58E 0xE6AA #PRIVATE USE AREA-E6AA -0xA58F 0xE6AB #PRIVATE USE AREA-E6AB -0xA590 0xE6AC #PRIVATE USE AREA-E6AC -0xA591 0xE6AD #PRIVATE USE AREA-E6AD -0xA592 0xE6AE #PRIVATE USE AREA-E6AE -0xA593 0xE6AF #PRIVATE USE AREA-E6AF -0xA594 0xE6B0 #PRIVATE USE AREA-E6B0 -0xA595 0xE6B1 #PRIVATE USE AREA-E6B1 -0xA596 0xE6B2 #PRIVATE USE AREA-E6B2 -0xA597 0xE6B3 #PRIVATE USE AREA-E6B3 -0xA598 0xE6B4 #PRIVATE USE AREA-E6B4 -0xA599 0xE6B5 #PRIVATE USE AREA-E6B5 -0xA59A 0xE6B6 #PRIVATE USE AREA-E6B6 -0xA59B 0xE6B7 #PRIVATE USE AREA-E6B7 -0xA59C 0xE6B8 #PRIVATE USE AREA-E6B8 -0xA59D 0xE6B9 #PRIVATE USE AREA-E6B9 -0xA59E 0xE6BA #PRIVATE USE AREA-E6BA -0xA59F 0xE6BB #PRIVATE USE AREA-E6BB -0xA5A0 0xE6BC #PRIVATE USE AREA-E6BC +0xA4F4 0xE772 #PRIVATE USE AREA-E772 +0xA4F5 0xE773 #PRIVATE USE AREA-E773 +0xA4F6 0xE774 #PRIVATE USE AREA-E774 +0xA4F7 0xE775 #PRIVATE USE AREA-E775 +0xA4F8 0xE776 #PRIVATE USE AREA-E776 +0xA4F9 0xE777 #PRIVATE USE AREA-E777 +0xA4FA 0xE778 #PRIVATE USE AREA-E778 +0xA4FB 0xE779 #PRIVATE USE AREA-E779 +0xA4FC 0xE77A #PRIVATE USE AREA-E77A +0xA4FD 0xE77B #PRIVATE USE AREA-E77B +0xA4FE 0xE77C #PRIVATE USE AREA-E77C +0xA540 0xE646 #PRIVATE USE AREA-E646 +0xA541 0xE647 #PRIVATE USE AREA-E647 +0xA542 0xE648 #PRIVATE USE AREA-E648 +0xA543 0xE649 #PRIVATE USE AREA-E649 +0xA544 0xE64A #PRIVATE USE AREA-E64A +0xA545 0xE64B #PRIVATE USE AREA-E64B +0xA546 0xE64C #PRIVATE USE AREA-E64C +0xA547 0xE64D #PRIVATE USE AREA-E64D +0xA548 0xE64E #PRIVATE USE AREA-E64E +0xA549 0xE64F #PRIVATE USE AREA-E64F +0xA54A 0xE650 #PRIVATE USE AREA-E650 +0xA54B 0xE651 #PRIVATE USE AREA-E651 +0xA54C 0xE652 #PRIVATE USE AREA-E652 +0xA54D 0xE653 #PRIVATE USE AREA-E653 +0xA54E 0xE654 #PRIVATE USE AREA-E654 +0xA54F 0xE655 #PRIVATE USE AREA-E655 +0xA550 0xE656 #PRIVATE USE AREA-E656 +0xA551 0xE657 #PRIVATE USE AREA-E657 +0xA552 0xE658 #PRIVATE USE AREA-E658 +0xA553 0xE659 #PRIVATE USE AREA-E659 +0xA554 0xE65A #PRIVATE USE AREA-E65A +0xA555 0xE65B #PRIVATE USE AREA-E65B +0xA556 0xE65C #PRIVATE USE AREA-E65C +0xA557 0xE65D #PRIVATE USE AREA-E65D +0xA558 0xE65E #PRIVATE USE AREA-E65E +0xA559 0xE65F #PRIVATE USE AREA-E65F +0xA55A 0xE660 #PRIVATE USE AREA-E660 +0xA55B 0xE661 #PRIVATE USE AREA-E661 +0xA55C 0xE662 #PRIVATE USE AREA-E662 +0xA55D 0xE663 #PRIVATE USE AREA-E663 +0xA55E 0xE664 #PRIVATE USE AREA-E664 +0xA55F 0xE665 #PRIVATE USE AREA-E665 +0xA560 0xE666 #PRIVATE USE AREA-E666 +0xA561 0xE667 #PRIVATE USE AREA-E667 +0xA562 0xE668 #PRIVATE USE AREA-E668 +0xA563 0xE669 #PRIVATE USE AREA-E669 +0xA564 0xE66A #PRIVATE USE AREA-E66A +0xA565 0xE66B #PRIVATE USE AREA-E66B +0xA566 0xE66C #PRIVATE USE AREA-E66C +0xA567 0xE66D #PRIVATE USE AREA-E66D +0xA568 0xE66E #PRIVATE USE AREA-E66E +0xA569 0xE66F #PRIVATE USE AREA-E66F +0xA56A 0xE670 #PRIVATE USE AREA-E670 +0xA56B 0xE671 #PRIVATE USE AREA-E671 +0xA56C 0xE672 #PRIVATE USE AREA-E672 +0xA56D 0xE673 #PRIVATE USE AREA-E673 +0xA56E 0xE674 #PRIVATE USE AREA-E674 +0xA56F 0xE675 #PRIVATE USE AREA-E675 +0xA570 0xE676 #PRIVATE USE AREA-E676 +0xA571 0xE677 #PRIVATE USE AREA-E677 +0xA572 0xE678 #PRIVATE USE AREA-E678 +0xA573 0xE679 #PRIVATE USE AREA-E679 +0xA574 0xE67A #PRIVATE USE AREA-E67A +0xA575 0xE67B #PRIVATE USE AREA-E67B +0xA576 0xE67C #PRIVATE USE AREA-E67C +0xA577 0xE67D #PRIVATE USE AREA-E67D +0xA578 0xE67E #PRIVATE USE AREA-E67E +0xA579 0xE67F #PRIVATE USE AREA-E67F +0xA57A 0xE680 #PRIVATE USE AREA-E680 +0xA57B 0xE681 #PRIVATE USE AREA-E681 +0xA57C 0xE682 #PRIVATE USE AREA-E682 +0xA57D 0xE683 #PRIVATE USE AREA-E683 +0xA57E 0xE684 #PRIVATE USE AREA-E684 +0xA580 0xE685 #PRIVATE USE AREA-E685 +0xA581 0xE686 #PRIVATE USE AREA-E686 +0xA582 0xE687 #PRIVATE USE AREA-E687 +0xA583 0xE688 #PRIVATE USE AREA-E688 +0xA584 0xE689 #PRIVATE USE AREA-E689 +0xA585 0xE68A #PRIVATE USE AREA-E68A +0xA586 0xE68B #PRIVATE USE AREA-E68B +0xA587 0xE68C #PRIVATE USE AREA-E68C +0xA588 0xE68D #PRIVATE USE AREA-E68D +0xA589 0xE68E #PRIVATE USE AREA-E68E +0xA58A 0xE68F #PRIVATE USE AREA-E68F +0xA58B 0xE690 #PRIVATE USE AREA-E690 +0xA58C 0xE691 #PRIVATE USE AREA-E691 +0xA58D 0xE692 #PRIVATE USE AREA-E692 +0xA58E 0xE693 #PRIVATE USE AREA-E693 +0xA58F 0xE694 #PRIVATE USE AREA-E694 +0xA590 0xE695 #PRIVATE USE AREA-E695 +0xA591 0xE696 #PRIVATE USE AREA-E696 +0xA592 0xE697 #PRIVATE USE AREA-E697 +0xA593 0xE698 #PRIVATE USE AREA-E698 +0xA594 0xE699 #PRIVATE USE AREA-E699 +0xA595 0xE69A #PRIVATE USE AREA-E69A +0xA596 0xE69B #PRIVATE USE AREA-E69B +0xA597 0xE69C #PRIVATE USE AREA-E69C +0xA598 0xE69D #PRIVATE USE AREA-E69D +0xA599 0xE69E #PRIVATE USE AREA-E69E +0xA59A 0xE69F #PRIVATE USE AREA-E69F +0xA59B 0xE6A0 #PRIVATE USE AREA-E6A0 +0xA59C 0xE6A1 #PRIVATE USE AREA-E6A1 +0xA59D 0xE6A2 #PRIVATE USE AREA-E6A2 +0xA59E 0xE6A3 #PRIVATE USE AREA-E6A3 +0xA59F 0xE6A4 #PRIVATE USE AREA-E6A4 +0xA5A0 0xE6A5 #PRIVATE USE AREA-E6A5 0xA5A1 0x30A1 #KATAKANA LETTER SMALL A 0xA5A2 0x30A2 #KATAKANA LETTER A 0xA5A3 0x30A3 #KATAKANA LETTER SMALL I @@ -7179,110 +7156,110 @@ 0xA5F4 0x30F4 #KATAKANA LETTER VU 0xA5F5 0x30F5 #KATAKANA LETTER SMALL KA 0xA5F6 0x30F6 #KATAKANA LETTER SMALL KE -0xA5F7 0xE6BD #PRIVATE USE AREA-E6BD -0xA5F8 0xE6BE #PRIVATE USE AREA-E6BE -0xA5F9 0xE6BF #PRIVATE USE AREA-E6BF -0xA5FA 0xE6C0 #PRIVATE USE AREA-E6C0 -0xA5FB 0xE6C1 #PRIVATE USE AREA-E6C1 -0xA5FC 0xE6C2 #PRIVATE USE AREA-E6C2 -0xA5FD 0xE6C3 #PRIVATE USE AREA-E6C3 -0xA5FE 0xE6C4 #PRIVATE USE AREA-E6C4 -0xA640 0xE6C5 #PRIVATE USE AREA-E6C5 -0xA641 0xE6C6 #PRIVATE USE AREA-E6C6 -0xA642 0xE6C7 #PRIVATE USE AREA-E6C7 -0xA643 0xE6C8 #PRIVATE USE AREA-E6C8 -0xA644 0xE6C9 #PRIVATE USE AREA-E6C9 -0xA645 0xE6CA #PRIVATE USE AREA-E6CA -0xA646 0xE6CB #PRIVATE USE AREA-E6CB -0xA647 0xE6CC #PRIVATE USE AREA-E6CC -0xA648 0xE6CD #PRIVATE USE AREA-E6CD -0xA649 0xE6CE #PRIVATE USE AREA-E6CE -0xA64A 0xE6CF #PRIVATE USE AREA-E6CF -0xA64B 0xE6D0 #PRIVATE USE AREA-E6D0 -0xA64C 0xE6D1 #PRIVATE USE AREA-E6D1 -0xA64D 0xE6D2 #PRIVATE USE AREA-E6D2 -0xA64E 0xE6D3 #PRIVATE USE AREA-E6D3 -0xA64F 0xE6D4 #PRIVATE USE AREA-E6D4 -0xA650 0xE6D5 #PRIVATE USE AREA-E6D5 -0xA651 0xE6D6 #PRIVATE USE AREA-E6D6 -0xA652 0xE6D7 #PRIVATE USE AREA-E6D7 -0xA653 0xE6D8 #PRIVATE USE AREA-E6D8 -0xA654 0xE6D9 #PRIVATE USE AREA-E6D9 -0xA655 0xE6DA #PRIVATE USE AREA-E6DA -0xA656 0xE6DB #PRIVATE USE AREA-E6DB -0xA657 0xE6DC #PRIVATE USE AREA-E6DC -0xA658 0xE6DD #PRIVATE USE AREA-E6DD -0xA659 0xE6DE #PRIVATE USE AREA-E6DE -0xA65A 0xE6DF #PRIVATE USE AREA-E6DF -0xA65B 0xE6E0 #PRIVATE USE AREA-E6E0 -0xA65C 0xE6E1 #PRIVATE USE AREA-E6E1 -0xA65D 0xE6E2 #PRIVATE USE AREA-E6E2 -0xA65E 0xE6E3 #PRIVATE USE AREA-E6E3 -0xA65F 0xE6E4 #PRIVATE USE AREA-E6E4 -0xA660 0xE6E5 #PRIVATE USE AREA-E6E5 -0xA661 0xE6E6 #PRIVATE USE AREA-E6E6 -0xA662 0xE6E7 #PRIVATE USE AREA-E6E7 -0xA663 0xE6E8 #PRIVATE USE AREA-E6E8 -0xA664 0xE6E9 #PRIVATE USE AREA-E6E9 -0xA665 0xE6EA #PRIVATE USE AREA-E6EA -0xA666 0xE6EB #PRIVATE USE AREA-E6EB -0xA667 0xE6EC #PRIVATE USE AREA-E6EC -0xA668 0xE6ED #PRIVATE USE AREA-E6ED -0xA669 0xE6EE #PRIVATE USE AREA-E6EE -0xA66A 0xE6EF #PRIVATE USE AREA-E6EF -0xA66B 0xE6F0 #PRIVATE USE AREA-E6F0 -0xA66C 0xE6F1 #PRIVATE USE AREA-E6F1 -0xA66D 0xE6F2 #PRIVATE USE AREA-E6F2 -0xA66E 0xE6F3 #PRIVATE USE AREA-E6F3 -0xA66F 0xE6F4 #PRIVATE USE AREA-E6F4 -0xA670 0xE6F5 #PRIVATE USE AREA-E6F5 -0xA671 0xE6F6 #PRIVATE USE AREA-E6F6 -0xA672 0xE6F7 #PRIVATE USE AREA-E6F7 -0xA673 0xE6F8 #PRIVATE USE AREA-E6F8 -0xA674 0xE6F9 #PRIVATE USE AREA-E6F9 -0xA675 0xE6FA #PRIVATE USE AREA-E6FA -0xA676 0xE6FB #PRIVATE USE AREA-E6FB -0xA677 0xE6FC #PRIVATE USE AREA-E6FC -0xA678 0xE6FD #PRIVATE USE AREA-E6FD -0xA679 0xE6FE #PRIVATE USE AREA-E6FE -0xA67A 0xE6FF #PRIVATE USE AREA-E6FF -0xA67B 0xE700 #PRIVATE USE AREA-E700 -0xA67C 0xE701 #PRIVATE USE AREA-E701 -0xA67D 0xE702 #PRIVATE USE AREA-E702 -0xA67E 0xE703 #PRIVATE USE AREA-E703 -0xA680 0xE704 #PRIVATE USE AREA-E704 -0xA681 0xE705 #PRIVATE USE AREA-E705 -0xA682 0xE706 #PRIVATE USE AREA-E706 -0xA683 0xE707 #PRIVATE USE AREA-E707 -0xA684 0xE708 #PRIVATE USE AREA-E708 -0xA685 0xE709 #PRIVATE USE AREA-E709 -0xA686 0xE70A #PRIVATE USE AREA-E70A -0xA687 0xE70B #PRIVATE USE AREA-E70B -0xA688 0xE70C #PRIVATE USE AREA-E70C -0xA689 0xE70D #PRIVATE USE AREA-E70D -0xA68A 0xE70E #PRIVATE USE AREA-E70E -0xA68B 0xE70F #PRIVATE USE AREA-E70F -0xA68C 0xE710 #PRIVATE USE AREA-E710 -0xA68D 0xE711 #PRIVATE USE AREA-E711 -0xA68E 0xE712 #PRIVATE USE AREA-E712 -0xA68F 0xE713 #PRIVATE USE AREA-E713 -0xA690 0xE714 #PRIVATE USE AREA-E714 -0xA691 0xE715 #PRIVATE USE AREA-E715 -0xA692 0xE716 #PRIVATE USE AREA-E716 -0xA693 0xE717 #PRIVATE USE AREA-E717 -0xA694 0xE718 #PRIVATE USE AREA-E718 -0xA695 0xE719 #PRIVATE USE AREA-E719 -0xA696 0xE71A #PRIVATE USE AREA-E71A -0xA697 0xE71B #PRIVATE USE AREA-E71B -0xA698 0xE71C #PRIVATE USE AREA-E71C -0xA699 0xE71D #PRIVATE USE AREA-E71D -0xA69A 0xE71E #PRIVATE USE AREA-E71E -0xA69B 0xE71F #PRIVATE USE AREA-E71F -0xA69C 0xE720 #PRIVATE USE AREA-E720 -0xA69D 0xE721 #PRIVATE USE AREA-E721 -0xA69E 0xE722 #PRIVATE USE AREA-E722 -0xA69F 0xE723 #PRIVATE USE AREA-E723 -0xA6A0 0xE724 #PRIVATE USE AREA-E724 +0xA5F7 0xE77D #PRIVATE USE AREA-E77D +0xA5F8 0xE77E #PRIVATE USE AREA-E77E +0xA5F9 0xE77F #PRIVATE USE AREA-E77F +0xA5FA 0xE780 #PRIVATE USE AREA-E780 +0xA5FB 0xE781 #PRIVATE USE AREA-E781 +0xA5FC 0xE782 #PRIVATE USE AREA-E782 +0xA5FD 0xE783 #PRIVATE USE AREA-E783 +0xA5FE 0xE784 #PRIVATE USE AREA-E784 +0xA640 0xE6A6 #PRIVATE USE AREA-E6A6 +0xA641 0xE6A7 #PRIVATE USE AREA-E6A7 +0xA642 0xE6A8 #PRIVATE USE AREA-E6A8 +0xA643 0xE6A9 #PRIVATE USE AREA-E6A9 +0xA644 0xE6AA #PRIVATE USE AREA-E6AA +0xA645 0xE6AB #PRIVATE USE AREA-E6AB +0xA646 0xE6AC #PRIVATE USE AREA-E6AC +0xA647 0xE6AD #PRIVATE USE AREA-E6AD +0xA648 0xE6AE #PRIVATE USE AREA-E6AE +0xA649 0xE6AF #PRIVATE USE AREA-E6AF +0xA64A 0xE6B0 #PRIVATE USE AREA-E6B0 +0xA64B 0xE6B1 #PRIVATE USE AREA-E6B1 +0xA64C 0xE6B2 #PRIVATE USE AREA-E6B2 +0xA64D 0xE6B3 #PRIVATE USE AREA-E6B3 +0xA64E 0xE6B4 #PRIVATE USE AREA-E6B4 +0xA64F 0xE6B5 #PRIVATE USE AREA-E6B5 +0xA650 0xE6B6 #PRIVATE USE AREA-E6B6 +0xA651 0xE6B7 #PRIVATE USE AREA-E6B7 +0xA652 0xE6B8 #PRIVATE USE AREA-E6B8 +0xA653 0xE6B9 #PRIVATE USE AREA-E6B9 +0xA654 0xE6BA #PRIVATE USE AREA-E6BA +0xA655 0xE6BB #PRIVATE USE AREA-E6BB +0xA656 0xE6BC #PRIVATE USE AREA-E6BC +0xA657 0xE6BD #PRIVATE USE AREA-E6BD +0xA658 0xE6BE #PRIVATE USE AREA-E6BE +0xA659 0xE6BF #PRIVATE USE AREA-E6BF +0xA65A 0xE6C0 #PRIVATE USE AREA-E6C0 +0xA65B 0xE6C1 #PRIVATE USE AREA-E6C1 +0xA65C 0xE6C2 #PRIVATE USE AREA-E6C2 +0xA65D 0xE6C3 #PRIVATE USE AREA-E6C3 +0xA65E 0xE6C4 #PRIVATE USE AREA-E6C4 +0xA65F 0xE6C5 #PRIVATE USE AREA-E6C5 +0xA660 0xE6C6 #PRIVATE USE AREA-E6C6 +0xA661 0xE6C7 #PRIVATE USE AREA-E6C7 +0xA662 0xE6C8 #PRIVATE USE AREA-E6C8 +0xA663 0xE6C9 #PRIVATE USE AREA-E6C9 +0xA664 0xE6CA #PRIVATE USE AREA-E6CA +0xA665 0xE6CB #PRIVATE USE AREA-E6CB +0xA666 0xE6CC #PRIVATE USE AREA-E6CC +0xA667 0xE6CD #PRIVATE USE AREA-E6CD +0xA668 0xE6CE #PRIVATE USE AREA-E6CE +0xA669 0xE6CF #PRIVATE USE AREA-E6CF +0xA66A 0xE6D0 #PRIVATE USE AREA-E6D0 +0xA66B 0xE6D1 #PRIVATE USE AREA-E6D1 +0xA66C 0xE6D2 #PRIVATE USE AREA-E6D2 +0xA66D 0xE6D3 #PRIVATE USE AREA-E6D3 +0xA66E 0xE6D4 #PRIVATE USE AREA-E6D4 +0xA66F 0xE6D5 #PRIVATE USE AREA-E6D5 +0xA670 0xE6D6 #PRIVATE USE AREA-E6D6 +0xA671 0xE6D7 #PRIVATE USE AREA-E6D7 +0xA672 0xE6D8 #PRIVATE USE AREA-E6D8 +0xA673 0xE6D9 #PRIVATE USE AREA-E6D9 +0xA674 0xE6DA #PRIVATE USE AREA-E6DA +0xA675 0xE6DB #PRIVATE USE AREA-E6DB +0xA676 0xE6DC #PRIVATE USE AREA-E6DC +0xA677 0xE6DD #PRIVATE USE AREA-E6DD +0xA678 0xE6DE #PRIVATE USE AREA-E6DE +0xA679 0xE6DF #PRIVATE USE AREA-E6DF +0xA67A 0xE6E0 #PRIVATE USE AREA-E6E0 +0xA67B 0xE6E1 #PRIVATE USE AREA-E6E1 +0xA67C 0xE6E2 #PRIVATE USE AREA-E6E2 +0xA67D 0xE6E3 #PRIVATE USE AREA-E6E3 +0xA67E 0xE6E4 #PRIVATE USE AREA-E6E4 +0xA680 0xE6E5 #PRIVATE USE AREA-E6E5 +0xA681 0xE6E6 #PRIVATE USE AREA-E6E6 +0xA682 0xE6E7 #PRIVATE USE AREA-E6E7 +0xA683 0xE6E8 #PRIVATE USE AREA-E6E8 +0xA684 0xE6E9 #PRIVATE USE AREA-E6E9 +0xA685 0xE6EA #PRIVATE USE AREA-E6EA +0xA686 0xE6EB #PRIVATE USE AREA-E6EB +0xA687 0xE6EC #PRIVATE USE AREA-E6EC +0xA688 0xE6ED #PRIVATE USE AREA-E6ED +0xA689 0xE6EE #PRIVATE USE AREA-E6EE +0xA68A 0xE6EF #PRIVATE USE AREA-E6EF +0xA68B 0xE6F0 #PRIVATE USE AREA-E6F0 +0xA68C 0xE6F1 #PRIVATE USE AREA-E6F1 +0xA68D 0xE6F2 #PRIVATE USE AREA-E6F2 +0xA68E 0xE6F3 #PRIVATE USE AREA-E6F3 +0xA68F 0xE6F4 #PRIVATE USE AREA-E6F4 +0xA690 0xE6F5 #PRIVATE USE AREA-E6F5 +0xA691 0xE6F6 #PRIVATE USE AREA-E6F6 +0xA692 0xE6F7 #PRIVATE USE AREA-E6F7 +0xA693 0xE6F8 #PRIVATE USE AREA-E6F8 +0xA694 0xE6F9 #PRIVATE USE AREA-E6F9 +0xA695 0xE6FA #PRIVATE USE AREA-E6FA +0xA696 0xE6FB #PRIVATE USE AREA-E6FB +0xA697 0xE6FC #PRIVATE USE AREA-E6FC +0xA698 0xE6FD #PRIVATE USE AREA-E6FD +0xA699 0xE6FE #PRIVATE USE AREA-E6FE +0xA69A 0xE6FF #PRIVATE USE AREA-E6FF +0xA69B 0xE700 #PRIVATE USE AREA-E700 +0xA69C 0xE701 #PRIVATE USE AREA-E701 +0xA69D 0xE702 #PRIVATE USE AREA-E702 +0xA69E 0xE703 #PRIVATE USE AREA-E703 +0xA69F 0xE704 #PRIVATE USE AREA-E704 +0xA6A0 0xE705 #PRIVATE USE AREA-E705 0xA6A1 0x0391 #GREEK CAPITAL LETTER ALPHA 0xA6A2 0x0392 #GREEK CAPITAL LETTER BETA 0xA6A3 0x0393 #GREEK CAPITAL LETTER GAMMA @@ -7307,14 +7284,14 @@ 0xA6B6 0x03A7 #GREEK CAPITAL LETTER CHI 0xA6B7 0x03A8 #GREEK CAPITAL LETTER PSI 0xA6B8 0x03A9 #GREEK CAPITAL LETTER OMEGA -0xA6B9 0xE725 #PRIVATE USE AREA-E725 -0xA6BA 0xE726 #PRIVATE USE AREA-E726 -0xA6BB 0xE727 #PRIVATE USE AREA-E727 -0xA6BC 0xE728 #PRIVATE USE AREA-E728 -0xA6BD 0xE729 #PRIVATE USE AREA-E729 -0xA6BE 0xE72A #PRIVATE USE AREA-E72A -0xA6BF 0xE72B #PRIVATE USE AREA-E72B -0xA6C0 0xE72C #PRIVATE USE AREA-E72C +0xA6B9 0xE785 #PRIVATE USE AREA-E785 +0xA6BA 0xE786 #PRIVATE USE AREA-E786 +0xA6BB 0xE787 #PRIVATE USE AREA-E787 +0xA6BC 0xE788 #PRIVATE USE AREA-E788 +0xA6BD 0xE789 #PRIVATE USE AREA-E789 +0xA6BE 0xE78A #PRIVATE USE AREA-E78A +0xA6BF 0xE78B #PRIVATE USE AREA-E78B +0xA6C0 0xE78C #PRIVATE USE AREA-E78C 0xA6C1 0x03B1 #GREEK SMALL LETTER ALPHA 0xA6C2 0x03B2 #GREEK SMALL LETTER BETA 0xA6C3 0x03B3 #GREEK SMALL LETTER GAMMA @@ -7339,13 +7316,13 @@ 0xA6D6 0x03C7 #GREEK SMALL LETTER CHI 0xA6D7 0x03C8 #GREEK SMALL LETTER PSI 0xA6D8 0x03C9 #GREEK SMALL LETTER OMEGA -0xA6D9 0xE72D #PRIVATE USE AREA-E72D -0xA6DA 0xE72E #PRIVATE USE AREA-E72E -0xA6DB 0xE72F #PRIVATE USE AREA-E72F -0xA6DC 0xE730 #PRIVATE USE AREA-E730 -0xA6DD 0xE731 #PRIVATE USE AREA-E731 -0xA6DE 0xE732 #PRIVATE USE AREA-E732 -0xA6DF 0xE733 #PRIVATE USE AREA-E733 +0xA6D9 0xE78D #PRIVATE USE AREA-E78D +0xA6DA 0xE78E #PRIVATE USE AREA-E78E +0xA6DB 0xE78F #PRIVATE USE AREA-E78F +0xA6DC 0xE790 #PRIVATE USE AREA-E790 +0xA6DD 0xE791 #PRIVATE USE AREA-E791 +0xA6DE 0xE792 #PRIVATE USE AREA-E792 +0xA6DF 0xE793 #PRIVATE USE AREA-E793 0xA6E0 0xFE35 #PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS 0xA6E1 0xFE36 #PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS 0xA6E2 0xFE39 #PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET @@ -7358,121 +7335,121 @@ 0xA6E9 0xFE42 #PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET 0xA6EA 0xFE43 #PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET 0xA6EB 0xFE44 #PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET -0xA6EC 0xE734 #PRIVATE USE AREA-E734 -0xA6ED 0xE735 #PRIVATE USE AREA-E735 +0xA6EC 0xE794 #PRIVATE USE AREA-E794 +0xA6ED 0xE795 #PRIVATE USE AREA-E795 0xA6EE 0xFE3B #PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET 0xA6EF 0xFE3C #PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET 0xA6F0 0xFE37 #PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET 0xA6F1 0xFE38 #PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET 0xA6F2 0xFE31 #PRESENTATION FORM FOR VERTICAL EM DASH -0xA6F3 0xE736 #PRIVATE USE AREA-E736 +0xA6F3 0xE796 #PRIVATE USE AREA-E796 0xA6F4 0xFE33 #PRESENTATION FORM FOR VERTICAL LOW LINE 0xA6F5 0xFE34 #PRESENTATION FORM FOR VERTICAL WAVY LOW LINE -0xA6F6 0xE737 #PRIVATE USE AREA-E737 -0xA6F7 0xE738 #PRIVATE USE AREA-E738 -0xA6F8 0xE739 #PRIVATE USE AREA-E739 -0xA6F9 0xE73A #PRIVATE USE AREA-E73A -0xA6FA 0xE73B #PRIVATE USE AREA-E73B -0xA6FB 0xE73C #PRIVATE USE AREA-E73C -0xA6FC 0xE73D #PRIVATE USE AREA-E73D -0xA6FD 0xE73E #PRIVATE USE AREA-E73E -0xA6FE 0xE73F #PRIVATE USE AREA-E73F -0xA740 0xE740 #PRIVATE USE AREA-E740 -0xA741 0xE741 #PRIVATE USE AREA-E741 -0xA742 0xE742 #PRIVATE USE AREA-E742 -0xA743 0xE743 #PRIVATE USE AREA-E743 -0xA744 0xE744 #PRIVATE USE AREA-E744 -0xA745 0xE745 #PRIVATE USE AREA-E745 -0xA746 0xE746 #PRIVATE USE AREA-E746 -0xA747 0xE747 #PRIVATE USE AREA-E747 -0xA748 0xE748 #PRIVATE USE AREA-E748 -0xA749 0xE749 #PRIVATE USE AREA-E749 -0xA74A 0xE74A #PRIVATE USE AREA-E74A -0xA74B 0xE74B #PRIVATE USE AREA-E74B -0xA74C 0xE74C #PRIVATE USE AREA-E74C -0xA74D 0xE74D #PRIVATE USE AREA-E74D -0xA74E 0xE74E #PRIVATE USE AREA-E74E -0xA74F 0xE74F #PRIVATE USE AREA-E74F -0xA750 0xE750 #PRIVATE USE AREA-E750 -0xA751 0xE751 #PRIVATE USE AREA-E751 -0xA752 0xE752 #PRIVATE USE AREA-E752 -0xA753 0xE753 #PRIVATE USE AREA-E753 -0xA754 0xE754 #PRIVATE USE AREA-E754 -0xA755 0xE755 #PRIVATE USE AREA-E755 -0xA756 0xE756 #PRIVATE USE AREA-E756 -0xA757 0xE757 #PRIVATE USE AREA-E757 -0xA758 0xE758 #PRIVATE USE AREA-E758 -0xA759 0xE759 #PRIVATE USE AREA-E759 -0xA75A 0xE75A #PRIVATE USE AREA-E75A -0xA75B 0xE75B #PRIVATE USE AREA-E75B -0xA75C 0xE75C #PRIVATE USE AREA-E75C -0xA75D 0xE75D #PRIVATE USE AREA-E75D -0xA75E 0xE75E #PRIVATE USE AREA-E75E -0xA75F 0xE75F #PRIVATE USE AREA-E75F -0xA760 0xE760 #PRIVATE USE AREA-E760 -0xA761 0xE761 #PRIVATE USE AREA-E761 -0xA762 0xE762 #PRIVATE USE AREA-E762 -0xA763 0xE763 #PRIVATE USE AREA-E763 -0xA764 0xE764 #PRIVATE USE AREA-E764 -0xA765 0xE765 #PRIVATE USE AREA-E765 -0xA766 0xE766 #PRIVATE USE AREA-E766 -0xA767 0xE767 #PRIVATE USE AREA-E767 -0xA768 0xE768 #PRIVATE USE AREA-E768 -0xA769 0xE769 #PRIVATE USE AREA-E769 -0xA76A 0xE76A #PRIVATE USE AREA-E76A -0xA76B 0xE76B #PRIVATE USE AREA-E76B -0xA76C 0xE76C #PRIVATE USE AREA-E76C -0xA76D 0xE76D #PRIVATE USE AREA-E76D -0xA76E 0xE76E #PRIVATE USE AREA-E76E -0xA76F 0xE76F #PRIVATE USE AREA-E76F -0xA770 0xE770 #PRIVATE USE AREA-E770 -0xA771 0xE771 #PRIVATE USE AREA-E771 -0xA772 0xE772 #PRIVATE USE AREA-E772 -0xA773 0xE773 #PRIVATE USE AREA-E773 -0xA774 0xE774 #PRIVATE USE AREA-E774 -0xA775 0xE775 #PRIVATE USE AREA-E775 -0xA776 0xE776 #PRIVATE USE AREA-E776 -0xA777 0xE777 #PRIVATE USE AREA-E777 -0xA778 0xE778 #PRIVATE USE AREA-E778 -0xA779 0xE779 #PRIVATE USE AREA-E779 -0xA77A 0xE77A #PRIVATE USE AREA-E77A -0xA77B 0xE77B #PRIVATE USE AREA-E77B -0xA77C 0xE77C #PRIVATE USE AREA-E77C -0xA77D 0xE77D #PRIVATE USE AREA-E77D -0xA77E 0xE77E #PRIVATE USE AREA-E77E -0xA780 0xE77F #PRIVATE USE AREA-E77F -0xA781 0xE780 #PRIVATE USE AREA-E780 -0xA782 0xE781 #PRIVATE USE AREA-E781 -0xA783 0xE782 #PRIVATE USE AREA-E782 -0xA784 0xE783 #PRIVATE USE AREA-E783 -0xA785 0xE784 #PRIVATE USE AREA-E784 -0xA786 0xE785 #PRIVATE USE AREA-E785 -0xA787 0xE786 #PRIVATE USE AREA-E786 -0xA788 0xE787 #PRIVATE USE AREA-E787 -0xA789 0xE788 #PRIVATE USE AREA-E788 -0xA78A 0xE789 #PRIVATE USE AREA-E789 -0xA78B 0xE78A #PRIVATE USE AREA-E78A -0xA78C 0xE78B #PRIVATE USE AREA-E78B -0xA78D 0xE78C #PRIVATE USE AREA-E78C -0xA78E 0xE78D #PRIVATE USE AREA-E78D -0xA78F 0xE78E #PRIVATE USE AREA-E78E -0xA790 0xE78F #PRIVATE USE AREA-E78F -0xA791 0xE790 #PRIVATE USE AREA-E790 -0xA792 0xE791 #PRIVATE USE AREA-E791 -0xA793 0xE792 #PRIVATE USE AREA-E792 -0xA794 0xE793 #PRIVATE USE AREA-E793 -0xA795 0xE794 #PRIVATE USE AREA-E794 -0xA796 0xE795 #PRIVATE USE AREA-E795 -0xA797 0xE796 #PRIVATE USE AREA-E796 -0xA798 0xE797 #PRIVATE USE AREA-E797 -0xA799 0xE798 #PRIVATE USE AREA-E798 -0xA79A 0xE799 #PRIVATE USE AREA-E799 -0xA79B 0xE79A #PRIVATE USE AREA-E79A -0xA79C 0xE79B #PRIVATE USE AREA-E79B -0xA79D 0xE79C #PRIVATE USE AREA-E79C -0xA79E 0xE79D #PRIVATE USE AREA-E79D -0xA79F 0xE79E #PRIVATE USE AREA-E79E -0xA7A0 0xE79F #PRIVATE USE AREA-E79F +0xA6F6 0xE797 #PRIVATE USE AREA-E797 +0xA6F7 0xE798 #PRIVATE USE AREA-E798 +0xA6F8 0xE799 #PRIVATE USE AREA-E799 +0xA6F9 0xE79A #PRIVATE USE AREA-E79A +0xA6FA 0xE79B #PRIVATE USE AREA-E79B +0xA6FB 0xE79C #PRIVATE USE AREA-E79C +0xA6FC 0xE79D #PRIVATE USE AREA-E79D +0xA6FD 0xE79E #PRIVATE USE AREA-E79E +0xA6FE 0xE79F #PRIVATE USE AREA-E79F +0xA740 0xE706 #PRIVATE USE AREA-E706 +0xA741 0xE707 #PRIVATE USE AREA-E707 +0xA742 0xE708 #PRIVATE USE AREA-E708 +0xA743 0xE709 #PRIVATE USE AREA-E709 +0xA744 0xE70A #PRIVATE USE AREA-E70A +0xA745 0xE70B #PRIVATE USE AREA-E70B +0xA746 0xE70C #PRIVATE USE AREA-E70C +0xA747 0xE70D #PRIVATE USE AREA-E70D +0xA748 0xE70E #PRIVATE USE AREA-E70E +0xA749 0xE70F #PRIVATE USE AREA-E70F +0xA74A 0xE710 #PRIVATE USE AREA-E710 +0xA74B 0xE711 #PRIVATE USE AREA-E711 +0xA74C 0xE712 #PRIVATE USE AREA-E712 +0xA74D 0xE713 #PRIVATE USE AREA-E713 +0xA74E 0xE714 #PRIVATE USE AREA-E714 +0xA74F 0xE715 #PRIVATE USE AREA-E715 +0xA750 0xE716 #PRIVATE USE AREA-E716 +0xA751 0xE717 #PRIVATE USE AREA-E717 +0xA752 0xE718 #PRIVATE USE AREA-E718 +0xA753 0xE719 #PRIVATE USE AREA-E719 +0xA754 0xE71A #PRIVATE USE AREA-E71A +0xA755 0xE71B #PRIVATE USE AREA-E71B +0xA756 0xE71C #PRIVATE USE AREA-E71C +0xA757 0xE71D #PRIVATE USE AREA-E71D +0xA758 0xE71E #PRIVATE USE AREA-E71E +0xA759 0xE71F #PRIVATE USE AREA-E71F +0xA75A 0xE720 #PRIVATE USE AREA-E720 +0xA75B 0xE721 #PRIVATE USE AREA-E721 +0xA75C 0xE722 #PRIVATE USE AREA-E722 +0xA75D 0xE723 #PRIVATE USE AREA-E723 +0xA75E 0xE724 #PRIVATE USE AREA-E724 +0xA75F 0xE725 #PRIVATE USE AREA-E725 +0xA760 0xE726 #PRIVATE USE AREA-E726 +0xA761 0xE727 #PRIVATE USE AREA-E727 +0xA762 0xE728 #PRIVATE USE AREA-E728 +0xA763 0xE729 #PRIVATE USE AREA-E729 +0xA764 0xE72A #PRIVATE USE AREA-E72A +0xA765 0xE72B #PRIVATE USE AREA-E72B +0xA766 0xE72C #PRIVATE USE AREA-E72C +0xA767 0xE72D #PRIVATE USE AREA-E72D +0xA768 0xE72E #PRIVATE USE AREA-E72E +0xA769 0xE72F #PRIVATE USE AREA-E72F +0xA76A 0xE730 #PRIVATE USE AREA-E730 +0xA76B 0xE731 #PRIVATE USE AREA-E731 +0xA76C 0xE732 #PRIVATE USE AREA-E732 +0xA76D 0xE733 #PRIVATE USE AREA-E733 +0xA76E 0xE734 #PRIVATE USE AREA-E734 +0xA76F 0xE735 #PRIVATE USE AREA-E735 +0xA770 0xE736 #PRIVATE USE AREA-E736 +0xA771 0xE737 #PRIVATE USE AREA-E737 +0xA772 0xE738 #PRIVATE USE AREA-E738 +0xA773 0xE739 #PRIVATE USE AREA-E739 +0xA774 0xE73A #PRIVATE USE AREA-E73A +0xA775 0xE73B #PRIVATE USE AREA-E73B +0xA776 0xE73C #PRIVATE USE AREA-E73C +0xA777 0xE73D #PRIVATE USE AREA-E73D +0xA778 0xE73E #PRIVATE USE AREA-E73E +0xA779 0xE73F #PRIVATE USE AREA-E73F +0xA77A 0xE740 #PRIVATE USE AREA-E740 +0xA77B 0xE741 #PRIVATE USE AREA-E741 +0xA77C 0xE742 #PRIVATE USE AREA-E742 +0xA77D 0xE743 #PRIVATE USE AREA-E743 +0xA77E 0xE744 #PRIVATE USE AREA-E744 +0xA780 0xE745 #PRIVATE USE AREA-E745 +0xA781 0xE746 #PRIVATE USE AREA-E746 +0xA782 0xE747 #PRIVATE USE AREA-E747 +0xA783 0xE748 #PRIVATE USE AREA-E748 +0xA784 0xE749 #PRIVATE USE AREA-E749 +0xA785 0xE74A #PRIVATE USE AREA-E74A +0xA786 0xE74B #PRIVATE USE AREA-E74B +0xA787 0xE74C #PRIVATE USE AREA-E74C +0xA788 0xE74D #PRIVATE USE AREA-E74D +0xA789 0xE74E #PRIVATE USE AREA-E74E +0xA78A 0xE74F #PRIVATE USE AREA-E74F +0xA78B 0xE750 #PRIVATE USE AREA-E750 +0xA78C 0xE751 #PRIVATE USE AREA-E751 +0xA78D 0xE752 #PRIVATE USE AREA-E752 +0xA78E 0xE753 #PRIVATE USE AREA-E753 +0xA78F 0xE754 #PRIVATE USE AREA-E754 +0xA790 0xE755 #PRIVATE USE AREA-E755 +0xA791 0xE756 #PRIVATE USE AREA-E756 +0xA792 0xE757 #PRIVATE USE AREA-E757 +0xA793 0xE758 #PRIVATE USE AREA-E758 +0xA794 0xE759 #PRIVATE USE AREA-E759 +0xA795 0xE75A #PRIVATE USE AREA-E75A +0xA796 0xE75B #PRIVATE USE AREA-E75B +0xA797 0xE75C #PRIVATE USE AREA-E75C +0xA798 0xE75D #PRIVATE USE AREA-E75D +0xA799 0xE75E #PRIVATE USE AREA-E75E +0xA79A 0xE75F #PRIVATE USE AREA-E75F +0xA79B 0xE760 #PRIVATE USE AREA-E760 +0xA79C 0xE761 #PRIVATE USE AREA-E761 +0xA79D 0xE762 #PRIVATE USE AREA-E762 +0xA79E 0xE763 #PRIVATE USE AREA-E763 +0xA79F 0xE764 #PRIVATE USE AREA-E764 +0xA7A0 0xE765 #PRIVATE USE AREA-E765 0xA7A1 0x0410 #CYRILLIC CAPITAL LETTER A 0xA7A2 0x0411 #CYRILLIC CAPITAL LETTER BE 0xA7A3 0x0412 #CYRILLIC CAPITAL LETTER VE diff --git a/jdk/make/tools/Makefile b/jdk/make/tools/Makefile index ad3089477a0..f3af119c851 100644 --- a/jdk/make/tools/Makefile +++ b/jdk/make/tools/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -58,6 +58,11 @@ ifndef DISABLE_NIMBUS SUBDIRS += generate_nimbus endif +ifeq ($(PLATFORM), solaris) + # temporary tools to work around gobjcopy bugs + SUBDIRS += add_gnu_debuglink fix_empty_sec_hdr_flags +endif + include $(BUILDDIR)/common/Subdirs.gmk all build clean clobber:: diff --git a/jdk/makefiles/com/oracle/security/ucrypto/FILES_c.gmk b/jdk/make/tools/add_gnu_debuglink/Makefile similarity index 61% rename from jdk/makefiles/com/oracle/security/ucrypto/FILES_c.gmk rename to jdk/make/tools/add_gnu_debuglink/Makefile index 0c69755c2a3..37b53cf057a 100644 --- a/jdk/makefiles/com/oracle/security/ucrypto/FILES_c.gmk +++ b/jdk/make/tools/add_gnu_debuglink/Makefile @@ -4,9 +4,7 @@ # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. +# published by the Free Software Foundation. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -21,10 +19,28 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. +# # -ifndef OPENJDK -FILES_c = \ - nativeFunc.c \ - nativeCrypto.c -endif +# Rules to build add_gnu_debuglink, used by various Makefiles on Solaris + +BUILDDIR = ../.. +include $(BUILDDIR)/common/Defs.gmk + +# Default name +PROGRAM = add_gnu_debuglink +ADD_GNU_DEBUGLINK_PROG = $(ABS_BUILDTOOLBINDIR)/$(PROGRAM) + +ADD_GNU_DEBUGLINK_SRC = add_gnu_debuglink.c +ADD_GNU_DEBUGLINK_FLAGS = +LIBS_ADD_GNU_DEBUGLINK += -lelf + +all: $(ADD_GNU_DEBUGLINK) + +$(ADD_GNU_DEBUGLINK_PROG): $(ADD_GNU_DEBUGLINK_SRC) + $(MKDIR) -p $(BUILDTOOLBINDIR) + $(CC) -g -o $@ $< $(ADD_GNU_DEBUGLINK_FLAGS) $(LIBS_ADD_GNU_DEBUGLINK) + +clean:: + $(RM) $(ADD_GNU_DEBUGLINK_PROG) + diff --git a/jdk/make/tools/add_gnu_debuglink/add_gnu_debuglink.c b/jdk/make/tools/add_gnu_debuglink/add_gnu_debuglink.c new file mode 100644 index 00000000000..3cb2dc489d4 --- /dev/null +++ b/jdk/make/tools/add_gnu_debuglink/add_gnu_debuglink.c @@ -0,0 +1,285 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/* + * Name: add_gnu_debuglink.c + * + * Description: Add a ".gnu_debuglink" section that refers to the specified + * debug_info_path to the specified ELF object. + * + * This program is adapted from the example program shown on the + * elf(3elf) man page and from code from the Solaris compiler + * driver. + */ + +/* + * needed to define SHF_EXCLUDE + */ +#define ELF_TARGET_ALL + +#include +#include +#include +#include +#include +#include + +static void failure(void); +static unsigned int gnu_debuglink_crc32(unsigned int crc, unsigned char *buf, + size_t len); + +void +main(int argc, char ** argv) { + /* new ELF section name */ + static char SEC_NAME[] = ".gnu_debuglink"; + + unsigned char buffer[8 * 1024]; /* I/O buffer */ + int buffer_len; /* buffer length */ + char * debug_info_path; /* debug info path */ + void * ehdr; /* ELF header */ + Elf * elf; /* ELF descriptor */ + char * elf_ident; /* ELF identity string */ + char * elf_obj; /* elf_obj file */ + int fd; /* descriptor for files */ + unsigned int file_crc = 0; /* CRC for debug info file */ + int is_elfclass64; /* is an ELFCLASS64 file? */ + Elf_Data * link_dat; /* ELF data for new debug info link */ + Elf_Data * name_dat; /* ELF data for new section name */ + Elf_Scn * new_scn; /* new ELF section descriptor */ + void * new_shdr; /* new ELF section header */ + Elf_Scn * scn; /* ELF section descriptor */ + void * shdr; /* ELF section header */ + + if (argc != 3) { + (void) fprintf(stderr, "Usage: %s debug_info_path elf_obj\n", argv[0]); + exit(2); + } + + debug_info_path = argv[1]; /* save for later */ + if ((fd = open(debug_info_path, O_RDONLY)) == -1) { + (void) fprintf(stderr, "%s: cannot open file.\n", debug_info_path); + exit(3); + } + + (void) printf("Computing CRC for '%s'\n", debug_info_path); + (void) fflush(stdout); + /* compute CRC for the debug info file */ + for (;;) { + int len = read(fd, buffer, sizeof buffer); + if (len <= 0) { + break; + } + file_crc = gnu_debuglink_crc32(file_crc, buffer, len); + } + (void) close(fd); + + /* open the elf_obj */ + elf_obj = argv[2]; + if ((fd = open(elf_obj, O_RDWR)) == -1) { + (void) fprintf(stderr, "%s: cannot open file.\n", elf_obj); + exit(4); + } + + (void) printf("Opening '%s' for update\n", elf_obj); + (void) fflush(stdout); + (void) elf_version(EV_CURRENT); /* coordinate ELF versions */ + + /* obtain the ELF descriptors from the input file */ + if ((elf = elf_begin(fd, ELF_C_RDWR, NULL)) == NULL) { + failure(); + } + + /* determine if ELFCLASS64 or not? */ + elf_ident = elf_getident(elf, NULL); + is_elfclass64 = (elf_ident[EI_CLASS] == ELFCLASS64); + + /* get the ELF header */ + if (is_elfclass64) { + ehdr = elf64_getehdr(elf); + } else { + ehdr = elf32_getehdr(elf); + } + if (ehdr == NULL) { + failure(); + } + + /* get the ELF section descriptor */ + if (is_elfclass64) { + scn = elf_getscn(elf, ((Elf64_Ehdr *) ehdr)->e_shstrndx); + } else { + scn = elf_getscn(elf, ((Elf32_Ehdr *) ehdr)->e_shstrndx); + } + if (scn == NULL) { + failure(); + } + + /* get the section header */ + if (is_elfclass64) { + shdr = elf64_getshdr(scn); + } else { + shdr = elf32_getshdr(scn); + } + if (shdr == NULL) { + failure(); + } + + (void) printf("Adding ELF data for new section name\n"); + (void) fflush(stdout); + name_dat = elf_newdata(scn); + name_dat->d_buf = (void *) SEC_NAME; + if (is_elfclass64) { + name_dat->d_off = ((Elf64_Shdr *) shdr)->sh_size + 1; + } else { + name_dat->d_off = ((Elf32_Shdr *) shdr)->sh_size + 1; + } + name_dat->d_align = 1; + name_dat->d_size = strlen(SEC_NAME) + 1; + + new_scn = elf_newscn(elf); + + if (is_elfclass64) { + new_shdr = elf64_getshdr(new_scn); + ((Elf64_Shdr *) new_shdr)->sh_flags = SHF_EXCLUDE; + ((Elf64_Shdr *) new_shdr)->sh_type = SHT_PROGBITS; + ((Elf64_Shdr *) new_shdr)->sh_name = ((Elf64_Shdr *) shdr)->sh_size; + ((Elf64_Shdr *) new_shdr)->sh_addralign = 1; + ((Elf64_Shdr *) shdr)->sh_size += (strlen(SEC_NAME) + 1); + } else { + new_shdr = elf32_getshdr(new_scn); + ((Elf32_Shdr *) new_shdr)->sh_flags = SHF_EXCLUDE; + ((Elf32_Shdr *) new_shdr)->sh_type = SHT_PROGBITS; + ((Elf32_Shdr *) new_shdr)->sh_name = ((Elf32_Shdr *) shdr)->sh_size; + ((Elf32_Shdr *) new_shdr)->sh_addralign = 1; + ((Elf32_Shdr *) shdr)->sh_size += (strlen(SEC_NAME) + 1); + } + + (void) printf("Adding ELF data for debug_info_path value\n"); + (void) fflush(stdout); + (void) memset(buffer, 0, sizeof buffer); + buffer_len = strlen(debug_info_path) + 1; /* +1 for NUL */ + (void) strncpy((char *) buffer, debug_info_path, buffer_len); + if (buffer_len % 4 != 0) { + /* not on a 4 byte boundary so pad to the next one */ + buffer_len += (4 - buffer_len % 4); + } + /* save the CRC */ + (void) memcpy(&buffer[buffer_len], &file_crc, sizeof file_crc); + buffer_len += sizeof file_crc; + + link_dat = elf_newdata(new_scn); + link_dat->d_type = ELF_T_BYTE; + link_dat->d_size = buffer_len; + link_dat->d_buf = buffer; + link_dat->d_align = 1; + + (void) printf("Saving updates to '%s'\n", elf_obj); + (void) fflush(stdout); + (void) elf_update(elf, ELF_C_NULL); /* recalc ELF memory structures */ + (void) elf_update(elf, ELF_C_WRITE); /* write out changes to ELF obj */ + (void) elf_end(elf); /* done with ELF obj */ + (void) close(fd); + + (void) printf("Done updating '%s'\n", elf_obj); + (void) fflush(stdout); + exit(0); +} /* end main */ + + +static void +failure() { + (void) fprintf(stderr, "%s\n", elf_errmsg(elf_errno())); + exit(5); +} + + +/* + * The CRC used in gnu_debuglink, retrieved from + * http://sourceware.org/gdb/current/onlinedocs/gdb/Separate-Debug-Files.html#Separate-Debug-Files. + */ + +static unsigned int +gnu_debuglink_crc32(unsigned int crc, unsigned char *buf, size_t len) { + static const unsigned int crc32_table[256] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, + 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, + 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, + 0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, + 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856, + 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, + 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, + 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, + 0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a, + 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, + 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, + 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, + 0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e, + 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, + 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, + 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, + 0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, + 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, + 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, + 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010, + 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, + 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, + 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, + 0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, + 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344, + 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, + 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, + 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, + 0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c, + 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, + 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, + 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, + 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c, + 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, + 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, + 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, + 0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, + 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278, + 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, + 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, + 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, + 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, + 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, + 0x2d02ef8d + }; + + unsigned char *end; + + crc = ~crc & 0xffffffff; + for (end = buf + len; buf < end; ++buf) { + crc = crc32_table[(crc ^ *buf) & 0xff] ^ (crc >> 8); + } + return ~crc & 0xffffffff; +} diff --git a/jdk/makefiles/com/oracle/Makefile b/jdk/make/tools/fix_empty_sec_hdr_flags/Makefile similarity index 58% rename from jdk/makefiles/com/oracle/Makefile rename to jdk/make/tools/fix_empty_sec_hdr_flags/Makefile index bf7d666dc29..0ed6b4361c8 100644 --- a/jdk/makefiles/com/oracle/Makefile +++ b/jdk/make/tools/fix_empty_sec_hdr_flags/Makefile @@ -4,9 +4,7 @@ # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. +# published by the Free Software Foundation. # # This code is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -21,34 +19,28 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. +# # +# Rules to build fix_empty_sec_hdr_flags, used by various Makefiles on Solaris + BUILDDIR = ../.. -PRODUCT = oracle -#SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true -#SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true -#SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path include $(BUILDDIR)/common/Defs.gmk -# build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds -UCRYPTO = -ifndef OPENJDK - ifeq ($(PLATFORM), solaris) - UCRYPTO = security/ucrypto - endif -endif +# Default name +PROGRAM = fix_empty_sec_hdr_flags +FIX_EMPTY_SEC_HDR_FLAGS_PROG = $(ABS_BUILDTOOLBINDIR)/$(PROGRAM) -JFR = -ifndef OPENJDK -ifndef JAVASE_EMBEDDED - JFR = jfr -endif -endif +FIX_EMPTY_SEC_HDR_FLAGS_SRC = fix_empty_sec_hdr_flags.c +FIX_EMPTY_SEC_HDR_FLAGS_FLAGS = +LIBS_FIX_EMPTY_SEC_HDR_FLAGS += -lelf -SUBDIRS = $(JFR) $(UCRYPTO) +all: $(FIX_EMPTY_SEC_HDR_FLAGS) -include $(BUILDDIR)/common/Subdirs.gmk +$(FIX_EMPTY_SEC_HDR_FLAGS_PROG): $(FIX_EMPTY_SEC_HDR_FLAGS_SRC) + $(MKDIR) -p $(BUILDTOOLBINDIR) + $(CC) -g -o $@ $< $(FIX_EMPTY_SEC_HDR_FLAGS_FLAGS) $(LIBS_FIX_EMPTY_SEC_HDR_FLAGS) -all build clean clobber:: - $(SUBDIRS-loop) +clean:: + $(RM) $(FIX_EMPTY_SEC_HDR_FLAGS_PROG) diff --git a/jdk/make/tools/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c b/jdk/make/tools/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c new file mode 100644 index 00000000000..6582d950639 --- /dev/null +++ b/jdk/make/tools/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c @@ -0,0 +1,181 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + * + */ + +/* + * Name: fix_empty_sec_hdr_flags.c + * + * Description: Remove the SHF_ALLOC flag from "empty" section headers. + * An "empty" section header has sh_addr == 0 and sh_size == 0. + * + * This program is adapted from the example program shown on the + * elf(3elf) man page and from code from the Solaris compiler + * driver. + */ + +#include +#include +#include +#include +#include +#include + +static void failure(void); + +void +main(int argc, char ** argv) { + void * ehdr; /* ELF header */ + unsigned int i; /* section counter */ + int fd; /* descriptor for file */ + Elf * elf; /* ELF descriptor */ + char * elf_ident; /* ELF identity string */ + char * elf_obj; /* elf_obj file */ + int fix_count; /* number of flags fixed */ + int is_elfclass64; /* is an ELFCLASS64 file? */ + Elf_Scn * scn; /* ELF section descriptor */ + void * shdr; /* ELF section header */ + Elf_Data * shstrtab; /* ELF section header string table */ + + if (argc != 2) { + (void) fprintf(stderr, "Usage: %s elf_obj\n", argv[0]); + exit(2); + } + + /* open the elf_obj */ + elf_obj = argv[1]; + if ((fd = open(elf_obj, O_RDWR)) == -1) { + (void) fprintf(stderr, "%s: cannot open file.\n", elf_obj); + exit(3); + } + + (void) printf("Opening '%s' for update\n", elf_obj); + (void) fflush(stdout); + (void) elf_version(EV_CURRENT); /* coordinate ELF versions */ + + /* obtain the ELF descriptors from the input file */ + if ((elf = elf_begin(fd, ELF_C_RDWR, NULL)) == NULL) { + failure(); + } + + /* determine if ELFCLASS64 or not? */ + elf_ident = elf_getident(elf, NULL); + is_elfclass64 = (elf_ident[EI_CLASS] == ELFCLASS64); + + /* get the ELF header */ + if (is_elfclass64) { + ehdr = elf64_getehdr(elf); + } else { + ehdr = elf32_getehdr(elf); + } + if (ehdr == NULL) { + failure(); + } + + /* get the ELF section descriptor */ + if (is_elfclass64) { + scn = elf_getscn(elf, ((Elf64_Ehdr *) ehdr)->e_shstrndx); + } else { + scn = elf_getscn(elf, ((Elf32_Ehdr *) ehdr)->e_shstrndx); + } + if (scn == NULL) { + failure(); + } + + /* get the section header string table */ + shstrtab = elf_getdata(scn, NULL); + if (shstrtab == NULL) { + failure(); + } + + fix_count = 0; + + /* traverse the sections of the input file */ + for (i = 1, scn = NULL; scn = elf_nextscn(elf, scn); i++) { + int has_flag_set; /* is SHF_ALLOC flag set? */ + int is_empty; /* is section empty? */ + char * name; /* short hand pointer */ + + /* get the section header */ + if (is_elfclass64) { + shdr = elf64_getshdr(scn); + } else { + shdr = elf32_getshdr(scn); + } + if (shdr == NULL) { + failure(); + } + + if (is_elfclass64) { + name = (char *)shstrtab->d_buf + ((Elf64_Shdr *) shdr)->sh_name; + } else { + name = (char *)shstrtab->d_buf + ((Elf32_Shdr *) shdr)->sh_name; + } + + if (is_elfclass64) { + has_flag_set = ((Elf64_Shdr *) shdr)->sh_flags & SHF_ALLOC; + is_empty = ((Elf64_Shdr *) shdr)->sh_addr == 0 && + ((Elf64_Shdr *) shdr)->sh_size == 0; + } else { + has_flag_set = ((Elf32_Shdr *) shdr)->sh_flags & SHF_ALLOC; + is_empty = ((Elf32_Shdr *) shdr)->sh_addr == 0 && + ((Elf32_Shdr *) shdr)->sh_size == 0; + } + + if (is_empty && has_flag_set) { + (void) printf("section[%u] '%s' is empty, " + "but SHF_ALLOC flag is set.\n", i, name); + (void) printf("Clearing the SHF_ALLOC flag.\n"); + + if (is_elfclass64) { + ((Elf64_Shdr *) shdr)->sh_flags &= ~SHF_ALLOC; + } else { + ((Elf32_Shdr *) shdr)->sh_flags &= ~SHF_ALLOC; + } + fix_count++; + } + } /* end for each ELF section */ + + if (fix_count > 0) { + (void) printf("Saving %d updates to '%s'\n", fix_count, elf_obj); + (void) fflush(stdout); + (void) elf_update(elf, ELF_C_NULL); /* recalc ELF memory structures */ + (void) elf_update(elf, ELF_C_WRITE); /* write out changes to ELF obj */ + } else { + (void) printf("No SHF_ALLOC flags needed to be cleared.\n"); + } + + (void) elf_end(elf); /* done with ELF obj */ + (void) close(fd); + + (void) printf("Done %s '%s'\n", + (fix_count > 0) ? "updating" : "with", elf_obj); + (void) fflush(stdout); + exit(0); +} /* end main */ + + +static void +failure() { + (void) fprintf(stderr, "%s\n", elf_errmsg(elf_errno())); + exit(6); +} diff --git a/jdk/makefiles/CompileDemos.gmk b/jdk/makefiles/CompileDemos.gmk index 814465f01e2..4a11f38795e 100644 --- a/jdk/makefiles/CompileDemos.gmk +++ b/jdk/makefiles/CompileDemos.gmk @@ -134,9 +134,9 @@ define SetupDemo $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/$6share/demo/$2/$1/,$7))) ifneq ($7,) $(JDK_OUTPUTDIR)/newdemo/$2/$1/% : $(JDK_TOPDIR)/src/$6share/demo/$2/$1/% - mkdir -p $$(@D) - cp $$< $$@ - chmod -f ug+w $$@ + $(MKDIR) -p $$(@D) + $(CP) $$< $$@ + $(CHMOD) -f ug+w $$@ BUILD_DEMOS += $$($1_COPY_TARGETS) endif @@ -155,7 +155,7 @@ $(JDK_OUTPUTDIR)/newdemo/jfc/CodePointIM/_the.services : \ cd META-INF/services && \ $(JAR) uf $(JDK_OUTPUTDIR)/newdemo/jfc/CodePointIM/CodePointIM.jar java.awt.im.spi.InputMethodDescriptor) $(RM) -r $(JDK_OUTPUTDIR)/newdemo/jfc/CodePointIM/_the.tmp - touch $@ + $(TOUCH) $@ BUILD_DEMOS+=$(JDK_OUTPUTDIR)/newdemo/jfc/CodePointIM/_the.services @@ -167,12 +167,12 @@ $(eval $(call SetupDemo,SampleTree,jfc,,SampleTree,,,README*)) $(eval $(call SetupDemo,SwingApplet,jfc,,SwingApplet,,,README* *.html)) $(eval $(call SetupDemo,TableExample,jfc,,TableExample,,,README*)) $(eval $(call SetupDemo,TransparentRuler,jfc,,transparentruler.Ruler,,,README*)) -$(eval $(call SetupDemo,jconsole-plugin,scripting,-cp $(JDK_OUTPUTDIR)/lib/jconsole.jar,,,,*.xml *.txt)) +$(eval $(call SetupDemo,jconsole-plugin,scripting,-cp $(JDK_OUTPUTDIR)/lib/jconsole.jar,,,,*.xml *.txt,,,,Main-Class: \n)) $(eval $(call SetupDemo,FullThreadDump,management,,FullThreadDump,,,README*)) $(eval $(call SetupDemo,JTop,management,-cp $(JDK_OUTPUTDIR)/lib/jconsole.jar,JTop,,,README*)) $(eval $(call SetupDemo,MemoryMonitor,management,,MemoryMonitor,,,README*)) $(eval $(call SetupDemo,VerboseGC,management,,VerboseGC,,,README*)) -$(eval $(call SetupDemo,zipfs,nio,,,,,README* *.java)) +$(eval $(call SetupDemo,zipfs,nio,,,,,README* *.java,,,,Main-Class: \n)) ifndef OPENJDK $(eval $(call SetupDemo,Laffy,jfc,,,,closed/,*)) @@ -188,9 +188,9 @@ ifndef OPENJDK $(JDK_OUTPUTDIR)/newdemo/nbproject/%,\ $(shell $(FIND) $(JDK_TOPDIR)/src/closed/share/demo/nbproject/ -type f)) $(JDK_OUTPUTDIR)/newdemo/nbproject/% : $(JDK_TOPDIR)/src/closed/share/demo/nbproject/% - mkdir -p $(@D) - cp $< $@ - chmod -f ug+w $@ + $(MKDIR) -p $(@D) + $(CP) $< $@ + $(CHMOD) -f ug+w $@ endif ################################################################################################## @@ -231,6 +231,7 @@ define SetupJVMTIDemo SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC),\ LANG:=$$(BUILD_DEMO_JVMTI_$1_LANG),\ CFLAGS:=$(CFLAGS_JDKLIB) $$(BUILD_DEMO_JVMTI_$1_O_FLAG) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3,\ + CXXFLAGS:=$(CXXFLAGS_JDKLIB) $$(BUILD_DEMO_JVMTI_$1_O_FLAG) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3,\ LDFLAGS:=$(LDFLAGS_JDKLIB),\ LDFLAGS_SUFFIX:=$$($1_EXTRA_CXX),\ LDFLAGS_SUFFIX_posix:=$5,\ @@ -255,7 +256,7 @@ define SetupJVMTIDemo BIN:=$(JDK_OUTPUTDIR)/newdemoclasses/jvmti/$1,\ COPY:=$(PATTERNS_TO_COPY),\ JAR:=$(JDK_OUTPUTDIR)/newdemo/jvmti/$1/$1.jar,\ - JARMAIN:=,\ + EXTRA_MANIFEST_ATTR:=Main-Class: \n,\ MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf)) BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/jvmti/$1/$1.jar @@ -290,11 +291,11 @@ JPDA_SOURCES:=$(shell $(FIND) $(JDK_TOPDIR)/src/share/classes/com/sun/tools/exam JPDA_FILES:=$(subst $(JDK_TOPDIR)/src/share/classes/,,$(JPDA_SOURCES)) $(JDK_OUTPUTDIR)/newdemo/jpda/src.zip : $(JPDA_SOURCES) - mkdir -p $(@D) + $(MKDIR) -p $(@D) (cd $(JDK_TOPDIR)/src/share/classes && $(ZIP) -qru $@ com -i "com/sun/tools/example/*") $(JDK_OUTPUTDIR)/newdemo/jpda/examples.jar : $(JPDA_SOURCES) - mkdir -p $(@D) + $(MKDIR) -p $(@D) $(RM) $(@D)/_the.sources $(call ListPathsSafely,JPDA_FILES,\n, >> $(@D)/_the.sources) $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ @@ -304,7 +305,7 @@ $(JDK_OUTPUTDIR)/newdemo/jpda/examples.jar : $(JPDA_SOURCES) (cd $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example && $(JAR) uf $@ README) $(JDK_OUTPUTDIR)/newdemo/jpda/com/sun/tools/example/README : $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example/README - mkdir -p $(@D) + $(MKDIR) -p $(@D) $(CP) $< $@ $(CHMOD) -f ug+w $@ @@ -314,12 +315,12 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/jpda/src.zip $(JDK_OUTPUTDIR)/newdemo/jp ################################################################################################## $(JDK_OUTPUTDIR)/newdemo/management/index.html : $(JDK_TOPDIR)/src/share/demo/management/index.html - mkdir -p $(@D) + $(MKDIR) -p $(@D) $(CP) $< $@ $(CHMOD) -f ug+w $@ $(JDK_OUTPUTDIR)/newdemo/jvmti/index.html : $(JDK_TOPDIR)/src/share/demo/jvmti/index.html - mkdir -p $(@D) + $(MKDIR) -p $(@D) $(CP) $< $@ $(CHMOD) -f ug+w $@ @@ -329,24 +330,102 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/management/index.html \ ################################################################################################## # The netbeans project files are copied into the demo directory. +BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%,\ + $(JDK_OUTPUTDIR)/newdemo/nbproject/%,\ + $(shell $(FIND) $(JDK_TOPDIR)/src/share/demo/nbproject/ -type f)) -NETBEANS_DEMO_PROJECTS_FILES=$(shell $(FIND) $(JDK_TOPDIR)/src/share/demo/nbproject -type f) - -$(JDK_OUTPUTDIR)/newdemo/_the.nbproject: $(NETBEANS_DEMO_PROJECTS_FILES) - $(MKDIR) -p $(JDK_OUTPUTDIR)/newdemo - $(RM) -rf $(JDK_OUTPUTDIR)/newdemo/nbproject - echo Copying Netbeans demo projects - (cd $(JDK_TOPDIR)/src/share/demo && cp -r nbproject $(JDK_OUTPUTDIR)/newdemo) - touch $@ +$(JDK_OUTPUTDIR)/newdemo/nbproject/% : $(JDK_TOPDIR)/src/share/demo/nbproject/% + $(MKDIR) -p $(@D) + $(CP) $< $@ + $(CHMOD) -f ug+w $@ ################################################################################################## -$(JDK_OUTPUTDIR)/newdemo/README : $(JDK_TOPDIR)/src/share/demo/README - mkdir -p $(@D) - cp $< $@ +$(JDK_OUTPUTDIR)/newdemo/README: $(JDK_TOPDIR)/src/share/demo/README + $(MKDIR) -p $(@D) + $(CP) $< $@ + +BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/README ################################################################################################## -all: $(BUILD_DEMOS) $(JDK_OUTPUTDIR)/newdemo/_the.nbproject $(JDK_OUTPUTDIR)/newdemo/README +ifeq ($(PLATFORM), solaris) + +$(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller/% : $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/% + $(MKDIR) -p $(@D) + $(CP) $< $@ + $(CHMOD) -f ug+w $@ + +$(JDK_OUTPUTDIR)/newdemo/jni/Poller/README.txt : $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/README.txt + $(MKDIR) -p $(@D) + $(CP) $< $@ + $(CHMOD) -f ug+w $@ + +$(JDK_OUTPUTDIR)/newdemo/jni/Poller/Poller.jar : \ + $(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller/README.txt $(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller/Poller.c + +$(eval $(call SetupJavaCompilation,BUILD_DEMO_POLLER_JAR,\ + SETUP:=GENERATE_USINGJDKBYTECODE, \ + SRC:=$(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \ + BIN:=$(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller, \ + HEADERS:=$(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller, \ + JAR:=$(JDK_OUTPUTDIR)/newdemo/jni/Poller/Poller.jar, \ + MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf, \ + SRCZIP:=$(JDK_OUTPUTDIR)/newdemo/jni/Poller/src.zip, \ + COPY := README.txt Poller.c, \ + JARMAIN := Client)) + + + +BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/jni/Poller/Poller.jar $(JDK_OUTPUTDIR)/newdemo/jni/Poller/src.zip \ + $(JDK_OUTPUTDIR)/newdemo/jni/Poller/README.txt + +$(eval $(call SetupNativeCompilation,BUILD_LIBPOLLER,\ + SRC:=$(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \ + LANG := C, \ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_OUTPUTDIR)/newdemoclasses/jni/Poller, \ + LDFLAGS:=$(LDFLAGS_JDKLIB), \ + BIN:=$(JDK_OUTPUTDIR)/newdemoobjs/jni/Poller,\ + LIB:=$(JDK_OUTPUTDIR)/newdemoobjs/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX))) + +# +# We can only compile native code after jar has been build (since we depend on generated .h files) +# +$(JDK_OUTPUTDIR)/newdemoobjs/jni/Poller/Poller.o : $(JDK_OUTPUTDIR)/newdemo/jni/Poller/Poller.jar + +$(JDK_OUTPUTDIR)/newdemo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX) : \ + $(JDK_OUTPUTDIR)/newdemoobjs/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX) + $(MKDIR) -p $(@D) + $(CP) $< $@ + +BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX) + +endif + +################################################################################################## + +ifndef OPENJDK + DB_DEMO_ZIPFILE := $(shell $(FIND) $(JDK_TOPDIR)/src/closed/share/db -name "*demo*.zip") + + $(JDK_OUTPUTDIR)/newdemo/_the.db.unzipped: $(DB_DEMO_ZIPFILE) + $(MKDIR) -p $(@D) + $(RM) -rf $(JDK_OUTPUTDIR)/newdemo/db $(JDK_OUTPUTDIR)/newdemo/demo + $(CD) $(JDK_OUTPUTDIR)/newdemo && $(UNZIP) -o $< + $(MV) $(JDK_OUTPUTDIR)/newdemo/demo $(JDK_OUTPUTDIR)/newdemo/db + $(TOUCH) $@ + +# Copy this after the unzip above to avoid race with directory creation and mv command. + $(JDK_OUTPUTDIR)/newdemo/db/README-JDK-DEMOS.html: \ + $(JDK_TOPDIR)/src/closed/share/db/README-JDK-DEMOS.html \ + | $(JDK_OUTPUTDIR)/newdemo/_the.db.unzipped + $(MKDIR) -p $(@D) + $(CP) '$<' '$@' + BUILD_DEMOS += $(JDK_OUTPUTDIR)/newdemo/_the.db.unzipped $(JDK_OUTPUTDIR)/newdemo/db/README-JDK-DEMOS.html +endif + +################################################################################################## + +all: $(BUILD_DEMOS) .PHONY: all diff --git a/jdk/makefiles/CompileJavaClasses.gmk b/jdk/makefiles/CompileJavaClasses.gmk index 3a0b70a8549..cd676e289b6 100644 --- a/jdk/makefiles/CompileJavaClasses.gmk +++ b/jdk/makefiles/CompileJavaClasses.gmk @@ -32,36 +32,44 @@ include JavaCompilation.gmk # Setup the java compilers for the JDK build. include Setup.gmk -EXCLUDES:= sun/dc \ - sun/security/pkcs11 \ - com/sun/pept \ +JARS := +EXFILES := +EXCLUDES := + +########################################################################################## + +EXCLUDES += com/sun/pept \ com/sun/tools/example/trace\ com/sun/tools/example/debug/bdi\ com/sun/tools/example/debug/event\ com/sun/tools/example/debug/gui \ - javax/crypto \ com/oracle/security +ifeq ($(PLATFORM)-$(ARCH_DATA_MODEL),windows-64) + EXCLUDES += sun/security/pkcs11 +endif + ifdef OPENJDK - EXCLUDES+= com/sun/jmx/snmp \ + EXCLUDES+= sun/dc \ + com/sun/jmx/snmp \ sun/management/snmp \ com/sun/script endif +ifndef OPENJDK + # There exists two versions of this file... + EXFILES := $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java +endif + ifneq ($(PLATFORM),solaris) # Exclude Solaris nio and two security related files in src/share/classes - EXFILES:=SolarisAclFileAttributeView.java \ + EXFILES += SolarisAclFileAttributeView.java \ SolarisFileStore.java \ SolarisFileSystem.java \ SolarisFileSystemProvider.java \ SolarisNativeDispatcher.java \ SolarisUserDefinedFileAttributeView.java \ SolarisWatchService.java \ - DevPollArrayWrapper.java \ - DevPollSelectorImpl.java \ - DevPollSelectorProvider.java \ - SolarisAsynchronousChannelProvider.java \ - SolarisEventPort.java \ SolarisAclFileAttributeView.java \ SolarisFileStore.java \ SolarisFileSystem.java \ @@ -75,8 +83,11 @@ ifneq ($(PLATFORM),solaris) sun/tools/attach/SolarisVirtualMachine.java endif -# Why? -EXFILES+=WrapperGenerator.java +# In the old build, this isn't excluded on macosx, even though it probably +# should be. +ifneq ($(PLATFORM),macosx) + EXFILES+=WrapperGenerator.java +endif ifneq ($(PLATFORM),windows) # Exclude Window security related files in src/share/classes @@ -86,14 +97,20 @@ ifneq ($(PLATFORM),windows) endif ifeq ($(PLATFORM),windows) - # Does nio channels exist on Windows? - EXCLUDES+=sun/nio/ch + # Don't build GTK L&F on Windows + EXCLUDES+= com/sun/java/swing/plaf/gtk endif ifneq ($(PLATFORM),linux) - EXCLUDES+=com/sun/java/swing/plaf/gtk EXFILES+=sun/tools/attach/LinuxAttachProvider.java \ - sun/tools/attach/LinuxVirtualMachine.java + sun/tools/attach/LinuxVirtualMachine.java \ + sun/nio/fs/LinuxDosFileAttributeView.java \ + sun/nio/fs/LinuxFileStore.java \ + sun/nio/fs/LinuxFileSystem.java \ + sun/nio/fs/LinuxFileSystemProvider.java \ + sun/nio/fs/LinuxNativeDispatcher.java \ + sun/nio/fs/LinuxUserDefinedFileAttributeView.java \ + sun/nio/fs/LinuxWatchService.java endif ifneq ($(PLATFORM),macosx) @@ -105,19 +122,6 @@ ifneq ($(PLATFORM),macosx) sun/tools/attach/BsdVirtualMachine.java endif -# Generated nimbus files that apparently should not be compiled... -EXFILES+=InternalFrameTitlePanePainter.java \ - OptionPaneMessageAreaPainter.java \ - ScrollBarPainter.java \ - SliderPainter.java \ - SpinnerPainter.java \ - SplitPanePainter.java \ - TabbedPanePainter.java - -# New class /java/lang/annotation/ContainerAnnotation.java is not included in old -# build -EXFILES+=java/lang/annotation/ContainerAnnotation.java - # Exclude BreakIterator classes that are just used in compile process to generate # data files and shouldn't go in the product EXFILES+=sun/text/resources/BreakIteratorRules.java \ @@ -130,16 +134,17 @@ endif ifdef OPENJDK EXCLUDES+=sun/java2d/cmm/kcms -else - EXCLUDES+=sun/java2d/cmm/lcms endif -# Not used on windows -ifneq ($(PLATFORM), windows) +# Used on windows and macosx +ifeq (,$(filter $(PLATFORM), windows macosx)) EXFILES+=sun/awt/AWTCharset.java endif -# Exclude some generated AWT files that were implicitly not included by the old build. +ifneq ($(PLATFORM), macosx) +# +# Not in rt.jar on solaris and linux...(windows not checked) +# in rt.jar on macosx ?? EXFILES+=sun/awt/X11/ScreenFormat.java \ sun/awt/X11/XArc.java \ sun/awt/X11/XChar2b.java \ @@ -182,19 +187,15 @@ EXFILES+=sun/awt/X11/ScreenFormat.java \ sun/awt/X11/XdbeSwapInfo.java \ sun/awt/X11/XmbTextItem.java \ sun/awt/X11/XwcTextItem.java - -# Exclude sun/security files that should go in a separate jar -EXFILES+=sun/security/ec/ECDHKeyAgreement.java \ - sun/security/ec/ECDSASignature.java \ - sun/security/ec/ECKeyPairGenerator.java \ - sun/security/ec/SunEC$1.java \ - sun/security/ec/SunEC.java \ - sun/security/ec/SunECEntries.java +endif # Exclude another implicitly not included file. EXFILES+=sun/util/locale/AsciiUtil.java -ifeq ($(PLATFORM), linux) +ifeq (,$(filter $(PLATFORM), solaris macosx)) +# +# only solaris and macosx +# EXFILES+=sun/nio/fs/PollingWatchService.java endif @@ -205,11 +206,42 @@ EXFILES+=-linux-arm.java \ # TODO: Is this necessary? ifeq ($(PLATFORM), windows) + EXFILES+=sun/nio/ch/AbstractPollSelectorImpl.java \ + sun/nio/ch/DevPollArrayWrapper.java \ + sun/nio/ch/DevPollSelectorImpl.java \ + sun/nio/ch/DevPollSelectorProvider.java \ + sun/nio/ch/InheritedChannel.java \ + sun/nio/ch/PollSelectorProvider.java \ + sun/nio/ch/PollSelectorImpl.java \ + sun/nio/ch/Port.java \ + sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \ + sun/nio/ch/SolarisAsynchronousChannelProvider.java \ + sun/nio/ch/SolarisEventPort.java \ + sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \ + sun/nio/ch/UnixAsynchronousSocketChannelImpl.java EXFILES+=sun/net/sdp/SdpProvider.java else EXFILES+=sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java endif +ifdef DISABLE_NIMBUS + # TODO: need to check when it happens + # Exclude nimus if disabled + EXCLUDES+= javax/swing/plaf/nimbus \ + com/sun/java/swing/plaf/nimbus +else +# +# These are never put into rt.jar +# +EXFILES+= javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ + javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ + javax/swing/plaf/nimbus/ScrollBarPainter.java \ + javax/swing/plaf/nimbus/SliderPainter.java \ + javax/swing/plaf/nimbus/SpinnerPainter.java \ + javax/swing/plaf/nimbus/SplitPanePainter.java \ + javax/swing/plaf/nimbus/TabbedPanePainter.java +endif + # Acquire a list of files that should be copied straight over to the classes. include CopyIntoClasses.gmk # Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA @@ -219,25 +251,105 @@ ifndef OPENJDK $(JDK_TOPDIR)/src/closed/$(LEGACY_HOST_OS_API)/classes endif +MACOSX_SRC_DIRS := +ifeq ($(PLATFORM),macosx) + MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes + + # this files are duplicated in MACOSX_SRC_DIRS + EXFILES+= $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java \ + $(JDK_TOPDIR)/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java \ + $(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \ + $(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java +endif + +# The exception handling of swing beaninfo +# These resources violates the convention of having code and resources together under +# $(JDK_TOPDIR)/src/.../classes directories +$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/tools/swing-beans/beaninfo/images/%.gif + $(MKDIR) -p $(@D) + $(CP) $< $@ + $(eval $(call SetupJavaCompilation,BUILD_JDK,\ SETUP:=GENERATE_JDKBYTECODE,\ SRC:=$(JDK_TOPDIR)/src/share/classes \ $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes \ + $(MACOSX_SRC_DIRS) \ $(JDK_OUTPUTDIR)/gensrc \ + $(JDK_OUTPUTDIR)/gensrc_swing/javax/swing/beaninfo \ $(CLOSED_SRC_DIRS),\ EXCLUDES:=$(EXCLUDES),\ EXCLUDE_FILES:=$(EXFILES),\ - BIN:=$(JDK_OUTPUTDIR)/newclasses,\ + BIN:=$(JDK_OUTPUTDIR)/classes,\ COPY:=$(COPY_PATTERNS),\ COPY_FILES:=$(COPY_FILES),\ - JAR:=$(JDK_OUTPUTDIR)/newrt.jar,\ HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers)) +########################################################################################## +# Special handling of header file generation for classes in the jigsaw base module which +# currently can't add the annotaion GenerateNativeHeaders. For these specific classes the +# java file and the class have the same names which enables shortcutting the dependencies. + +JDK_BASE_HEADER_CLASSES:=java.lang.Integer \ + java.lang.Long \ + java.net.SocketOptions \ + sun.nio.ch.IOStatus + +JDK_BASE_HEADER_JAVA_FILES:=$(patsubst %,$(JDK_TOPDIR)/src/share/classes/%.java,\ + $(subst .,/,$(JDK_BASE_HEADER_CLASSES))) + +ifeq ($(PLATFORM),windows) + JDK_BASE_HEADER_CLASSES_WINDOWS:=sun.nio.ch.PollArrayWrapper + JDK_BASE_HEADER_CLASSES+=$(JDK_BASE_HEADER_CLASSES_WINDOWS) + JDK_BASE_HEADER_JAVA_FILES+=$(patsubst %,$(JDK_TOPDIR)/src/windows/classes/%.java,\ + $(subst .,/,$(JDK_BASE_HEADER_CLASSES_WINDOWS))) +endif + +# Set prereqs to the java files since make doesn't know about the class files. Add BUILD_JDK +# as an order only dependency to avoid race with the java compilation. +$(JDK_OUTPUTDIR)/classes/_the.jdk.base.headers: $(JDK_BASE_HEADER_JAVA_FILES) | $(BUILD_JDK) + $(ECHO) Generating headers for jdk base classes + $(JAVAH) -bootclasspath $(JDK_OUTPUTDIR)/classes -d $(JDK_OUTPUTDIR)/gensrc_headers \ + $(JDK_BASE_HEADER_CLASSES) + $(TOUCH) $@ + +########################################################################################## + +# +# This is an empty jar (only contains manifest) and fits poorly into framework... +# create simple rule instead +# +MANAGEMENT_AGENT_JAR_DEPS := $(JDK_TOPDIR)/src/share/classes/sun/management/manifest + +$(JDK_OUTPUTDIR)/lib/management-agent.jar : $(JDK_TOPDIR)/src/share/classes/sun/management/manifest + $(JAR) cfm $@ $(JDK_TOPDIR)/src/share/classes/sun/management/manifest + +JARS += $(JDK_OUTPUTDIR)/lib/management-agent.jar + +########################################################################################## + +ifndef OPENJDK + +$(eval $(call SetupJavaCompilation,BUILD_ALTCLASSES_JAR,\ + SETUP:=GENERATE_JDKBYTECODE,\ + SRC:=$(JDK_TOPDIR)/src/closed/share/altclasses, \ + BIN:=$(JDK_OUTPUTDIR)/altclasses_classes,\ + JAR:=$(JDK_OUTPUTDIR)/lib/alt-rt.jar)) + +$(BUILD_ALTCLASSES_JAR): $(BUILD_JDK) +JARS += $(JDK_OUTPUTDIR)/lib/alt-rt.jar + +endif + +########################################################################################## + +$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin: + $(MKDIR) -p $(@D) + $(TOUCH) $@ + +########################################################################################## + # copy with -a to preserve timestamps so dependencies down the line aren't messed up -all: $(BUILD_JDK) $(JDK_OUTPUTDIR)/newrt.jar $(COPY_EXTRA) - (cd $(JDK_OUTPUTDIR); \ - $(CP) -rp newclasses/* classes; \ - $(FIND) classes -name "_the.*" $(FIND_DELETE); \ - $(TOUCH) $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin) +all: $(BUILD_JDK) $(JARS) $(COPY_EXTRA) $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \ + $(JDK_OUTPUTDIR)/classes/_the.jdk.base.headers .PHONY: all diff --git a/jdk/makefiles/CompileLaunchers.gmk b/jdk/makefiles/CompileLaunchers.gmk index 9055747ee8f..bb6ef245e62 100644 --- a/jdk/makefiles/CompileLaunchers.gmk +++ b/jdk/makefiles/CompileLaunchers.gmk @@ -41,6 +41,16 @@ define SetupLauncher # Parameter 3 are extra LDFLAGS # Parameter 4 are extra LDFLAGS_SUFFIX_posix # Parameter 5 are extra LDFLAGS_SUFFIX_winapi + + $1_WINDOWS_JLI_LIB:=$(JDK_OUTPUTDIR)/objs/jli.lib + ifneq ($6,) + $1_WINDOWS_JLI_LIB:=$6 + endif + $1_VERSION_INFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc + ifneq ($8,) + $1_VERSION_INFO_RESOURCE:=$8 + endif + $(call SetupNativeCompilation,BUILD_LAUNCHER_$1,\ SRC:=$(JDK_TOPDIR)/src/share/bin,\ INCLUDE_FILES:=main.c,\ @@ -61,19 +71,22 @@ define SetupLauncher $(call SET_SHARED_LIBRARY_ORIGIN,../lib/$(LIBARCH)/jli) \ $(call SET_SHARED_LIBRARY_ORIGIN,../jre/lib/$(LIBARCH)/jli) \ $3,\ - LDFLAGS_linux:=$(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/launchers/mapfile-$(ARCH)),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(ARCH), \ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKEXE_SUFFIX),\ LDFLAGS_SUFFIX_posix:=$4 -lc,\ - LDFLAGS_SUFFIX_winapi:=$5,\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/$1_objs,\ - EXE:=$(JDK_OUTPUTDIR)/newobjs/$1$(EXE_SUFFIX),\ - VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ + LDFLAGS_SUFFIX_winapi:=$$($1_WINDOWS_JLI_LIB) \ + $(JDK_OUTPUTDIR)/objs/java.lib advapi32.lib $5,\ + BIN:=$(JDK_OUTPUTDIR)/objs/$1_objs,\ + EXE:=$(JDK_OUTPUTDIR)/objs/$1$(EXE_SUFFIX),\ + VERSIONINFO_RESOURCE:=$$($1_VERSION_INFO_RESOURCE),\ RC_FLAGS:=$(RC_FLAGS)\ /D "JDK_FNAME=$1$(EXE_SUFFIX)" \ /D "JDK_INTERNAL_NAME=$1" \ - /D "JDK_FTYPE=0x1L") + /D "JDK_FTYPE=0x1L" \ + $7,\ + MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest) - BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/newobjs/$1$(EXE_SUFFIX) $(JDK_OUTPUTDIR)/bin/$1$(EXE_SUFFIX) + BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin/$1$(EXE_SUFFIX) endef ########################################################################################## @@ -84,8 +97,23 @@ ifeq ($(PLATFORM),macosx) XLIBS:= endif +ifdef OPENJDK + JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/windows/resource/icons" +else + JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows" +endif + $(eval $(call SetupLauncher,java,\ - -DEXPAND_CLASSPATH_WILDCARDS)) + -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib,\ + $(JDK_OUTPUTDIR)/objs/jli_static.lib,$(JAVA_RC_FLAGS),\ + $(JDK_TOPDIR)/src/windows/resource/java.rc)) + +ifeq ($(HOST_OS),windows) + $(eval $(call SetupLauncher,javaw,\ + -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib,\ + $(JDK_OUTPUTDIR)/objs/jli_static.lib,$(JAVA_RC_FLAGS),\ + $(JDK_TOPDIR)/src/windows/resource/java.rc)) +endif ifeq ($(PLATFORM),solaris) THREAD_LIB:=-lthread @@ -257,61 +285,114 @@ endif ########################################################################################## # The order of the object files on the link command line affects the size of the resulting # binary (at least on linux) which causes the size to differ between old and new build. -UNPACKEXE_ZIPOBJS = $(JDK_OUTPUTDIR)/newobjs/libzip/zcrc32$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/newobjs/libzip/deflate$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/newobjs/libzip/trees$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/newobjs/libzip/zadler32$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/newobjs/libzip/compress$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/newobjs/libzip/zutil$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/newobjs/libzip/inflate$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/newobjs/libzip/infback$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/newobjs/libzip/inftrees$(OBJ_SUFFIX) \ - $(JDK_OUTPUTDIR)/newobjs/libzip/inffast$(OBJ_SUFFIX) +ifeq ($(USE_EXTERNAL_LIBZ), true) +UNPACKEXE_ZIPOBJS := -lz +else +UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \ + $(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX) + + +$(JDK_OUTPUTDIR)/bin/unpack200$(EXE_SUFFIX): $(UNPACKEXE_ZIPOBJS) + +endif $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE,\ SRC:=$(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack,\ EXCLUDE_FILES:=jni.cpp,\ - LANG:=C++,\ + LANG:=C,\ CFLAGS:=$(CXXFLAGS_JDKEXE) $(CXX_O_FLAG_NORM) \ -DFULL \ -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5,\ CFLAGS_release:=-DPRODUCT,\ CFLAGS_linux:=-fPIC,\ + MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers-unpack200, \ LDFLAGS:=$(LDFLAGS_JDKEXE) \ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libunpack/mapfile-vers-unpack200) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LDFLAGS_SUFFIX:=$(UNPACKEXE_ZIPOBJS) $(LIBCXX),\ LDFLAGS_SUFFIX_solaris:=-lc,\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/unpackexe,\ - EXE:=$(JDK_OUTPUTDIR)/newobjs/unpack200$(EXE_SUFFIX),\ + BIN:=$(JDK_OUTPUTDIR)/objs/unpackexe,\ + EXE:=$(JDK_OUTPUTDIR)/objs/unpack200$(EXE_SUFFIX),\ VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ RC_FLAGS:=$(RC_FLAGS)\ /D "JDK_FNAME=unpack200.exe" \ /D "JDK_INTERNAL_NAME=unpack200" \ - /D "JDK_FTYPE=0x1L")) - -$(JDK_OUTPUTDIR)/bin/unpack200$(EXE_SUFFIX): $(UNPACKEXE_ZIPOBJS) - -ifeq ($(HOST_OS_API),winapi) - UNPACK_MANIFEST:=$(JDK_OUTPUTDIR)/newobjs/unpackexe/unpack200.exe.manifest - IMVERSIONVALUE=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER) - SED_ALL_MANIFEST=$(SED) -e 's%IMVERSION%$(IMVERSIONVALUE)%g' - - $(UNPACK_MANIFEST): $(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest - $(CAT) $< | $(SED_ALL_MANIFEST) > $@ - - # Adding a dependency to spec file might be a good idea here, to force rerun on version change. - $(JDK_OUTPUTDIR)/newobjs/unpackexe/unpack200.exe.manifest.mt: $(UNPACK_MANIFEST) - $(MT) /manifest $< /outputresource:$(JDK_OUTPUTDIR)/newobjs/unpack200$(EXE_SUFFIX);#1 - touch $@ - - $(JDK_OUTPUTDIR)/newobjs/unpackexe/unpack200.exe.manifest.mt: $(JDK_OUTPUTDIR)/bin/unpack200$(EXE_SUFFIX) -endif + /D "JDK_FTYPE=0x1L",\ + MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest)) BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin/unpack200$(EXE_SUFFIX) ########################################################################################## + +BUILD_JEXEC := +BUILD_JEXEC_SRC := +BUILD_JEXEC_INC := +BUILD_JEXEC_DST := $(JDK_OUTPUTDIR)/lib/$(LIBARCH)/jexec$(EXE_SUFFIX) + +# +# UNHANDLED: +# - COMPILE_APPROACH = normal +# + +# +# jdk/make/java/Makefile +# +ifeq ($(PLATFORM), solaris) + ifeq ($(ARCH_DATA_MODEL), 32) + BUILD_JEXEC := 1 + endif +endif + +ifeq ($(PLATFORM), linux) + BUILD_JEXEC := 1 +endif # PLATFORM + +# +# jdk/make/java/jexec/Makefile +# +ifeq ($(BUILD_JEXEC), 1) + + ifeq ($(PLATFORM),windows) + else ifeq ($(PLATFORM),macosx) + BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/macosx/bin + else + BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/solaris/bin + endif + + ifeq ($(PLATFORM), linux) + BUILD_JEXEC_DST := $(JDK_OUTPUTDIR)/lib/jexec$(EXE_SUFFIX) + BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/share/bin + endif +endif + +# +# Note that the two Makefile's seems to contradict each other, +# and that src/macosx/bin/jexec.c seems unused +# +ifneq ($(BUILD_JEXEC_SRC),) + $(eval $(call SetupNativeCompilation,BUILD_JEXEC,\ + SRC:=$(BUILD_JEXEC_SRC),\ + INCLUDE_FILES:=jexec.c,\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKEXE) $(C_O_FLAG_NORM) \ + $(BUILD_JEXEC_INC), \ + LDFLAGS:=$(LDFLAGS_JDKEXE), \ + BIN:=$(JDK_OUTPUTDIR)/objs/jexec_obj,\ + EXE:=$(BUILD_JEXEC_DST))) + + BUILD_LAUNCHERS += $(BUILD_JEXEC_DST) +endif + +########################################################################################## + # # The java-rmi.cgi script in bin/ only gets delivered in certain situations # @@ -335,22 +416,25 @@ endif ifeq ($(HOST_OS_API),winapi) $(eval $(call SetupLauncher,java-rmi,\ -DEXPAND_CLASSPATH_WILDCARDS,\ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/java/main/java/mapfile-$(ARCH)))) + $(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/makefiles/java/main/java/mapfile-$(ARCH)))) - $(JAVA_RMI_CGI): $(JDK_OUTPUTDIR)/newobjs/java-rmi$(EXE_SUFFIX) + $(JAVA_RMI_CGI): $(JDK_OUTPUTDIR)/objs/java-rmi$(EXE_SUFFIX) + $(MKDIR) -p $(@D) $(CP) $< $@ BUILD_LAUNCHERS += $(JAVA_RMI_CGI) else $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh + $(MKDIR) -p $(@D) $(CP) $< $@ $(CHMOD) a+x $@ endif ########################################################################################## -$(JDK_OUTPUTDIR)/bin/% : $(JDK_OUTPUTDIR)/newobjs/% - echo Copying $(@F) +$(JDK_OUTPUTDIR)/bin/% : $(JDK_OUTPUTDIR)/objs/% + $(ECHO) Copying $(@F) + $(MKDIR) -p $(@D) $(CP) $< $@ $(BUILD_LAUNCHERS) : $(JDK_TOPDIR)/makefiles/CompileLaunchers.gmk diff --git a/jdk/makefiles/CompileNativeLibraries.gmk b/jdk/makefiles/CompileNativeLibraries.gmk index fb97317ee1b..3851ab99eca 100644 --- a/jdk/makefiles/CompileNativeLibraries.gmk +++ b/jdk/makefiles/CompileNativeLibraries.gmk @@ -52,8 +52,8 @@ else INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/bin endif -$(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX) : $(JDK_OUTPUTDIR)/newobjs/%$(SHARED_LIBRARY_SUFFIX) - echo Copying $(@F) +$(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX) : $(JDK_OUTPUTDIR)/objs/%$(SHARED_LIBRARY_SUFFIX) + $(ECHO) Copying $(@F) $(CP) $< $@ BUILD_LIBRARIES= @@ -70,28 +70,64 @@ endif ########################################################################################## +BUILD_LIBZIP_FILES := \ + CRC32.c \ + Adler32.c \ + Deflater.c \ + Inflater.c \ + ZipFile.c \ + zip_util.c + +ifeq ($(USE_EXTERNAL_LIBZ),true) + LIBZ := -lz +else +BUILD_LIBZIP_FILES += \ + compress.c \ + deflate.c \ + gzclose.c \ + gzlib.c \ + gzread.c \ + gzwrite.c \ + infback.c \ + inffast.c \ + inflate.c \ + inftrees.c \ + trees.c \ + uncompr.c \ + zadler32.c \ + zcrc32.c \ + zutil.c + LIBZ_INCLUDE := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5 +endif + $(eval $(call SetupNativeCompilation,BUILD_LIBZIP,\ - SRC:=$(JDK_TOPDIR)/src/share/native/java/util/zip,\ + SRC:=$(JDK_TOPDIR)/src/share/native/java/util/zip \ + $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5,\ + INCLUDE_FILES := $(BUILD_LIBZIP_FILES), \ LANG:=C,\ CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ - -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5 \ + $(LIBZ_INCLUDE) \ -I$(JDK_TOPDIR)/src/share/native/java/io \ -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/java/io,\ - CFLAGS_posix:=-DUSE_MMAP,\ + CFLAGS_posix:=-DUSE_MMAP -UDEBUG,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libzip/mapfile-vers, \ LDFLAGS:=$(LDFLAGS_JDKLIB) \ - $(EXPORT_ZIP_FUNCS) \ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libzip/mapfile-vers),\ + $(EXPORT_ZIP_FUNCS), \ LDFLAGS_winapi:=-export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ - -export:ZIP_ReadEntry -export:ZIP_GetNextEntry,\ - LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libzip,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)zip$(SHARED_LIBRARY_SUFFIX))) + -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \ + java.lib,\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(LIBZ),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libzip,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)zip$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)zip$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)zip$(SHARED_LIBRARY_SUFFIX) ########################################################################################## -LIBUNPACK_LIB_FILE := $(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX) +LIBUNPACK_LIB_FILE := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX) $(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK,\ SRC:=$(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack,\ @@ -100,13 +136,14 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK,\ CFLAGS:=$(CXXFLAGS_JDKLIB) $(CXX_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ -DNO_ZLIB -DUNPACK_JNI -DFULL,\ CFLAGS_release:=-DPRODUCT,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers, \ LDFLAGS:=$(LDFLAGS_JDKLIB)\ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libunpack/mapfile-vers) \ $(call SET_SHARED_LIBRARY_ORIGIN),\ - LDFLAGS_winapi:=-map:$(JDK_OUTPUTDIR)/newobjs/unpack.map /debug,\ + LDFLAGS_winapi:=-map:$(JDK_OUTPUTDIR)/objs/unpack.map /debug \ + jvm.lib java.lib,\ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX_posix:=$(LIBCXX),\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libunpack,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libunpack,\ LIB:=$(LIBUNPACK_LIB_FILE),\ VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ RC_FLAGS:=$(RC_FLAGS)\ @@ -114,46 +151,60 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK,\ /D "JDK_INTERNAL_NAME=unpack" \ /D "JDK_FTYPE=0x2L")) +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX) ifeq ($(HOST_OS_API),winapi) $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.map: $(LIBUNPACK_LIB_FILE) - echo Copying $(@F) + $(ECHO) Copying $(@F) $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX),%.map,$<) $@ $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.pdb: $(LIBUNPACK_LIB_FILE) - echo Copying $(@F) + $(ECHO) Copying $(@F) $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX),%.pdb,$<) $@ endif ########################################################################################## -$(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY,\ - SRC:=$(JDK_TOPDIR)/src/share/native/common,\ - EXCLUDE_FILES:=check_version.c jdk_util.c jio.c jni_util.c verify_stub.c,\ - LANG:=C,\ - CFLAGS:=$(CFLAGS_JDKLIB) ${C_O_FLAG_HI} $(SHARED_LIBRARY_FLAGS), \ - LDFLAGS:=$(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libverify/mapfile-vers),\ - LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libverify,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)verify$(SHARED_LIBRARY_SUFFIX))) +BUILD_LIBFDLIBM_OPTIMIZATION:= $(C_O_FLAG_HI) -BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)verify$(SHARED_LIBRARY_SUFFIX) - -########################################################################################## +ifneq ($(PLATFORM), solaris) + BUILD_LIBFDLIBM_OPTIMIZATION := $(C_O_FLAG_NONE) +endif +ifneq ($(PLATFORM),macosx) $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM,\ SRC:=$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src,\ LANG:=C,\ - CFLAGS:=$(CFLAGS_JDKLIB) ${C_O_FLAG_NONE}\ + CFLAGS:=$(CFLAGS_JDKLIB) $(BUILD_LIBFDLIBM_OPTIMIZATION) \ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include,\ CFLAGS_winapi_debug:=-DLOGGING,\ ARFLAGS:=$(ARFLAGS),\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libfdlibm,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX))) + BIN:=$(JDK_OUTPUTDIR)/objs/libfdlibm,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX))) +else +# +# On macosx they do partial (incremental) linking of fdlibm +# code it here...rather than add support to NativeCompilation +# as this is firt time I see it +$(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM,\ + SRC:=$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src,\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(BUILD_LIBFDLIBM_OPTIMIZATION) \ + -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include,\ + LDFLAGS := -nostdlib -r,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libfdlibm,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(SHARED_LIBRARY_SUFFIX))) -BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) : \ + $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(SHARED_LIBRARY_SUFFIX) + $(CP) -a $< $@ +endif + + +BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) ########################################################################################## @@ -173,14 +224,17 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBATTACH,\ EXCLUDE_FILES:=$(LIBATTACH_EXCLUDE_FILES),\ LANG:=C,\ CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libattach/mapfile-$(PLATFORM), \ LDFLAGS:=$(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libattach/mapfile-$(PLATFORM)) \ $(call SET_SHARED_LIBRARY_ORIGIN),\ LDFLAGS_solaris:=-ldoor,\ - LDFLAGS_winapi:=psapi.lib advapi32.lib,\ + LDFLAGS_winapi:=psapi.lib advapi32.lib java.lib jvm.lib,\ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libattach,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX))) + BIN:=$(JDK_OUTPUTDIR)/objs/libattach,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) @@ -196,14 +250,17 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET,\ -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/transport/socket \ -I$(JDK_TOPDIR)/src/share/back/export \ -I$(JDK_TOPDIR)/src/share/back,\ - LDFLAGS:=$(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libdt_socket/mapfile-vers),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libdt_socket/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB), \ LDFLAGS_SUFFIX_linux:=-lpthread,\ LDFLAGS_SUFFIX_solaris:=-lnsl -lsocket,\ LDFLAGS_SUFFIX_winapi:=-export:jdwpTransport_OnLoad ws2_32.lib,\ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libdt_socket,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)dt_socket$(SHARED_LIBRARY_SUFFIX))) + BIN:=$(JDK_OUTPUTDIR)/objs/libdt_socket,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)dt_socket$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)dt_socket$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)dt_socket$(SHARED_LIBRARY_SUFFIX) @@ -224,8 +281,8 @@ ifeq ($(HOST_OS_API),winapi) LDFLAGS:=$(LDFLAGS_JDKLIB),\ LDFLAGS_winapi:=-export:jdwpTransport_OnLoad,\ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libdt_shmem,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)dt_shmem$(SHARED_LIBRARY_SUFFIX))) + BIN:=$(JDK_OUTPUTDIR)/objs/libdt_shmem,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)dt_shmem$(SHARED_LIBRARY_SUFFIX))) BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)dt_shmem$(SHARED_LIBRARY_SUFFIX) @@ -246,45 +303,55 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJDWP,\ -I$(JDK_TOPDIR)/src/share/back \ -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/back \ -I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers,\ - LDFLAGS:=$(filter-out -ljava,$(LDFLAGS_JDKLIB)) \ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libjdwp/mapfile-vers),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjdwp/mapfile-vers, \ + LDFLAGS:=$(filter-out -ljava,$(LDFLAGS_JDKLIB)), \ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ - LDFLAGS_SUFFIX_linux:=-ldl,\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libjdwp,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)jdwp$(SHARED_LIBRARY_SUFFIX))) + LDFLAGS_SUFFIX_linux:=$(LIBDL),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libjdwp,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jdwp$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jdwp$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)jdwp$(SHARED_LIBRARY_SUFFIX) ########################################################################################## +LIBJAAS_MAPFILE := ifneq ($(PLATFORM),solaris) LIBJAAS_EXCLUDE_FILES:=Solaris.c +else + # only on solaris...wonder why + LIBJAAS_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjaas/mapfile-vers endif $(eval $(call SetupNativeCompilation,BUILD_LIBJAAS,\ SRC:=$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/com/sun/security/auth/module,\ LANG:=C,\ CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS),\ + MAPFILE := $(LIBJAAS_MAPFILE),\ LDFLAGS:=$(filter-out -ljava,$(LDFLAGS_JDKLIB)) \ $(call SET_SHARED_LIBRARY_ORIGIN),\ LDFLAGS_winapi:=netapi32.lib user32.lib mpr.lib advapi32.lib,\ - LDFLAGS_solaris:=$(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libjaas/mapfile-vers),\ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ EXCLUDE_FILES:=$(LIBJAAS_EXCLUDE_FILES),\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libjaas,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)jaas$(SHARED_LIBRARY_SUFFIX))) + BIN:=$(JDK_OUTPUTDIR)/objs/libjaas,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jaas$(SHARED_LIBRARY_SUFFIX))) -BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)jaas$(SHARED_LIBRARY_SUFFIX) +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jaas$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jaas$(SHARED_LIBRARY_SUFFIX) # Oddly enough, it is called jaas_nt.dll under winapi and libjaas_unix.so under posix. ifeq ($(PLATFORM),windows) - $(INSTALL_LIBRARIES_HERE)/jaas_nt.dll : $(JDK_OUTPUTDIR)/newobjs/jaas.dll - echo Copying $(@F) + $(INSTALL_LIBRARIES_HERE)/jaas_nt.dll : $(JDK_OUTPUTDIR)/objs/jaas.dll + $(ECHO) Copying $(@F) $(CP) $< $@ BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/jaas_nt.dll else - $(INSTALL_LIBRARIES_HERE)/libjaas_unix$(SHARED_LIBRARY_SUFFIX) : $(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)jaas$(SHARED_LIBRARY_SUFFIX) - echo Copying $(@F) + $(INSTALL_LIBRARIES_HERE)/libjaas_unix$(SHARED_LIBRARY_SUFFIX) : $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jaas$(SHARED_LIBRARY_SUFFIX) + $(ECHO) Copying $(@F) $(CP) $< $@ BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/libjaas_unix$(SHARED_LIBRARY_SUFFIX) endif @@ -294,9 +361,7 @@ endif ifeq ($(HOST_OS_API),posix) # TODO make this work on macosx ifneq ($(HOST_OS),macosx) -# -# NOTE: Change -L flag to point to new lib location after converting libnio. Also -# add dependency on nio from sctp. + $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP,\ SRC:=$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/nio/ch/sctp,\ LANG:=C,\ @@ -307,18 +372,20 @@ ifeq ($(HOST_OS_API),posix) -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/nio/ch \ -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/java/net,\ CFLAGS_linux:=-Werror,\ - LDFLAGS:=$(LDFLAGS_JDKLIB) -L$(JDK_OUTPUTDIR)/lib/$(LIBARCHDIR)\ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libsctp/mapfile-vers) \ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsctp/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN),\ LDFLAGS_SUFFIX_linux:=-lpthread,\ - LDFLAGS_SUFFIX_posix:=-ldl -lnio -lnet,\ + LDFLAGS_SUFFIX_posix:=$(LIBDL) -lnio -lnet,\ LDFLAGS_SUFFIX_solaris:=-lsocket,\ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ INCLUDE_FILES:=SctpNet.c SctpChannelImpl.c SctpServerChannelImpl.c,\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libsctp,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)sctp$(SHARED_LIBRARY_SUFFIX))) + BIN:=$(JDK_OUTPUTDIR)/objs/libsctp,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)sctp$(SHARED_LIBRARY_SUFFIX))) BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)sctp$(SHARED_LIBRARY_SUFFIX) + + $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)sctp$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)nio$(SHARED_LIBRARY_SUFFIX) endif endif @@ -330,12 +397,15 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSDT,\ LANG:=C,\ CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS)\ -I$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsdt/mapfile-vers, \ LDFLAGS:=$(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libjsdt/mapfile-vers) \ $(call SET_SHARED_LIBRARY_ORIGIN),\ - LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) -ldl,\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libjsdt,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)jsdt$(SHARED_LIBRARY_SUFFIX))) + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libjsdt,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jsdt$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jsdt$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)jsdt$(SHARED_LIBRARY_SUFFIX) @@ -360,42 +430,36 @@ ifdef OPENJDK -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug,\ CFLAGS_solaris:=-xc99=no_lib,\ CFLAGS_winapi:=-DCMS_IS_WINDOWS_,\ - LDFLAGS:=$(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/liblcms/mapfile-vers),\ - LDFLAGS_posix:=-L$(JDK_OUTPUTDIR)/lib/$(LIBARCHDIR)xawt,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/liblcms/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB), \ LDFLAGS_solaris:=/usr/lib$(ISA_DIR)/libm.so.2,\ - LDFLAGS_winapi:=$(JDK_OUTPUTDIR)/tmp/sun/sun.awt/awt/$(OBJDIRNAME)/awt.lib,\ + LDFLAGS_winapi:=awt.lib java.lib,\ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX_posix:=-lawt,\ LDFLAGS_SUFFIX_linux:=-lm,\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/liblcms,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)lcms$(SHARED_LIBRARY_SUFFIX))) + BIN:=$(JDK_OUTPUTDIR)/objs/liblcms,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)lcms$(SHARED_LIBRARY_SUFFIX))) BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)lcms$(SHARED_LIBRARY_SUFFIX) + + $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)lcms$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt$(SHARED_LIBRARY_SUFFIX) endif ########################################################################################## ifdef OPENJDK - BUILD_LIBJPEG_MAPFILE := makefiles/mapfiles/libjpeg/mapfile-vers + BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers else - BUILD_LIBJPEG_MAPFILE := makefiles/mapfiles/libjpeg/mapfile-vers-closed + BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC) endif +BUILD_LIBJPEG_REORDER := ifeq ($(PLATFORM), solaris) ifneq ($(ARCH), amd64) BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(ARCH) - $(JDK_OUTPUTDIR)/newobjs/libjpeg/mapfile-vers : $(JDK_TOPDIR)/$(BUILD_LIBJPEG_MAPFILE) \ - $(BUILD_LIBJPEG_REORDER) - $(MKDIR) -p $(@D) - $(CAT) $(JDK_TOPDIR)/$(BUILD_LIBJPEG_MAPFILE) > $@ - $(SED) -e 's=OUTPUTDIR=$(JDK_OUTPUTDIR)=' $(BUILD_LIBJPEG_REORDER) >> $@ - LIBJPEG_MAPFILE:=$(JDK_OUTPUTDIR)/newobjs/libjpeg/mapfile-vers - - $(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)jpeg$(SHARED_LIBRARY_SUFFIX): \ - $(JDK_OUTPUTDIR)/newobjs/libjpeg/mapfile-vers endif endif @@ -418,29 +482,205 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJPEG,\ SRC:=$(BUILD_LIBJPEG_CLOSED_SRC) \ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\ LANG:=C,\ - CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_HI) $(SHARED_LIBRARY_FLAGS) \ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_HIGHEST) $(SHARED_LIBRARY_FLAGS) \ $(BUILD_LIBJPEG_CLOSED_INCLUDES) \ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\ - CFLAGS_solaris:=-xF,\ + MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \ LDFLAGS:=$(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_MAPFILE,$(BUILD_LIBJPEG_MAPFILE))\ $(call SET_SHARED_LIBRARY_ORIGIN),\ - LDFLAGS_linux:=-ldl,\ + LDFLAGS_linux:=$(LIBDL),\ + LDFLAGS_winapi:=java.lib jvm.lib,\ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libjpeg,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)jpeg$(SHARED_LIBRARY_SUFFIX))) + REORDER := $(BUILD_LIBJPEG_REORDER),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libjpeg,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jpeg$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jpeg$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)jpeg$(SHARED_LIBRARY_SUFFIX) ########################################################################################## +BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib +BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \ + -I$(BUILD_LIBMLIB_SRC) \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/awt/medialib + +BUILD_LIBMLIB_LDLIBS := +BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libmlib_image/mapfile-vers + +ifneq ($(PLATFORM), sparc) + BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH +endif + +ifeq ($(ARCH_DATA_MODEL), 64) + BUILD_LIBMLIB_CFLAGS += -DMLIB_OS64BIT +endif + +ifneq ($(PLATFORM), windows) + BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL) +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE,\ + SRC:=$(BUILD_LIBMLIB_SRC),\ + EXCLUDE_FILES:=awt_ImagingLib.c mlib_c_ImageBlendTable.c,\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_HIGHEST) $(SHARED_LIBRARY_FLAGS) \ + $(BUILD_LIBMLIB_CFLAGS),\ + MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(BUILD_LIBMLIB_LDLIBS) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ + LDFLAGS_SUFFIX_posix := -lm,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libmlib_image,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)mlib_image$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)mlib_image$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)mlib_image$(SHARED_LIBRARY_SUFFIX) + +########################################################################################## + +ifeq ($(PLATFORM),solaris) +ifeq ($(ARCH),sparc) + BUILD_LIBMLIB_IMAGE_V := 1 +else ifeq ($(ARCH), sparcv9) + BUILD_LIBMLIB_IMAGE_V := 1 +endif +endif + +ifeq ($(BUILD_LIBMLIB_IMAGE_V), 1) + +BUILD_LIBMLIB_IMAGE_V_FILES := \ + mlib_v_ImageLookUp.c \ + mlib_ImageCreate.c \ + mlib_ImageAffine.c \ + mlib_ImageConvMxN.c \ + mlib_ImageConvKernelConvert.c \ + mlib_sys.c \ + mlib_ImageLookUp_64.c \ + mlib_ImageLookUp_Bit.c \ + mlib_ImageColorTrue2Index.c \ + mlib_c_ImageThresh1_U8.c \ + mlib_v_ImageLookUpS16S16Func.c \ + mlib_v_ImageLookUpS16S32Func.c \ + mlib_v_ImageLookUpS16U16Func.c \ + mlib_v_ImageLookUpS16U8Func.c \ + mlib_v_ImageLookUpS32S16Func.c \ + mlib_v_ImageLookUpS32S32Func.c \ + mlib_v_ImageLookUpS32U16Func.c \ + mlib_v_ImageLookUpS32U8Func.c \ + mlib_v_ImageLookUpSIS16S16Func.c \ + mlib_v_ImageLookUpSIS16S32Func.c \ + mlib_v_ImageLookUpSIS16U16Func.c \ + mlib_v_ImageLookUpSIS16U8Func.c \ + mlib_v_ImageLookUpSIS32S16Func.c \ + mlib_v_ImageLookUpSIS32S32Func.c \ + mlib_v_ImageLookUpSIS32U16Func.c \ + mlib_v_ImageLookUpSIS32U8Func.c \ + mlib_v_ImageLookUpSIU16S16Func.c \ + mlib_v_ImageLookUpSIU16S32Func.c \ + mlib_v_ImageLookUpSIU16U16Func.c \ + mlib_v_ImageLookUpSIU16U8Func.c \ + mlib_v_ImageLookUpSIU8S16Func.c \ + mlib_v_ImageLookUpSIU8S32Func.c \ + mlib_v_ImageLookUpSIU8U16Func.c \ + mlib_v_ImageLookUpSIU8U8Func.c \ + mlib_v_ImageLookUpU16S16Func.c \ + mlib_v_ImageLookUpU16S32Func.c \ + mlib_v_ImageLookUpU16U16Func.c \ + mlib_v_ImageLookUpU16U8Func.c \ + mlib_v_ImageLookUpU8S16Func.c \ + mlib_v_ImageLookUpU8S32Func.c \ + mlib_v_ImageLookUpU8U16Func.c \ + mlib_v_ImageLookUpU8U8Func.c \ + mlib_v_ImageAffineIndex_BC.c \ + mlib_v_ImageAffine_BC.c \ + mlib_v_ImageAffine_BC_S16.c \ + mlib_v_ImageAffine_BC_U16.c \ + mlib_v_ImageAffine_BL.c \ + mlib_v_ImageAffine_BL_S16.c \ + mlib_v_ImageAffine_BL_U16.c \ + mlib_v_ImageAffine_NN.c \ + mlib_v_ImageFilters.c \ + mlib_ImageAffineEdge.c \ + mlib_ImageAffine_BC_D64.c \ + mlib_ImageAffine_BC_F32.c \ + mlib_ImageAffine_BC_S32.c \ + mlib_ImageAffine_BL_D64.c \ + mlib_ImageAffine_BL_F32.c \ + mlib_ImageAffine_BL_S32.c \ + mlib_ImageAffine_NN.c \ + mlib_ImageAffine_NN_Bit.c \ + mlib_ImageFilters.c \ + mlib_ImageScanPoly.c \ + mlib_ImageConv_8nw.c \ + mlib_ImageConv_8ext.c \ + mlib_ImageConv_16nw.c \ + mlib_ImageConv_16ext.c \ + mlib_ImageConv_u16nw.c \ + mlib_ImageConv_u16ext.c \ + mlib_ImageConv_32nw.c \ + mlib_ImageConv_F32nw.c \ + mlib_ImageConvMxN_Fp.c \ + mlib_ImageConvMxN_ext.c \ + mlib_ImageConv_D64nw.c \ + mlib_ImageClipping.c \ + mlib_ImageConvCopyEdge_Bit.c \ + mlib_ImageConvClearEdge_Bit.c \ + mlib_ImageConv2x2_f.c \ + mlib_ImageConvClearEdge_Fp.c \ + mlib_v_ImageConvMxN_8.c \ + mlib_v_ImageConvClearEdge.c \ + mlib_v_ImageConvCopyEdge.c \ + mlib_v_ImageConvMxN_8ext.c \ + mlib_v_ImageConvVersion.c \ + mlib_v_ImageConv_8nw.c \ + mlib_ImageConvCopyEdge_Fp.c \ + mlib_v_ImageChannelInsert_1.c \ + mlib_v_ImageChannelExtract_43.c \ + mlib_v_ImageChannelExtract_1.c \ + mlib_ImageCopy_Bit.c \ + mlib_v_ImageCopy_f.c \ + mlib_ImageUtils.c \ + mlib_ImageDivTables.c + +# +# TODO +# +# ASFLAGS += -P +# INLINE = $(PLATFORM_SRC)/native/sun/awt/medialib/vis_$(ARCH_DATA_MODEL).il + +$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V,\ + SRC:=$(JDK_TOPDIR)/src/share/native/sun/awt/medialib \ + $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib,\ + LANG:=C,\ + INCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_FILES),\ + CFLAGS:=$(BUILD_LIBMLIB_CFLAGS) \ + $(CFLAGS_JDKLIB) $(C_O_FLAG_HI) $(SHARED_LIBRARY_FLAGS) \ + MAPFILE := $(JDK_TOPDIR)/$(BUILD_LIBMLIB_IMAGE_MAPFILE), \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(BUILD_LIBMLIB_LDLIBS) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libmlib_image_v,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)mlib_image_v$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)mlib_image_v$(SHARED_LIBRARY_SUFFIX) + +endif + +########################################################################################## + ifndef OPENJDK FONT_HEADERS := -I$(CLOSED_SRC)/share/native/$(PKGDIR)/t2k - BUILD_LIBFONTMANAGER_MAPFILE := makefiles/mapfiles/libfontmanager/mapfile-vers + BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c else FONT_HEADERS := $(FREETYPE2_CFLAGS) - BUILD_LIBFONTMANAGER_MAPFILE := makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk + BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE2_LIBS) endif @@ -478,18 +718,25 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER,\ CFLAGS_windows=$(C_O_FLAG_NORM)\ -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/windows \ -DCC_NOEX, \ + MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \ LDFLAGS:=$(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) \ - $(call SET_SHARED_LIBRARY_MAPFILE,$(BUILD_LIBFONTMANAGER_MAPFILE)) \ $(call SET_SHARED_LIBRARY_ORIGIN),\ - LDFLAGS_solaris:=-L$(JDK_OUTPUTDIR)/lib/$(LIBARCHDIR)headless,\ - LDFLAGS_windows:=advapi32.lib user32.lib gdi32.lib $(JDK_OUTPUTDIR)/tmp/sun/sun.awt/awt/$(OBJDIRNAME)/awt.lib,\ + LDFLAGS_windows:=advapi32.lib user32.lib gdi32.lib awt.lib java.lib,\ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) \ $(BUILD_LIBFONTMANAGER_FONTLIB),\ LDFLAGS_SUFFIX_linux:=-lawt $(LIBM) $(LIBCXX),\ LDFLAGS_SUFFIX_solaris:=-lawt -lawt_xawt -lc $(LIBM) $(LIBCXX),\ LDFLAGS_SUFFIX_macosx:=-lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup,\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libfontmanager,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)fontmanager$(SHARED_LIBRARY_SUFFIX))) + BIN:=$(JDK_OUTPUTDIR)/objs/libfontmanager,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fontmanager$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fontmanager$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt$(SHARED_LIBRARY_SUFFIX) + +ifneq (,$(findstring $(PLATFORM),solaris macosx)) +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fontmanager$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_xawt$(SHARED_LIBRARY_SUFFIX) +endif BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)fontmanager$(SHARED_LIBRARY_SUFFIX) @@ -525,26 +772,35 @@ ifndef OPENJDK CXXFLAGS:=$(CXXFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON) $(CXX_O_FLAG_HI),\ CFLAGS_windows=-DCC_NOEX, \ CXXFLAGS_windows=-DCC_NOEX, \ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libt2k/mapfile-vers, \ LDFLAGS:=$(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libt2k/mapfile-vers) \ $(call SET_SHARED_LIBRARY_ORIGIN),\ - LDFLAGS_windows:=user32.lib $(JDK_OUTPUTDIR)/newobjs/fontmanager.lib,\ + LDFLAGS_windows:=user32.lib $(JDK_OUTPUTDIR)/objs/fontmanager.lib,\ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ - LDFLAGS_SUFFIX_linux:=$(LIBCXX) $(LIBM) -L$(INSTALL_LIBRARIES_HERE) -lfontmanager,\ - LDFLAGS_SUFFIX_solaris:=$(LIBCXX) $(LIBM) -L$(INSTALL_LIBRARIES_HERE) -lfontmanager -lawt \ + LDFLAGS_SUFFIX_macosx:=$(LIBCXX) $(LIBM) -lfontmanager,\ + LDFLAGS_SUFFIX_linux:=$(LIBCXX) $(LIBM) -lfontmanager,\ + LDFLAGS_SUFFIX_solaris:=$(LIBCXX) $(LIBM) -lfontmanager -lawt \ -lawt_xawt,\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libt2k,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)t2k$(SHARED_LIBRARY_SUFFIX))) + BIN:=$(JDK_OUTPUTDIR)/objs/libt2k,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)t2k$(SHARED_LIBRARY_SUFFIX))) # t2k is linked against fontmanager - $(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)t2k$(SHARED_LIBRARY_SUFFIX): \ - $(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)fontmanager$(SHARED_LIBRARY_SUFFIX) + $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)t2k$(SHARED_LIBRARY_SUFFIX): \ + $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fontmanager$(SHARED_LIBRARY_SUFFIX) BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)t2k$(SHARED_LIBRARY_SUFFIX) endif ########################################################################################## +# +# TODO replace with X_FLAGS / X_LIBS +# and add them to configure +# +OPENWIN_LIB := $(OPENWIN_HOME)/lib + +BUILD_LIBJAWT_LIB := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jawt$(SHARED_LIBRARY_SUFFIX) + ifeq ($(PLATFORM), windows) ifeq ($(ARCH_DATA_MODEL), 32) KERNEL32_LIB := kernel32.lib @@ -561,46 +817,2238 @@ ifeq ($(PLATFORM), windows) -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/java2d/windows, \ LDFLAGS:=$(LDFLAGS_JDKLIB) $(KERNEL32_LIB) \ - advapi32.lib $(JDK_OUTPUTDIR)/tmp/sun/sun.awt/awt/$(OBJDIRNAME)/awt.lib,\ + advapi32.lib awt.lib,\ LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libjawt,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)jawt$(SHARED_LIBRARY_SUFFIX))) + BIN:=$(JDK_OUTPUTDIR)/objs/libjawt,\ + LIB:=$(BUILD_LIBJAWT_LIB))) -$(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): \ - $(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)jawt$(SHARED_LIBRARY_SUFFIX) - echo Copying $(@F) - $(CP) $(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@ +$(BUILD_LIBJAWT_LIB) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT_LIB) + $(ECHO) Copying $(@F) + $(CP) $< $@ BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) else # PLATFORM not windows + JAWT_LIBS := -lawt ifndef BUILD_HEADLESS_ONLY - MAWT_AWT_LIB =-lawt_xawt + JAWT_LIBS += -lawt_xawt else - MAWT_AWT_LIB =-lawt_headless + JAWT_LIBS += -lawt_headless HEADLESS_CFLAG += -DHEADLESS endif + JAWT_FILES := jawt.c + ifeq ($(PLATFORM), macosx) + JAWT_FILES := jawt.m + JAWT_LIBS := -lawt_lwawt + endif + $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT,\ - SRC:=$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/awt,\ - INCLUDE_FILES:=jawt.c,\ + SRC:=$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/awt \ + $(JDK_TOPDIR)/src/macosx/native/sun/awt,\ + INCLUDE_FILES:=$(JAWT_FILES),\ LANG:=C,\ CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM), \ CFLAGS_linux:=$(HEADLESS_CFLAG),\ + CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt ,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjawt/mapfile-vers, \ LDFLAGS:=$(LDFLAGS_JDKLIB) \ - $(call SET_SHARED_LIBRARY_MAPFILE,makefiles/mapfiles/libjawt/mapfile-vers) \ $(call SET_SHARED_LIBRARY_ORIGIN),\ - LDFLAGS_solaris:=-L/usr/openwin/sfw/lib$(ISA_DIR) -L/usr/openwin/lib$(ISA_DIR),\ - LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(MAWT_AWT_LIB) -lawt,\ + LDFLAGS_solaris:=-L$(OPENWIN_HOME)/sfw/lib$(ISA_DIR) -L$(OPENWIN_LIB)$(ISA_DIR),\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(JAWT_LIBS),\ LDFLAGS_SUFFIX_solaris:=-lXrender,\ - BIN:=$(JDK_OUTPUTDIR)/newobjs/libjawt,\ - LIB:=$(JDK_OUTPUTDIR)/newobjs/$(LIBRARY_PREFIX)jawt$(SHARED_LIBRARY_SUFFIX))) + LDFLAGS_SUFFIX_macosx:= -framework Cocoa, \ + BIN:=$(JDK_OUTPUTDIR)/objs/libjawt,\ + LIB:=$(BUILD_LIBJAWT_LIB))) + +ifndef BUILD_HEADLESS_ONLY +$(BUILD_LIBJAWT_LIB) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_xawt$(SHARED_LIBRARY_SUFFIX) +else +$(BUILD_LIBJAWT_LIB) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX) +endif + endif # PLATFORM BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)jawt$(SHARED_LIBRARY_SUFFIX) +########################################################################################## + +BUILD_LIBVERIFY_SRC := check_code.c check_format.c + +ifeq ($(PLATFORM), solaris) + ifneq ($(ARCH), amd64) + BUILD_LIBVERIFY_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/reorder-$(ARCH) + endif +endif + + +$(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY,\ + SRC:=$(JDK_TOPDIR)/src/share/native/common,\ + INCLUDE_FILES:=$(BUILD_LIBVERIFY_SRC),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_HI) $(SHARED_LIBRARY_FLAGS),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_posix:=-ljvm -lc,\ + LDFLAGS_SUFFIX_windows:=jvm.lib,\ + REORDER := $(BUILD_LIBVERIFY_REORDER),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libverify,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)verify$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)verify$(SHARED_LIBRARY_SUFFIX) + +########################################################################################## + +ifndef OPENJDK +ifneq ($(PLATFORM), macosx) + +BUILD_LIBJDBCODBC_DIR := $(JDK_OUTPUTDIR)/objs/libjdbcodbc +BUILD_LIBJDBCODBC_NAME := $(LIBRARY_PREFIX)JdbcOdbc$(SHARED_LIBRARY_SUFFIX) +BUILD_LIBJDBCODBC_CFLAGS := +BUILD_LIBJDBCODBC_TARGET := $(JDK_OUTPUTDIR)/objs/$(BUILD_LIBJDBCODBC_NAME) +BUILD_LIBJDBCODBC_LIBS := +BUILD_LIBJDBCODBC_LDFLAGS := + +ifeq ($(PLATFORM), windows) + BUILD_LIBJDBCODBC_LDFLAGS := $(LDFLAGS_JDKLIB) + BUILD_LIBJDBCODBC_LIBS += odbc32.lib odbccp32.lib java.lib advapi32.lib +else + BUILD_LIBJDBCODBC_CFLAGS := -DUNIX + +# +# This mimics "current" build system exactly. Link against fake -lodbcinst -lodbc +# but...those are linked with the -soname, causing the dependency to be dropped on linux (gnu ld) +# but kept with other linker (solaris) +# +# IMO very weird behaviour...very weird +# + BUILD_LIBJDBCODBC_LDFLAGS += $(patsubst defs,nodefs,$(LDFLAGS_JDKLIB)) \ + -Xlinker -z -Xlinker nodefs + BUILD_LIBJDBCODBC_LIBS += -L$(BUILD_LIBJDBCODBC_DIR) -lodbcinst -lodbc + BUILD_LIBJDBCODBC_FAKE_LIBS := $(BUILD_LIBJDBCODBC_DIR)/$(LIBRARY_PREFIX)odbcinst$(SHARED_LIBRARY_SUFFIX) \ + $(BUILD_LIBJDBCODBC_DIR)/$(LIBRARY_PREFIX)odbc$(SHARED_LIBRARY_SUFFIX) + + BUILD_LIBJDBCODBC_SONAME := $(call SET_SHARED_LIBRARY_NAME,$(BUILD_LIBJDBCODBC_NAME)) +endif + +ifneq ($(PLATFORM), windows) + +$(eval $(call SetupNativeCompilation,BUILD_FAKEODBCINST,\ + SRC:=$(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc,\ + INCLUDE_FILES := dummyodbc1.c,\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS),\ + LDFLAGS:=$(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN) $(BUILD_LIBJDBCODBC_LDFLAGS),\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(BUILD_LIBJDBCODBC_SONAME),\ + BIN:=$(BUILD_LIBJDBCODBC_DIR),\ + LIB:=$(BUILD_LIBJDBCODBC_DIR)/$(LIBRARY_PREFIX)odbcinst$(SHARED_LIBRARY_SUFFIX))) + +$(eval $(call SetupNativeCompilation,BUILD_FAKEODBC,\ + SRC:=$(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc,\ + INCLUDE_FILES := dummyodbc2.c,\ + LANG:=C,\ + CFLAGS:=$(BUILD_LIBJDBCODBC_CFLAGS) $(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS),\ + LDFLAGS:=$(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN) $(BUILD_LIBJDBCODBC_LDFLAGS),\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(BUILD_LIBJDBCODBC_SONAME),\ + BIN:=$(BUILD_LIBJDBCODBC_DIR),\ + LIB:=$(BUILD_LIBJDBCODBC_DIR)/$(LIBRARY_PREFIX)odbc$(SHARED_LIBRARY_SUFFIX))) + +$(BUILD_LIBJDBCODBC_FAKE_LIBS) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +$(BUILD_LIBJDBCODBC_TARGET) : $(BUILD_LIBJDBCODBC_FAKE_LIBS) + +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBJDBCODBC,\ + SRC:=$(JDK_TOPDIR)/src/closed/share/classes/sun/jdbc/odbc,\ + EXCLUDE_FILES := dummyodbc.c,\ + LANG:=C,\ + CFLAGS:=$(BUILD_LIBJDBCODBC_CFLAGS) $(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) \ + $(SHARED_LIBRARY_FLAGS),\ + LDFLAGS:=$(BUILD_LIBJDBCODBC_LDFLAGS) \ + $(call SET_SHARED_LIBRARY_ORIGIN) $(BUILD_LIBJDBCODBC_LIBS),\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(BUILD_LIBJDBCODBC_SONAME),\ + BIN:=$(BUILD_LIBJDBCODBC_DIR),\ + LIB:=$(BUILD_LIBJDBCODBC_TARGET))) + +$(BUILD_LIBJDBCODBC_TARGET) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JdbcOdbc$(SHARED_LIBRARY_SUFFIX) + +endif +endif + +########################################################################################## + +BUILD_LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/share/instrument \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/java/io \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/instrument + +BUILD_LIBINSTRUMENT_FILES := \ + EncodingSupport.c \ + EncodingSupport_md.c \ + FileSystemSupport_md.c \ + InstrumentationImplNativeMethods.c \ + InvocationAdapter.c \ + JarFacade.c \ + JPLISAgent.c \ + JPLISAssert.c \ + JavaExceptions.c \ + PathCharsValidator.c \ + Reentrancy.c \ + Utilities.c \ + canonicalize_md.c + +BUILD_LIBINSTRUMENT_DIR := $(JDK_OUTPUTDIR)/objs/libinstrument +BUILD_LIBINSTRUMENT_NAME := $(LIBRARY_PREFIX)instrument$(SHARED_LIBRARY_SUFFIX) +BUILD_LIBINSTRUMENT_CFLAGS := -I$(JDK_TOPDIR)/src/share/instrument \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/instrument \ + -I$(JDK_TOPDIR)/src/share/bin + +BUILD_LIBINSTRUMENT_TARGET := $(JDK_OUTPUTDIR)/objs/$(BUILD_LIBINSTRUMENT_NAME) +BUILD_LIBINSTRUMENT_LDFLAGS := +BUILD_LIBINSTRUMENT_LDFLAGS_SUFFIX := + +ifeq ($(PLATFORM), windows) + BUILD_LIBINSTRUMENT_LDFLAGS += jli_static.lib java.lib \ + -export:Agent_OnAttach + # equivalent of strcasecmp is stricmp on Windows + BUILD_LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp +else + +ifneq (,$(findstring $(PLATFORM), macosx)) + ifneq ($(ARCH), universal) + BUILD_LIBINSTRUMENT_LDFLAGS += -Wl,-all_load + endif + + BUILD_LIBINSTRUMENT_LDFLAGS += $(JDK_OUTPUTDIR)/objs/libjli_static.a + BUILD_LIBINSTRUMENT_LDFLAGS += -liconv + BUILD_LIBINSTRUMENT_LDFLAGS += -framework Cocoa -framework Security -framework ApplicationServices + BUILD_LIBINSTRUMENT_LDFLAGS += $(LIBZ) +else + BUILD_LIBINSTRUMENT_LDFLAGS_SUFFIX += -ljli $(LIBDL) +endif +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT,\ + SRC:=$(BUILD_LIBINSTRUMENT_SRC),\ + INCLUDE_FILES:=$(BUILD_LIBINSTRUMENT_FILES),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + $(BUILD_LIBINSTRUMENT_CFLAGS),\ + CFLAGS_debug := -DJPLIS_LOGGING,\ + CFLAGS_release := -DNO_JPLIS_LOGGING,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libinstrument/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN)\ + $(call SET_SHARED_LIBRARY_ORIGIN,jli) \ + $(BUILD_LIBINSTRUMENT_LDFLAGS),\ + LDFLAGS_SUFFIX:=$(LIBZ) $(BUILD_LIBINSTRUMENT_LDFLAGS_SUFFIX),\ + BIN:=$(BUILD_LIBINSTRUMENT_DIR),\ + LIB:=$(BUILD_LIBINSTRUMENT_TARGET))) + +$(BUILD_LIBINSTRUMENT_TARGET) : $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX) +$(BUILD_LIBINSTRUMENT_TARGET) : $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) +$(BUILD_LIBINSTRUMENT_TARGET) : $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(BUILD_LIBINSTRUMENT_NAME) + +########################################################################################## + +BUILD_LIBMANAGEMENT_SRC := $(JDK_TOPDIR)/src/share/native/sun/management \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/management \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/com/sun/management + +BUILD_LIBMANAGEMENT_EXCLUDES := + +BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/management + +ifneq ($(PLATFORM), windows) + BUILD_LIBMANAGEMENT_EXCLUDES += OperatingSystem_md.c +else + BUILD_LIBMANAGEMENT_EXCLUDES += UnixOperatingSystem_md.c +endif + +ifneq ($(PLATFORM),solaris) + BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c +endif + +ifneq ($(PLATFORM),linux) + BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c +endif + +ifneq ($(PLATFORM),macosx) + BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c +endif + + +$(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT,\ + SRC:=$(BUILD_LIBMANAGEMENT_SRC),\ + EXCLUDE_FILES:=$(BUILD_LIBMANAGEMENT_EXCLUDES),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_HI) $(SHARED_LIBRARY_FLAGS) $(BUILD_LIBMANAGEMENT_CFLAGS),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libmanagement/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_windows := java.lib jvm.lib advapi32.lib psapi.lib,\ + LDFLAGS_solaris := -lkstat,\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libmanagement,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)management$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)management$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)management$(SHARED_LIBRARY_SUFFIX) + +########################################################################################## + +BUILD_LIBHPROF_SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/hprof $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/demo/jvmti/hprof +BUILD_LIBHPROF_CFLAGS := -I$(JDK_TOPDIR)/src/share/demo/jvmti/hprof \ + -I$(JDK_TOPDIR)/src/share/npt \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/npt \ + -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo + +BUILD_LIBHPROF_LDFLAGS := + +ifeq ($(PLATFORM),solaris) + BUILD_LIBHPROF_LDFLAGS += -lsocket -lnsl +endif + +ifneq ($(PLATFORM),windows) + BUILD_LIBHPROF_LDFLAGS += $(LIBDL) +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBHPROF,\ + SRC:=$(BUILD_LIBHPROF_SRC),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_HIGHEST) $(SHARED_LIBRARY_FLAGS) \ + $(BUILD_LIBHPROF_CFLAGS),\ + CFLAGS_debug := -DHPROF_LOGGING,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libhprof/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_windows:=wsock32.lib winmm.lib advapi32.lib,\ + LDFLAGS_SUFFIX:=$(BUILD_LIBHPROF_LDFLAGS),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libhprof,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)hprof$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)hprof$(SHARED_LIBRARY_SUFFIX) + +########################################################################################## + +$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA_CRW_DEMO,\ + SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo,\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjava_crw_demo/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX:=,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libjava_crw_demo,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)java_crw_demo$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java_crw_demo$(SHARED_LIBRARY_SUFFIX) + +########################################################################################## + +$(eval $(call SetupNativeCompilation,BUILD_LIBNPT,\ + SRC:=$(JDK_TOPDIR)/src/share/npt $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/npt,\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/share/npt \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/npt,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnpt/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_macosx := -liconv,\ + LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libnpt,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)npt$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)npt$(SHARED_LIBRARY_SUFFIX) + +########################################################################################## + +BUILD_LIBNIO_SRC := \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/java/nio \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/nio/ch \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/nio/fs + +BUILD_LIBNIO_CFLAGS := \ + -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \ + -I$(JDK_TOPDIR)/src/share/native/java/io \ + -I$(JDK_TOPDIR)/src/share/native/java/net \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/java/net + +BUILD_LIBNIO_FILES := \ + DatagramChannelImpl.c \ + DatagramDispatcher.c \ + FileChannelImpl.c \ + FileDispatcherImpl.c \ + FileKey.c \ + IOUtil.c \ + MappedByteBuffer.c \ + Net.c \ + ServerSocketChannelImpl.c \ + SocketChannelImpl.c \ + SocketDispatcher.c + +ifeq ($(PLATFORM), windows) + BUILD_LIBNIO_FILES += \ + Iocp.c \ + RegistryFileTypeDetector.c \ + WindowsAsynchronousFileChannelImpl.c \ + WindowsAsynchronousServerSocketChannelImpl.c \ + WindowsAsynchronousSocketChannelImpl.c \ + WindowsNativeDispatcher.c \ + WindowsSelectorImpl.c +endif + +ifeq ($(PLATFORM), linux) + BUILD_LIBNIO_LDFLAGS_SUFFIX := -lpthread $(LIBDL) + BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-linux + BUILD_LIBNIO_FILES += \ + EPoll.c \ + EPollArrayWrapper.c \ + EPollPort.c \ + InheritedChannel.c \ + NativeThread.c \ + PollArrayWrapper.c \ + UnixAsynchronousServerSocketChannelImpl.c \ + UnixAsynchronousSocketChannelImpl.c \ + GnomeFileTypeDetector.c \ + LinuxNativeDispatcher.c \ + LinuxWatchService.c \ + UnixCopyFile.c \ + UnixNativeDispatcher.c +endif + +ifeq ($(PLATFORM), macosx) + BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-bsd + BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/macosx/native/sun/nio/ch + BUILD_LIBNIO_FILES += \ + InheritedChannel.c \ + NativeThread.c \ + PollArrayWrapper.c \ + UnixAsynchronousServerSocketChannelImpl.c \ + UnixAsynchronousSocketChannelImpl.c \ + GnomeFileTypeDetector.c \ + BsdNativeDispatcher.c \ + UnixCopyFile.c \ + UnixNativeDispatcher.c \ + KQueue.c \ + KQueuePort.c \ + KQueueArrayWrapper.c +endif + +ifeq ($(PLATFORM), solaris) + BUILD_LIBNIO_LDFLAGS_SUFFIX := $(LIBDL) + BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-solaris + BUILD_LIBNIO_FILES += \ + DevPollArrayWrapper.c \ + InheritedChannel.c \ + NativeThread.c \ + PollArrayWrapper.c \ + SolarisEventPort.c \ + UnixAsynchronousServerSocketChannelImpl.c \ + UnixAsynchronousSocketChannelImpl.c \ + GnomeFileTypeDetector.c \ + SolarisNativeDispatcher.c \ + SolarisWatchService.c \ + UnixCopyFile.c \ + UnixNativeDispatcher.c +endif + +BUILD_LIBNIO_LDFLAGS := +ifeq ($(PLATFORM),windows) + BUILD_LIBNIO_LDFLAGS += \ + java.lib net.lib advapi32.lib jvm.lib ws2_32.lib\ + $(JDK_OUTPUTDIR)/objs/libjava/io_util.obj \ + $(JDK_OUTPUTDIR)/objs/libjava/FileDescriptor_md.obj +endif + +ifeq ($(PLATFORM), linux) + BUILD_LIBNIO_LDFLAGS_SUFFIX += -ljava -lnet -lpthread $(LIBDL) +endif +ifeq ($(PLATFORM), macosx) + BUILD_LIBNIO_LDFLAGS_SUFFIX += -ljava -lnet -pthread +endif + +ifeq ($(PLATFORM), solaris) + BUILD_LIBNIO_LDFLAGS_SUFFIX += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \ + -ljava -lnet +endif # PLATFORM + + +$(eval $(call SetupNativeCompilation,BUILD_LIBNIO,\ + SRC:=$(BUILD_LIBNIO_SRC),\ + INCLUDE_FILES := $(BUILD_LIBNIO_FILES), \ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_HI) $(SHARED_LIBRARY_FLAGS) \ + $(BUILD_LIBNIO_CFLAGS),\ + MAPFILE := $(BUILD_LIBNIO_MAPFILE), \ + LDFLAGS:=$(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(BUILD_LIBNIO_LDFLAGS_SUFFIX),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libnio,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)nio$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)nio$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)nio$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)net$(SHARED_LIBRARY_SUFFIX) $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + + +########################################################################################## + +LIBNET_SRC_DIRS := $(JDK_TOPDIR)/src/share/native/java/net \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/java/net \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/net/dns \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/net/www/protocol/http/ntlm \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/net/sdp \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/net/spi + +LIBNET_CFLAGS := $(foreach dir,$(LIBNET_SRC_DIRS),-I$(dir)) + +LIBNET_EXCLUDE_FILES:= +ifneq ($(PLATFORM),linux) + LIBNET_EXCLUDE_FILES += linux_close.c +endif + +ifneq ($(PLATFORM),macosx) + LIBNET_EXCLUDE_FILES += bsd_close.c +endif + +ifeq ($(PLATFORM),windows) + LIBNET_EXCLUDE_FILES += PlainSocketImpl.c PlainDatagramSocketImpl.c SdpSupport.c +else + LIBNET_EXCLUDE_FILES += TwoStacksPlainSocketImpl.c DualStackPlainSocketImpl.c \ + TwoStacksPlainDatagramSocketImpl.c DualStackPlainDatagramSocketImpl.c \ + NTLMAuthSequence.c NetworkInterface_winXP.c +endif + +LIBNET_LDFLAGS_SUFFIX := + +$(eval $(call SetupNativeCompilation,BUILD_LIBNET,\ + SRC:=$(LIBNET_SRC_DIRS),\ + EXCLUDE_FILES := $(LIBNET_EXCLUDE_FILES), \ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + $(LIBNET_CFLAGS),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnet/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) $(LIBNET_LDFLAGS_SUFFIX),\ + LDFLAGS_SUFFIX_solaris := -lnsl -lsocket $(LIBDL) ,\ + LDFLAGS_SUFFIX_linux := $(LIBDL) -lpthread ,\ + LDFLAGS_SUFFIX_windows := ws2_32.lib $(JVMLIB) secur32.lib iphlpapi.lib \ + delayimp.lib java.lib jvm.lib advapi32.lib \ + /DELAYLOAD:secur32.dll /DELAYLOAD:iphlpapi.dll, \ + BIN:=$(JDK_OUTPUTDIR)/objs/libnet,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)net$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)net$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)net$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/lib/net.properties: $(JDK_TOPDIR)/src/share/lib/net.properties + $(ECHO) Copying $(@F) + $(MKDIR) -p $(@D) + $(CP) $< $@ + +COPY_FILES += $(JDK_OUTPUTDIR)/lib/net.properties + +ifeq ($(PLATFORM), solaris) +$(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template : $(JDK_TOPDIR)/src/${LEGACY_HOST_OS_API}/lib/sdp/sdp.conf.template + $(ECHO) Copying $(@F) + $(MKDIR) -p $(@D) + $(CP) $< $@ + +COPY_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template +endif + +########################################################################################## + +LIBJAVA_SRC_DIRS := $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/java/lang \ + $(JDK_TOPDIR)/src/share/native/java/lang \ + $(JDK_TOPDIR)/src/share/native/java/lang/ref \ + $(JDK_TOPDIR)/src/share/native/java/lang/reflect \ + $(JDK_TOPDIR)/src/share/native/java/io \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/java/io \ + $(JDK_TOPDIR)/src/share/native/java/nio \ + $(JDK_TOPDIR)/src/share/native/java/security \ + $(JDK_TOPDIR)/src/share/native/common \ + $(JDK_TOPDIR)/src/share/native/sun/misc \ + $(JDK_TOPDIR)/src/share/native/sun/reflect \ + $(JDK_TOPDIR)/src/share/native/java/sql \ + $(JDK_TOPDIR)/src/share/native/java/util \ + $(JDK_TOPDIR)/src/share/native/java/util/concurrent/atomic \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/common \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/java/util \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/provider \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/io + +LIBJAVA_CFLAGS := $(foreach dir,$(LIBJAVA_SRC_DIRS),-I$(dir)) \ + -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \ + -DARCHPROPNAME='"$(ARCH)"' + +LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ + -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \ + -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \ + -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"' + +ifneq (,$(JDK_UPDATE_VERSION)) + LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"' +endif + +LIBJAVA_EXCLUDE_FILES:= check_code.c check_format.c + +ifneq ($(PLATFORM),macosx) + LIBJAVA_EXCLUDE_FILES += java_props_macosx.c +else + BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c +endif + +ifeq ($(PLATFORM),windows) + LIBJAVA_EXCLUDE_FILES += \ + UNIXProcess_md.c \ + UnixFileSystem_md.c \ + FileSystemPreferences.c +else + LIBJAVA_EXCLUDE_FILES += \ + ProcessImpl_md.c \ + Win32FileSystem_md.c \ + WinNTFileSystem_md.c \ + dirent_md.c \ + WindowsPreferences.c \ + sun/security/provider/WinCAPISeedGenerator.c \ + sun/io/Win32ErrorMode.c +endif + +ifeq ($(PLATFORM), solaris) + ifneq ($(ARCH), amd64) + LIBJAVA_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/reorder-$(ARCH) + endif +endif + +LIBJAVA_FDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) +LIBJAVA_VERIFY := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)verify$(STATIC_LIBRARY_SUFFIX) + +$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA,\ + SRC:=$(LIBJAVA_SRC_DIRS),\ + EXCLUDES := fdlibm/src zip, \ + EXCLUDE_FILES := $(LIBJAVA_EXCLUDE_FILES), \ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_HI) $(SHARED_LIBRARY_FLAGS) \ + $(LIBJAVA_CFLAGS),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_windows:=-export:winFileHandleOpen -export:handleLseek \ + $(LIBJAVA_FDLIBM) $(LIBJAVA_VERIFY) jvm.lib \ + shell32.lib delayimp.lib /DELAYLOAD:shell32.dll \ + advapi32.lib,\ + LDFLAGS_SUFFIX_posix:=-ljvm -lverify, \ + LDFLAGS_SUFFIX_solaris := -lnsl -lsocket -lscf $(LIBDL) $(LIBJAVA_FDLIBM) -lc,\ + LDFLAGS_SUFFIX_linux := $(LIBDL) $(LIBJAVA_FDLIBM),\ + LDFLAGS_SUFFIX_macosx := $(LIBJAVA_FDLIBM) \ + -framework CoreFoundation \ + -framework Security -framework SystemConfiguration, \ + REORDER := $(LIBJAVA_REORDER), \ + BIN:=$(JDK_OUTPUTDIR)/objs/libjava,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) : $(LIBJLI_BINARY) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)verify$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) : $(LIBJAVA_FDLIBM) + +########################################################################################## + +BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/bin +BUILD_LIBJLI_CFLAGS := $(foreach dir,$(BUILD_LIBJLI_SRC_DIRS),-I$(dir)) + +BUILD_LIBJLI_FILES := \ + java.c \ + splashscreen_stubs.c \ + parse_manifest.c \ + version_comp.c \ + wildcard.c \ + jli_util.c + +ifeq ($(JVM_VARIANT_ZERO), true) + ERGO_FAMILY := zero +else # !ZERO_BUILD + ifneq (,$(findstring $(ARCH), amd64 x86_64)) + ERGO_FAMILY := i586 + else # !X86 FAMILY + ERGO_FAMILY := $(ARCH) + endif #ARCH_FAMILY +endif # ZERO_BUILD + +ifeq ($(PLATFORM), macosx) + BUILD_LIBJLI_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/bin + BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/bin + BUILD_LIBJLI_FILES += java_md_common.c java_md_macosx.c + + BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c + BUILD_LIBJLI_A_java_md_macosx.c_CFLAGS := -x objective-c +endif + +ifeq ($(PLATFORM), windows) + BUILD_LIBJLI_FILES += java_md.c +else ifneq ($(PLATFORM), macosx) + + BUILD_LIBJLI_FILES += java_md_common.c + BUILD_LIBJLI_FILES += java_md_solinux.c ergo.c + + ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c + + # if the architecture specific ergo file exists then + # use it, else use the generic definitions from ergo.c + ifneq ($(wildcard $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/bin/$(ERGO_ARCH_FILE)),) + BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE) + else # !ERGO_ARCH_FILE + BUILD_LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO + endif # ERGO_ARCH_FILE +endif #WINDOWS + +# Names of arch directories +BUILD_LIBJLI_CFLAGS += -DLIBARCHNAME='"$(LIBARCH)"' +ifeq ($(PLATFORM), solaris) + ifneq (,$(findstring $(ARCH),sparc)) + BUILD_LIBJLI_CFLAGS += -DLIBARCH32NAME='"sparc"' + BUILD_LIBJLI_CFLAGS += -DLIBARCH64NAME='"sparcv9"' + else + BUILD_LIBJLI_CFLAGS += -DLIBARCH32NAME='"i386"' + BUILD_LIBJLI_CFLAGS += -DLIBARCH64NAME='"amd64"' + endif +endif # PLATFORM + +ifeq ($(PLATFORM), macosx) + BUILD_LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" +endif + +ifneq ($(USE_EXTERNAL_LIBZ),true) + BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5 + BUILD_LIBJLI_CFLAGS += $(LIBZ_INCLUDE) + BUILD_LIBJLI_FILES += \ + inflate.c \ + inftrees.c \ + inffast.c \ + zadler32.c \ + zcrc32.c \ + zutil.c +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBJLI,\ + SRC:=$(BUILD_LIBJLI_SRC_DIRS),\ + INCLUDE_FILES := $(BUILD_LIBJLI_FILES),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_HI) $(SHARED_LIBRARY_FLAGS) $(BUILD_LIBJLI_CFLAGS),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjli/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX := $(LIBZ),\ + LDFLAGS_SUFFIX_posix := $(LIBDL) -lc,\ + LDFLAGS_SUFFIX_linux := -lpthread,\ + LDFLAGS_SUFFIX_windows := \ + -export:JLI_Launch \ + -export:JLI_ManifestIterate \ + -export:JLI_SetTraceLauncher \ + -export:JLI_ReportErrorMessage \ + -export:JLI_ReportErrorMessageSys \ + -export:JLI_ReportMessage \ + -export:JLI_ReportExceptionDescription \ + advapi32.lib \ + comctl32.lib \ + user32.lib,\ + LDFLAGS_SUFFIX_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \ + BIN:=$(JDK_OUTPUTDIR)/objs/libjli,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX))) + +ifeq ($(HOST_OS), windows) + LIBJLI_BINARY := $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) +else + LIBJLI_BINARY := $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) + + $(LIBJLI_BINARY) : $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) + $(MKDIR) -p $(@D) + $(ECHO) Copying $(@F) + $(CP) $< $@ +endif +BUILD_LIBRARIES += $(LIBJLI_BINARY) + +# On windows, the static library has the same suffix as the import library created by +# with the shared library, so the static library is given a different name. No harm +# in doing it for all platform to reduce complexity. +ifneq ($(HOST_OS),macosx) + $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC,\ + SRC:=$(BUILD_LIBJLI_SRC_DIRS),\ + INCLUDE_FILES := $(BUILD_LIBJLI_FILES),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_HI) $(STATIC_LIBRARY_FLAGS) $(BUILD_LIBJLI_CFLAGS),\ + ARFLAGS:=$(ARFLAGS),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libjli_static,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX))) +else + # + # On macosx they do partial (incremental) linking of fdlibm + # code it here...rather than add support to NativeCompilation + # as this is first time I see it + $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_A,\ + SRC:=$(BUILD_LIBJLI_SRC_DIRS),\ + INCLUDE_FILES := $(BUILD_LIBJLI_FILES),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_HI) $(BUILD_LIBJLI_CFLAGS),\ + LDFLAGS := -nostdlib -r,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libjli_static,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX))) +endif + +BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX) + +########################################################################################## + +ifndef OPENJDK +ifndef JAVASE_EMBEDDED + +$(eval $(call SetupNativeCompilation,BUILD_LIBJFR,\ + SRC:=$(JDK_TOPDIR)/src/closed/share/native/oracle/jfr,\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/closed/share/javavm/export, \ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjfr/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libjfr,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jfr$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)jfr$(SHARED_LIBRARY_SUFFIX) + +endif +endif + +########################################################################################## + +ifndef OPENJDK + +BUILD_LIBKCMS_EXCLUDE_FILES := +ifeq ($(PLATFORM),windows) + BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c +else + BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBKCMS,\ + SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms,\ + LANG:=C,\ + EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES),\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST,\ + CFLAGS_linux := -Wno-missing-field-initializers,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libkcms/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX_linux := -lpthread,\ + LDFLAGS_SUFFIX_windows := java.lib advapi32.lib user32.lib version.lib, \ + LDFLAGS_SUFFIX:= -lm $(LDFLAGS_JDKLIB_SUFFIX),\ + VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libkcms,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)kcms$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)kcms$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)kcms$(SHARED_LIBRARY_SUFFIX) + +endif + +########################################################################################## + +ifndef OPENJDK +ifeq ($(PLATFORM), solaris) +ifneq ($(ARCH), amd64) + +ifeq ($(shell if test "$(OS_VERSION_MAJOR)" -eq 5 -a "$(OS_VERSION_MINOR)" -le 10; then $(ECHO) ok; fi), ok) + +SUNWJDGA_MAPFILE := +ifneq (,$(findstring $(ARCH),sparc)) + SUNWJDGA_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjdga/mapfile-vers +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \ + SRC:=$(JDK_TOPDIR)/src/solaris/native/sun/jdga, \ + LANG:=C, \ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/share/javavm/export \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/javavm/export \ + -I$(OPENWIN_HOME)/include, \ + MAPFILE := $(SUNWJDGA_MAPFILE), \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX:= -L$(OPENWIN_LIB)$(ISA_DIR) -R$(OPENWIN_LIB)$(ISA_DIR) -ldga -lX11 $(LIBDL) -lc, \ + BIN:=$(JDK_OUTPUTDIR)/objs/libsunwjdga, \ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)sunwjdga$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)sunwjdga$(SHARED_LIBRARY_SUFFIX) + +endif +endif +endif +endif + +########################################################################################## + +ifeq ($(BUILD_HEADLESS), true) +ifneq ($(PLATFORM), windows) + +# TODO!! +X11_PATH := /usr/X11R6 + +LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \ + $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/solaris/native/sun/font \ + $(JDK_TOPDIR)/src/solaris/native/sun/awt \ + $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11 + +LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \ + -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ + $(CUPS_CFLAGS) \ + -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/java2d \ + -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ + -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/jdga \ + $(foreach dir,$(LIBAWT_HEADLESS_DIRS),-I$(dir)) + +LIBAWT_HEADLESS_FILES := \ + awt_Font.c \ + HeadlessToolkit.c \ + fontpath.c \ + VDrawingArea.c \ + X11Color.c \ + X11Renderer.c \ + X11PMBlitLoops.c \ + X11SurfaceData.c \ + X11FontScaler_md.c \ + X11TextRenderer_md.c \ + OGLBlitLoops.c \ + OGLBufImgOps.c \ + OGLContext.c \ + OGLFuncs.c \ + OGLMaskBlit.c \ + OGLMaskFill.c \ + OGLPaints.c \ + OGLRenderQueue.c \ + OGLRenderer.c \ + OGLSurfaceData.c \ + OGLTextRenderer.c \ + OGLVertexCache.c \ + GLXGraphicsConfig.c \ + GLXSurfaceData.c \ + AccelGlyphCache.c \ + CUPSfuncs.c + +LIBAWT_HEADLESS_LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX) -lawt -lm + +LIBAWT_HEADLESS_REORDER := +ifeq ($(PLATFORM), solaris) + ifneq ($(ARCH), amd64) + LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/reorder-$(ARCH) + endif +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS,\ + SRC:=$(LIBAWT_HEADLESS_DIRS),\ + INCLUDE_FILES := $(LIBAWT_HEADLESS_FILES),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) $(LIBAWT_HEADLESS_CFLAGS),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + REORDER := $(LIBAWT_HEADLESS_REORDER), \ + LDFLAGS_SUFFIX := $(LIBAWT_HEADLESS_LDFLAGS_SUFFIX),\ + LDFLAGS_SUFFIX_posix := $(LIBDL),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libawt_headless,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX) + +endif +endif + +########################################################################################## + +ifneq ($(PLATFORM), windows) +ifndef BUILD_HEADLESS_ONLY + +LIBAWT_XAWT_DIRS := \ + $(JDK_TOPDIR)/src/share/native/sun/awt/debug \ + $(JDK_TOPDIR)/src/share/native/sun/awt/utility \ + $(JDK_TOPDIR)/src/share/native/sun/font \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/font \ + $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/awt \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/java2d/x11 \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/xawt \ + +LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \ + -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ + $(CUPS_CFLAGS) \ + $(foreach dir,$(LIBAWT_XAWT_DIRS),-I$(dir)) \ + -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/java2d \ + -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ + -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/jdga + +ifeq ($(PLATFORM),solaris) + LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15 +endif + +ifeq ($(MILESTONE),internal) + LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD +endif + +LIBAWT_XAWT_FILES := \ + XlibWrapper.c \ + XWindow.c \ + XToolkit.c \ + X11Color.c \ + X11SurfaceData.c \ + awt_GraphicsEnv.c \ + awt_InputMethod.c \ + robot_common.c \ + awt_Robot.c \ + list.c \ + multiVis.c \ + initIDs.c \ + awt_util.c \ + awt_Desktop.c \ + awt_UNIXToolkit.c \ + X11FontScaler_md.c \ + X11TextRenderer_md.c \ + fontpath.c \ + awt_Insets.c \ + awt_Event.c \ + X11Renderer.c \ + X11PMBlitLoops.c \ + OGLBlitLoops.c \ + OGLBufImgOps.c \ + OGLContext.c \ + OGLFuncs.c \ + OGLMaskBlit.c \ + OGLMaskFill.c \ + OGLPaints.c \ + OGLRenderQueue.c \ + OGLRenderer.c \ + OGLSurfaceData.c \ + OGLTextRenderer.c \ + OGLVertexCache.c \ + GLXGraphicsConfig.c \ + GLXSurfaceData.c \ + AccelGlyphCache.c \ + awt_Font.c \ + multi_font.c \ + awt_AWTEvent.c \ + awt_DrawingSurface.c \ + jawt.c \ + CUPSfuncs.c \ + debug_assert.c \ + debug_mem.c \ + debug_trace.c \ + debug_util.c \ + awt_Plugin.c \ + gtk2_interface.c \ + swing_GTKEngine.c \ + swing_GTKStyle.c \ + rect.c \ + sun_awt_X11_GtkFileDialogPeer.c \ + XRSurfaceData.c \ + XRBackendNative.c + +LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -lverify -ljvm -lc + +ifeq ($(PLATFORM), linux) + LIBAWT_XAWT_LDFLAGS_SUFFIX += -lpthread +endif + +ifeq ($(PLATFORM), macosx) + LIBAWT_XAWT_LDFLAGS_SUFFIX += -lpthread +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT,\ + SRC:=$(LIBAWT_XAWT_DIRS),\ + INCLUDE_FILES := $(LIBAWT_XAWT_FILES),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) $(LIBAWT_XAWT_CFLAGS) \ + $(X_CFLAGS),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_xawt/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN) \ + $(X_LIBS),\ + LDFLAGS_solaris:=-L$(OPENWIN_HOME)/sfw/lib$(ISA_DIR) -L$(OPENWIN_LIB)$(ISA_DIR) \ + -R$(OPENWIN_HOME)/sfw/lib$(ISA_DIR) -R$(OPENWIN_LIB)$(ISA_DIR) \ + -R/usr/dt/lib$(ISA_DIR),\ + LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libawt_xawt,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt_xawt$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt_xawt$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt_xawt$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_xawt$(SHARED_LIBRARY_SUFFIX) + +endif +endif + +########################################################################################## + +ifndef BUILD_HEADLESS_ONLY +LIBSPLASHSCREEN_DIRS := \ + $(JDK_TOPDIR)/src/share/native/sun/awt/giflib \ + $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ + $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \ + $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/awt/splashscreen + +LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \ + $(foreach dir,$(LIBSPLASHSCREEN_DIRS),-I$(dir)) + +ifeq ($(PLATFORM), macosx) + LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \ + $(LIBSPLASHSCREEN_CFLAGS) \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks + LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX + LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp + + LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0 + LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0 + LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0 + LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0 + LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0 + LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0 + LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0 + +else ifneq ($(PLATFORM), windows) + LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions +else + LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 +endif + +LIBSPLASHSCREEN_FILES := \ + java_awt_SplashScreen.c \ + splashscreen_gfx_impl.c \ + splashscreen_gif.c \ + splashscreen_impl.c \ + splashscreen_jpeg.c \ + splashscreen_png.c \ + png.c \ + pngerror.c \ + pngget.c \ + pngmem.c \ + pngpread.c \ + pngread.c \ + pngrio.c \ + pngrtran.c \ + pngrutil.c \ + pngset.c \ + pngtrans.c \ + pngwio.c \ + pngwrite.c \ + pngwtran.c \ + pngwutil.c \ + dgif_lib.c \ + gif_err.c \ + gifalloc.c \ + jcomapi.c \ + jdapimin.c \ + jdapistd.c \ + jdcoefct.c \ + jdcolor.c \ + jddctmgr.c \ + jdhuff.c \ + jdinput.c \ + jdmainct.c \ + jdmarker.c \ + jdmaster.c \ + jdmerge.c \ + jdphuff.c \ + jdpostct.c \ + jdsample.c \ + jerror.c \ + jidctflt.c \ + jidctfst.c \ + jidctint.c \ + jidctred.c \ + jmemmgr.c \ + jmemnobs.c \ + jquant1.c \ + jquant2.c \ + jutils.c \ + jcapimin.c \ + jcapistd.c \ + jccoefct.c \ + jccolor.c \ + jcdctmgr.c \ + jchuff.c \ + jcinit.c \ + jcmainct.c \ + jcmarker.c \ + jcmaster.c \ + jcparam.c \ + jcphuff.c \ + jcprepct.c \ + jcsample.c \ + jctrans.c \ + jdtrans.c \ + jfdctflt.c \ + jfdctfst.c \ + jfdctint.c + +ifneq ($(PLATFORM), macosx) +LIBSPLASHSCREEN_FILES += splashscreen_sys.c +else +LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen +LIBSPLASHSCREEN_FILES += splashscreen_sys.m +endif + +LIBSPLASHSCREEN_LDFLAGS_SUFFIX := + +ifneq ($(USE_EXTERNAL_LIBZ),true) + LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5 + LIBSPLASHSCREEN_CFLAGS += $(LIBZ_INCLUDE) + LIBSPLASHSCREEN_FILES += \ + compress.c \ + deflate.c \ + gzclose.c \ + gzlib.c \ + gzread.c \ + gzwrite.c \ + infback.c \ + inffast.c \ + inflate.c \ + inftrees.c \ + trees.c \ + uncompr.c \ + zadler32.c \ + zcrc32.c \ + zutil.c +endif + +ifeq ($(PLATFORM), macosx) + LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \ + -framework ApplicationServices \ + -framework Foundation \ + -framework Cocoa \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ + -framework JavaNativeFoundation +else ifneq ($(PLATFORM), windows) + LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(ISA_DIR) -lX11 -lXext $(LIBM) -lpthread $(LIBDL) +else # PLATFORM + LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll +endif # PLATFORM + +$(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN,\ + SRC:=$(LIBSPLASHSCREEN_DIRS),\ + INCLUDE_FILES := $(LIBSPLASHSCREEN_FILES),\ + LANG:=C,\ + CFLAGS:= $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \ + LDFLAGS:= $(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libsplashscreen,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)splashscreen$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)splashscreen$(SHARED_LIBRARY_SUFFIX) + +ifeq ($(PLATFORM),macosx) +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)splashscreen$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) +endif + +endif + +########################################################################################## + +LIBAWT_DIRS := \ + $(JDK_TOPDIR)/src/share/native/sun/awt \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/awt \ + $(JDK_TOPDIR)/src/share/native/sun/awt/image \ + $(JDK_TOPDIR)/src/share/native/sun/awt/image/gif \ + $(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ + $(JDK_TOPDIR)/src/share/native/sun/awt/shell \ + $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \ + $(JDK_TOPDIR)/src/share/native/sun/awt/debug \ + $(JDK_TOPDIR)/src/share/native/sun/awt/utility \ + $(JDK_TOPDIR)/src/share/native/sun/java2d \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/java2d \ + $(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ + $(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ + $(JDK_TOPDIR)/src/share/native/sun/awt/image \ + $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/java2d/x11 \ + $(JDK_TOPDIR)/src/share/native/sun/font \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/windows \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/java2d/windows \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/java2d/d3d + + +LIBAWT_CFLAGS := -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ + $(foreach dir,$(LIBAWT_DIRS),-I$(dir)) + +LIBAWT_FILES := \ + gifdecoder.c \ + imageInitIDs.c \ + img_globals.c \ + SurfaceData.c \ + Region.c \ + BufImgSurfaceData.c \ + Disposer.c \ + Trace.c \ + GraphicsPrimitiveMgr.c \ + Blit.c \ + BlitBg.c \ + ScaledBlit.c \ + FillRect.c \ + FillSpans.c \ + FillParallelogram.c \ + DrawParallelogram.c \ + DrawLine.c \ + DrawRect.c \ + DrawPolygons.c \ + DrawPath.c \ + FillPath.c \ + ProcessPath.c \ + MaskBlit.c \ + MaskFill.c \ + TransformHelper.c \ + AlphaMath.c \ + AlphaMacros.c \ + AnyByte.c \ + ByteBinary1Bit.c \ + ByteBinary2Bit.c \ + ByteBinary4Bit.c \ + ByteIndexed.c \ + ByteGray.c \ + Index8Gray.c \ + Index12Gray.c \ + AnyShort.c \ + Ushort555Rgb.c \ + Ushort565Rgb.c \ + Ushort4444Argb.c \ + Ushort555Rgbx.c \ + UshortGray.c \ + UshortIndexed.c \ + Any3Byte.c \ + ThreeByteBgr.c \ + AnyInt.c \ + IntArgb.c \ + IntArgbPre.c \ + IntArgbBm.c \ + IntRgb.c \ + IntBgr.c \ + IntRgbx.c \ + Any4Byte.c \ + FourByteAbgr.c \ + FourByteAbgrPre.c \ + BufferedMaskBlit.c \ + BufferedRenderPipe.c \ + ShapeSpanIterator.c \ + SpanClipRenderer.c \ + awt_ImageRep.c \ + awt_ImagingLib.c \ + awt_Mlib.c \ + awt_parseImage.c \ + DataBufferNative.c \ + dither.c \ + debug_assert.c \ + debug_mem.c \ + debug_trace.c \ + debug_util.c + +ifneq (,$(filter $(PLATFORM), solaris linux)) + LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c +endif + +ifeq ($(PLATFORM),macosx) + LIBAWT_DIRS += $(JDK_TOPDIR)/src/macosx/native/com/apple/resources + LIBAWT_FILES += awt_LoadLibrary.c MacOSXResourceBundle.m + LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks + + LIBAWT_MacOSXResourceBundle.m_CFLAGS := -O0 +endif + +ifeq ($(PLATFORM)-$(ARCH_FAMILY), solaris-sparc) +# +# TODO... +# + +# FILES_c += $(FILES_2D_vis) +# ASFLAGS += -P +# FILES_s += mlib_v_ImageCopy_blk.s +# INLINE_VIS = $(PLATFORM_SRC)/native/sun/awt/medialib/vis_$(ARCH_DATA_MODEL).il +# CFLAGS_sparcv9 = -DMLIB_OS64BIT +# CFLAGS += $(CFLAGS_$(ARCH)) -DMLIB_ADD_SUFF $(INLINE_VIS) +else + LIBAWT_FILES += MapAccelFunc.c +endif + +ifneq ($(PLATFORM),solaris) + LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH +endif + +LIBAWT_LANG := C + +ifeq ($(PLATFORM),windows) + LIBAWT_FILES += AccelGlyphCache.c \ + ShaderList.c \ + CmdIDList.cpp \ + Hashtable.cpp \ + GDIHashtable.cpp \ + Devices.cpp \ + ObjectList.cpp \ + GDIBlitLoops.cpp \ + GDIRenderer.cpp \ + GDIWindowSurfaceData.cpp \ + WindowsFlags.cpp \ + WPrinterJob.cpp \ + awt_%.cpp \ + D3DBlitLoops.cpp \ + D3DBufImgOps.cpp \ + D3DContext.cpp \ + D3DGlyphCache.cpp \ + D3DGraphicsDevice.cpp \ + D3DMaskBlit.cpp \ + D3DMaskCache.cpp \ + D3DMaskFill.cpp \ + D3DPipelineManager.cpp \ + D3DPaints.cpp \ + D3DRenderer.cpp \ + D3DRenderQueue.cpp \ + D3DResourceManager.cpp \ + D3DSurfaceData.cpp \ + D3DTextRenderer.cpp \ + D3DVertexCacher.cpp \ + ShellFolder2.cpp \ + ThemeReader.cpp \ + ComCtl32Util.cpp \ + DllUtil.cpp \ + initIDs.cpp \ + MouseInfo.cpp \ + rect.c + LIBAWT_LANG := C++ + LIBAWT_CFLAGS += $(GX_OPTION) -DUNICODE -D_UNICODE + ifeq ($(ARCH_DATA_MODEL), 64) + LIBAWT_CFLAGS += -DMLIB_OS64BIT + endif + + ifdef OPENJDK + LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/windows/resource/icons" + else + LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows" + endif + LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/native/sun/windows/awt.rc +endif + +ifeq ($(MILESTONE), internal) + LIBAWT_CFLAGS += -DINTERNAL_BUILD +endif + +LIBAWT_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt/mapfile-vers +ifeq ($(PLATFORM),linux) + LIBAWT_MAPFILE := +endif + +$(eval $(call SetupNativeCompilation,BUILD_LIBAWT,\ + SRC:=$(LIBAWT_DIRS),\ + INCLUDE_FILES := $(LIBAWT_FILES),\ + LANG:=$(LIBAWT_LANG),\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) $(LIBAWT_CFLAGS),\ + MAPFILE := $(LIBAWT_MAPFILE), \ + LDFLAGS:=$(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_windows:=advapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib \ + imm32.lib ole32.lib uuid.lib shell32.lib \ + comdlg32.lib winmm.lib comctl32.lib \ + shlwapi.lib delayimp.lib java.lib jvm.lib \ + /DELAYLOAD:user32.dll /DELAYLOAD:gdi32.dll \ + /DELAYLOAD:shell32.dll /DELAYLOAD:winmm.dll \ + /DELAYLOAD:winspool.drv /DELAYLOAD:imm32.dll \ + /DELAYLOAD:ole32.dll /DELAYLOAD:comdlg32.dll \ + /DELAYLOAD:comctl32.dll /DELAYLOAD:shlwapi.dll,\ + LDFLAGS_macosx :=-framework Cocoa \ + -framework OpenGL \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ + -framework JavaNativeFoundation \ + -framework JavaRuntimeSupport \ + -framework ApplicationServices \ + -framework AudioToolbox,\ + LDFLAGS_solaris := -R/usr/dt/lib$(ISA_DIR) -R$(OPENWIN_LIB)$(ISA_DIR),\ + LDFLAGS_SUFFIX_posix := -ljvm $(LIBM) -ljava $(LIBDL),\ + VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE),\ + RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \ + /D "JDK_FNAME=awt.dll" \ + /D "JDK_INTERNAL_NAME=awt" \ + /D "JDK_FTYPE=0x2L",\ + BIN:=$(JDK_OUTPUTDIR)/objs/libawt,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt$(SHARED_LIBRARY_SUFFIX) + +########################################################################################## + +ifndef OPENJDK + +LIBDCPR_SRC_DIRS := \ + $(JDK_TOPDIR)/src/closed/share/native/sun/dc/doe \ + $(JDK_TOPDIR)/src/closed/share/native/sun/dc/path \ + $(JDK_TOPDIR)/src/closed/share/native/sun/dc/pr \ + $(JDK_TOPDIR)/src/closed/share/native/sun/dc/util + +LIBDCPR_CFLAGS := $(foreach dir,$(LIBDCPR_SRC_DIRS),-I$(dir)) \ + -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe + +$(eval $(call SetupNativeCompilation,BUILD_LIBDCPR,\ + SRC:=$(LIBDCPR_SRC_DIRS),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + $(LIBDCPR_CFLAGS), \ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libdcpr/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) $(LIBM)\ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ + LDFLAGS_SUFFIX_posix := $(LIBDL) -lm,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libdcpr,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)dcpr$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)dcpr$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)dcpr$(SHARED_LIBRARY_SUFFIX) + +endif + +########################################################################################## + +$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC,\ + SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/smartcardio,\ + LANG:=C,\ + CFLAGS_posix:= -D__sun_jdk,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/smartcardio\ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/smartcardio/MUSCLE,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pcsc/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX_posix := $(LIBDL), \ + LDFLAGS_SUFFIX_windows := winscard.lib,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libj2pcsc,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)j2pcsc$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)j2pcsc$(SHARED_LIBRARY_SUFFIX) + +########################################################################################## + +ifneq ($(PLATFORM), windows) +$(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS,\ + SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/jgss/wrapper,\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/jgss/wrapper,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX := $(LIBDL), \ + BIN:=$(JDK_OUTPUTDIR)/objs/libj2gss,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)j2gss$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)j2gss$(SHARED_LIBRARY_SUFFIX) +endif + +########################################################################################## + +BUILD_LIBKRB5_NAME := +ifeq ($(PLATFORM), windows) + BUILD_LIBKRB5_NAME := w2k_lsa_auth + BUILD_LIBKRB5_FILES := NativeCreds.c WindowsDirectory.c + BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/krb5 + BUILD_LIBKRB5_LIBS := Secur32.lib netapi32.lib \ + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib \ + advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib \ + odbccp32.lib wsock32.lib +else ifeq ($(PLATFORM), macosx) + BUILD_LIBKRB5_NAME := osxkrb5 + BUILD_LIBKRB5_FILES := nativeccache.c + BUILD_LIBKRB5_LIBS := -framework Kerberos +endif + +ifneq ($(BUILD_LIBKRB5_NAME),) +$(eval $(call SetupNativeCompilation,BUILD_LIBKRB5,\ + SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/krb5 \ + $(BUILD_LIBKRB5_SRC) ,\ + INCLUDE_FILES := $(BUILD_LIBKRB5_FILES),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/share/native/sun/security/krb5 \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/krb5 ,\ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS) ,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libkrb5,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)$(BUILD_LIBKRB5_NAME)$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)$(BUILD_LIBKRB5_NAME)$(SHARED_LIBRARY_SUFFIX) +endif + +########################################################################################## + +ifeq ($(PLATFORM), windows) + +$(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI,\ + SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/mscapi \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/mscapi,\ + INCLUDE_FILES := security.cpp, \ + LANG:=C++,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/share/native/sun/security/mscapi \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/mscapi ,\ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX := Crypt32.Lib advapi32.lib,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libsunmscapi,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)sunmscapi$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)sunmscapi$(SHARED_LIBRARY_SUFFIX) +endif + +########################################################################################## + +ifneq ($(PLATFORM)-$(ARCH_DATA_MODEL), windows-64) +$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11,\ + SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/pkcs11 \ + $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/pkcs11/wrapper,\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/pkcs11 \ + -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \ + -I$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/security/pkcs11/wrapper,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pkcs11/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX_posix := $(LIBDL), \ + BIN:=$(JDK_OUTPUTDIR)/objs/libj2pkcs11,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)j2pkcs11$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)j2pkcs11$(SHARED_LIBRARY_SUFFIX) +endif + +########################################################################################## + +ifndef DISABLE_INTREE_EC +# +# TODO Set DISABLE_INTREE_EC in configure if src/share/native/sun/security/ec/impl +# is not present +# +BUILD_LIBSUNEC_FLAGS := -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B \ + -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \ + -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl + +$(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC,\ + SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/ec \ + $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \ + LANG := C++, \ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) $(BUILD_LIBSUNEC_FLAGS),\ + CXXFLAGS:=$(CXXFLAGS_JDKLIB) $(CXX_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) $(BUILD_LIBSUNEC_FLAGS),\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsunec/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB) \ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX := $(LIBCXX),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libsunec,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)sunec$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)sunec$(SHARED_LIBRARY_SUFFIX) +endif + +########################################################################################## + +LIBJSOUND_SRC_DIRS := \ + $(JDK_TOPDIR)/src/share/native/com/sun/media/sound \ + $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/com/sun/media/sound + +LIBJSOUND_SRC_FILES := Utilities.c Platform.c + +LIBJSOUND_LANG := C +LIBJSOUND_CFLAGS := $(foreach dir,$(LIBJSOUND_SRC_DIRS),-I$(dir)) + +EXTRA_SOUND_JNI_LIBS := + +LIBJSOUND_MIDIFILES := \ + MidiInDevice.c \ + MidiInDeviceProvider.c \ + MidiOutDevice.c \ + MidiOutDeviceProvider.c \ + PlatformMidi.c + +# files needed for ports +LIBJSOUND_PORTFILES := \ + PortMixerProvider.c \ + PortMixer.c + +# files needed for direct audio +LIBJSOUND_DAUDIOFILES := \ + DirectAudioDeviceProvider.c \ + DirectAudioDevice.c + +ifeq ($(PLATFORM), windows) + EXTRA_SOUND_JNI_LIBS += jsoundds + LIBJSOUND_CFLAGS += -DX_PLATFORM=X_WINDOWS \ + -DUSE_PLATFORM_MIDI_OUT=TRUE \ + -DUSE_PLATFORM_MIDI_IN=TRUE \ + -DUSE_PORTS=TRUE + LIBJSOUND_SRC_FILES += \ + PLATFORM_API_WinOS_MidiIn.cpp \ + PLATFORM_API_WinOS_MidiOut.c \ + PLATFORM_API_WinOS_Util.c \ + PLATFORM_API_WinOS_Ports.c + LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES) + LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES) +endif # PLATFORM windows + +ifeq ($(PLATFORM), linux) + EXTRA_SOUND_JNI_LIBS += jsoundalsa + LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX +endif # PLATFORM linux + +ifeq ($(PLATFORM), macosx) + LIBJSOUND_LANG := C++ + LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \ + -DUSE_PORTS=TRUE \ + -DUSE_DAUDIO=TRUE \ + -DUSE_PLATFORM_MIDI_OUT=TRUE \ + -DUSE_PLATFORM_MIDI_IN=TRUE + LIBJSOUND_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/com/sun/media/sound + LIBJSOUND_SRC_FILES += \ + PLATFORM_API_MacOSX_Utils.cpp \ + PLATFORM_API_MacOSX_PCM.cpp \ + PLATFORM_API_MacOSX_Ports.cpp \ + PLATFORM_API_MacOSX_MidiIn.c \ + PLATFORM_API_MacOSX_MidiOut.c \ + PLATFORM_API_MacOSX_MidiUtils.c + LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES) + LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES) + LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES) +endif # PLATFORM macosx + +ifeq ($(PLATFORM), solaris) + LIBJSOUND_CFLAGS += -DX_PLATFORM=X_SOLARIS \ + -DUSE_PORTS=TRUE \ + -DUSE_DAUDIO=TRUE + LIBJSOUND_SRC_FILES += \ + PLATFORM_API_SolarisOS_Utils.c \ + PLATFORM_API_SolarisOS_Ports.c \ + PLATFORM_API_SolarisOS_PCM.c + LIBJSOUND_SRC_FILES += $(LIBJSOUND_MIDIFILES) + LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES) + LIBJSOUND_SRC_FILES += $(LIBJSOUND_DAUDIOFILES) +endif # PLATFORM solaris + + +ifeq ($(JVM_VARIANT_ZERO), true) + LIBJSOUND_CFLAGS += -DX_ARCH=X_ZERO +else + ifeq ($(ARCH), i586) + LIBJSOUND_CFLAGS += -DX_ARCH=X_I586 + endif # ARCH i586 + + ifeq ($(ARCH), sparc) + LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARC + endif # ARCH sparc + + ifeq ($(ARCH), sparcv9) + LIBJSOUND_CFLAGS += -DX_ARCH=X_SPARCV9 + endif # ARCH sparcv9 + + ifeq ($(ARCH), amd64) + LIBJSOUND_CFLAGS += -DX_ARCH=X_AMD64 + endif # ARCH amd64 + + ifeq ($(ARCH), arm) + LIBJSOUND_CFLAGS += -DX_ARCH=X_ARM + endif # ARCH arm + + ifeq ($(ARCH), ppc) + LIBJSOUND_CFLAGS += -DX_ARCH=X_PPC + endif # ARCH ppc +endif + +LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"' + +$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND,\ + SRC:=$(LIBJSOUND_SRC_DIRS),\ + INCLUDE_FILES := $(LIBJSOUND_SRC_FILES),\ + LANG:=$(LIBJSOUND_LANG),\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + $(LIBJSOUND_CFLAGS), \ + CXXFLAGS:=$(CXXFLAGS_JDKLIB) $(CXX_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + $(LIBJSOUND_CFLAGS), \ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsound/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB)\ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_windows:=java.lib advapi32.lib winmm.lib,\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ + LDFLAGS_SUFFIX_solaris:=-lc ,\ + LDFLAGS_SUFFIX_macosx := -framework CoreAudio -framework CoreFoundation \ + -framework CoreServices -framework AudioUnit $(LIBCXX) \ + -framework CoreMIDI -framework AudioToolbox ,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libjsound,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jsound$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jsound$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)jsound$(SHARED_LIBRARY_SUFFIX) + +########################################################################################## + +ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)),) + +$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA,\ + SRC:=$(LIBJSOUND_SRC_DIRS),\ + INCLUDE_FILES := Utilities.c $(LIBJSOUND_MIDIFILES) $(LIBJSOUND_PORTFILES) \ + $(LIBJSOUND_DAUDIOFILES) \ + PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ + PLATFORM_API_LinuxOS_ALSA_PCM.c \ + PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ + PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ + PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ + PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ + PLATFORM_API_LinuxOS_ALSA_Ports.c,\ + LANG := C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + $(LIBJSOUND_CFLAGS) \ + -DUSE_DAUDIO=TRUE \ + -DUSE_PORTS=TRUE \ + -DUSE_PLATFORM_MIDI_OUT=TRUE \ + -DUSE_PLATFORM_MIDI_IN=TRUE, \ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB)\ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) -lasound,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libjsoundalsa,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jsoundalsa$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jsoundalsa$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)jsoundalsa$(SHARED_LIBRARY_SUFFIX) + +endif + +########################################################################################## + +ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)),) + +$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDDS,\ + SRC:=$(LIBJSOUND_SRC_DIRS),\ + INCLUDE_FILES := Utilities.c $(LIBJSOUND_DAUDIOFILES) \ + PLATFORM_API_WinOS_DirectSound.cpp, \ + LANG := C++,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + $(LIBJSOUND_CFLAGS) \ + -DUSE_DAUDIO=TRUE, \ + LDFLAGS:=$(LDFLAGS_JDKLIB)\ + $(call SET_SHARED_LIBRARY_ORIGIN),\ + LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libjsoundds,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jsoundds$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jsoundds$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)jsoundds$(SHARED_LIBRARY_SUFFIX) + +endif + +########################################################################################## + +ifeq ($(PLATFORM), solaris) +ifndef OPENJDK + +$(eval $(call SetupNativeCompilation,BUILD_LIBJ2UCRYPTO,\ + SRC:=$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto,\ + LANG := C,\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto ,\ + MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2ucrypto/mapfile-vers, \ + LDFLAGS:=$(LDFLAGS_JDKLIB)\ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX:=$(LIBDL),\ + BIN:=$(JDK_OUTPUTDIR)/objs/libj2ucrypto,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)j2ucrypto$(SHARED_LIBRARY_SUFFIX))) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)j2ucrypto$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)j2ucrypto$(SHARED_LIBRARY_SUFFIX) + +endif +endif + +########################################################################################## + +ifeq ($(PLATFORM), macosx) + +LIBAPPLESCRIPTENGINE_FILES := \ + AppleScriptEngine.m \ + AppleScriptExecutionContext.m \ + AS_NS_ConversionUtils.m \ + NS_Java_ConversionUtils.m + +$(eval $(call SetupNativeCompilation,BUILD_LIBAPPLESCRIPTENGINE,\ + SRC:=$(JDK_TOPDIR)/src/macosx/native/apple/applescript,\ + LANG := C,\ + INCLUDE_FILES:=$(LIBAPPLESCRIPTENGINE_FILES),\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/macosx/native/apple/applescript \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ + -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \ + LDFLAGS:=$(LDFLAGS_JDKLIB)\ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX:= \ + -framework Cocoa \ + -framework Carbon \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ + -framework JavaNativeFoundation, \ + BIN:=$(JDK_OUTPUTDIR)/objs/libAppleScriptEngine,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)AppleScriptEngine$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)AppleScriptEngine$(SHARED_LIBRARY_SUFFIX) + +endif + +########################################################################################## + +ifeq ($(PLATFORM), macosx) + +LIBOSXAPP_FILES := \ + NSApplicationAWT.m \ + QueuingApplicationDelegate.m \ + PropertiesUtilities.m \ + ThreadUtilities.m + +$(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP,\ + SRC:=$(JDK_TOPDIR)/src/macosx/native/sun/osxapp,\ + LANG := C,\ + INCLUDE_FILES:=$(LIBOSXAPP_FILES),\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ + -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks,\ + LDFLAGS:=$(LDFLAGS_JDKLIB)\ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_macosx := \ + -framework Accelerate \ + -framework ApplicationServices \ + -framework AudioToolbox \ + -framework Carbon \ + -framework Cocoa \ + -framework Security \ + -framework ExceptionHandling \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ + -framework JavaNativeFoundation \ + -framework JavaRuntimeSupport \ + -framework OpenGL \ + -framework IOSurface \ + -framework QuartzCore, \ + BIN:=$(JDK_OUTPUTDIR)/objs/libosxapp,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) + +endif + +########################################################################################## + +ifeq ($(PLATFORM), macosx) + +LIBOSX_FILES := \ + Dispatch.m \ + CFileManager.m \ + KeystoreImpl.m \ + JavaAppLauncher.m \ + MacOSXPreferencesFile.m \ + SCDynamicStoreConfig.m + +LIBOSX_DIRS := \ + $(JDK_TOPDIR)/src/macosx/native/com/apple/concurrent \ + $(JDK_TOPDIR)/src/macosx/native/java/util \ + $(JDK_TOPDIR)/src/macosx/native/com/apple/eio \ + $(JDK_TOPDIR)/src/macosx/native/apple/security \ + $(JDK_TOPDIR)/src/macosx/native/apple/launcher + +$(eval $(call SetupNativeCompilation,BUILD_LIBOSX,\ + SRC:=$(LIBOSX_DIRS),\ + LANG := C,\ + INCLUDE_FILES:=$(LIBOSX_FILES),\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + $(foreach dir,$(LIBOSX_DIRS),-I$(dir)) \ + -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ + -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks,\ + LDFLAGS:=$(LDFLAGS_JDKLIB)\ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_macosx := \ + -losxapp \ + -framework Cocoa \ + -framework ApplicationServices \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ + -framework JavaNativeFoundation \ + -framework JavaRuntimeSupport \ + -framework Security \ + -framework SystemConfiguration \ + $(LDFLAGS_JDKLIB_SUFFIX), \ + BIN:=$(JDK_OUTPUTDIR)/objs/libosx,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)osx$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osx$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)osx$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)osx$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +endif + +########################################################################################## + +ifeq ($(PLATFORM), macosx) + +LIBAWT_LWAWT_FILES := \ + awt.m \ + ApplicationDelegate.m \ + CFRetainedResource.m \ + CGLGraphicsConfig.m \ + CGLSurfaceData.m \ + CGLLayer.m \ + CGraphicsConfig.m \ + CGraphicsDevice.m \ + CGraphicsEnv.m \ + CCharToGlyphMapper.m \ + CSystemColors.m \ + AWTFont.m \ + CGGlyphOutlines.m \ + CGGlyphImages.m \ + CoreTextSupport.m \ + AWTStrike.m \ + InitIDs.m \ + AWTEvent.m \ + AWTView.m \ + AWTWindow.m \ + AWTSurfaceLayers.m \ + CCursorManager.m \ + CClipboard.m \ + CDataTransferer.m \ + CDragSource.m \ + CDragSourceContextPeer.m \ + CDropTarget.m \ + CDropTargetContextPeer.m \ + CInputMethod.m \ + CDesktopPeer.m \ + OSVersion.m \ + DnDUtilities.m \ + CFileDialog.m \ + CImage.m \ + CMenu.m \ + CMenuBar.m \ + CMenuComponent.m \ + CMenuItem.m \ + CPopupMenu.m \ + CRobot.m \ + CTrayIcon.m \ + CWrapper.m \ + JavaAccessibilityAction.m \ + JavaAccessibilityUtilities.m \ + JavaComponentAccessibility.m \ + JavaTextAccessibility.m \ + LWCToolkit.m \ + GeomUtilities.m \ + CPrinterJob.m \ + PrintModel.m \ + PrinterSurfaceData.m \ + PrinterView.m \ + QuartzSurfaceData.m \ + QuartzRenderer.m \ + CTextPipe.m \ + ImageSurfaceData.m \ + awt_DrawingSurface.m \ + \ + OGLBlitLoops.c \ + OGLBufImgOps.c \ + OGLContext.c \ + OGLFuncs.c \ + OGLMaskBlit.c \ + OGLMaskFill.c \ + OGLPaints.c \ + OGLRenderQueue.c \ + OGLRenderer.c \ + OGLSurfaceData.c \ + OGLTextRenderer.c \ + OGLVertexCache.c \ + AccelGlyphCache.c \ + CUPSfuncs.c + + +LIBAWT_LWAWT_DIRS := \ + $(JDK_TOPDIR)/src/macosx/native/sun/awt \ + $(JDK_TOPDIR)/src/macosx/native/sun/font \ + $(JDK_TOPDIR)/src/macosx/native/sun/java2d/opengl \ + $(JDK_TOPDIR)/src/solaris/native/sun/awt \ + $(JDK_TOPDIR)/src/share/native/sun/font \ + $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \ + +$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT,\ + SRC:=$(LIBAWT_LWAWT_DIRS),\ + LANG := C,\ + INCLUDE_FILES:=$(LIBAWT_LWAWT_FILES),\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + $(foreach dir,$(LIBAWT_LWAWT_DIRS),-I$(dir)) \ + -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ + -I$(JDK_TOPDIR)/src/share/native/sun/java2d \ + -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/image \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ + -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ + -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ + -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks,\ + LDFLAGS:=$(LDFLAGS_JDKLIB)\ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_macosx := \ + -lawt -lmlib_image -losxapp $(LDFLAGS_JDKLIB_SUFFIX) $(LIBM) \ + -framework Accelerate \ + -framework ApplicationServices \ + -framework AudioToolbox \ + -framework Carbon \ + -framework Cocoa \ + -framework Security \ + -framework ExceptionHandling \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ + -framework JavaNativeFoundation \ + -framework JavaRuntimeSupport \ + -framework OpenGL \ + -framework QuartzCore ,\ + BIN:=$(JDK_OUTPUTDIR)/objs/libawt_lwawt,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)mlib_image$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +endif + +########################################################################################## + +ifeq ($(PLATFORM), macosx) + +LIBOSXUI_FILES := \ + AquaFileView.m \ + AquaLookAndFeel.m \ + AquaNativeResources.m \ + JRSUIConstantSync.m \ + JRSUIController.m \ + JRSUIFocus.m \ + ScreenPopupFactory.m \ + ScreenMenu.m + +$(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI,\ + SRC:=$(JDK_TOPDIR)/src/macosx/native/com/apple/laf,\ + LANG := C,\ + INCLUDE_FILES:=$(LIBOSXUI_FILES),\ + CFLAGS:=$(CFLAGS_JDKLIB) $(C_O_FLAG_NORM) $(SHARED_LIBRARY_FLAGS) \ + -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \ + -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ + -I$(JDK_TOPDIR)/src/macosx/native/sun/awt \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks, \ + LDFLAGS:=$(LDFLAGS_JDKLIB)\ + $(call SET_SHARED_LIBRARY_ORIGIN), \ + LDFLAGS_SUFFIX_macosx := \ + -lawt -losxapp -lawt_lwawt \ + -framework Cocoa \ + -framework Carbon \ + -framework ApplicationServices \ + -F/System/Library/Frameworks/JavaVM.framework/Frameworks \ + -framework JavaNativeFoundation \ + -framework JavaRuntimeSupport, \ + BIN:=$(JDK_OUTPUTDIR)/objs/libosxui,\ + LIB:=$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)osxui$(SHARED_LIBRARY_SUFFIX))) + +BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxui$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)osxui$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)osxui$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) + +$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)osxui$(SHARED_LIBRARY_SUFFIX) : \ + $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX) + +#$(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)osxui$(SHARED_LIBRARY_SUFFIX) : \ +# $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)java$(SHARED_LIBRARY_SUFFIX) + +endif + ########################################################################################## all: $(COPY_FILES) $(BUILD_LIBRARIES) diff --git a/jdk/makefiles/CopyFiles.gmk b/jdk/makefiles/CopyFiles.gmk index 63679cf61e9..7f8fea433c9 100644 --- a/jdk/makefiles/CopyFiles.gmk +++ b/jdk/makefiles/CopyFiles.gmk @@ -24,9 +24,15 @@ # INCLUDEDIR = $(JDK_OUTPUTDIR)/include -# TODO: Platform dir needs to be "win32" on windows /erikj + PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM) +ifeq ($(PLATFORM), windows) + PLATFORM_INCLUDE = $(INCLUDEDIR)/win32 +else ifeq ($(PLATFORM), macosx) + PLATFORM_INCLUDE = $(INCLUDEDIR)/darwin +endif + # # Copy exported header files to outputdir. # @@ -41,12 +47,12 @@ H_TARGET_FILES =$(INCLUDEDIR)/jdwpTransport.h \ $(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/share/javavm/export/%.h $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ $(PLATFORM_INCLUDE)/%.h: $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/javavm/export/%.h $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ COPY_FILES = $(H_TARGET_FILES) @@ -58,7 +64,7 @@ SERVICETAG_LIBDIR = $(LIBDIR)/servicetag $(SERVICETAG_LIBDIR)/jdk_header.png: $(JDK_TOPDIR)/src/share/classes/com/sun/servicetag/resources/jdk_header.png $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ $(CHMOD) 444 $@ @@ -73,13 +79,13 @@ MGMT_TARGET_FILES = $(subst $(MGMT_LIB_SRC),$(MGMT_LIBDIR),$(MGMT_SRC_FILES)) $(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ $(CHMOD) 644 $@ $(MGMT_LIBDIR)/%: $(MGMT_LIB_SRC)/% $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ $(CHMOD) 444 $@ @@ -91,7 +97,7 @@ LOGGING_LIB_SRC = $(JDK_TOPDIR)/src/share/lib $(LIBDIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ COPY_FILES += $(LIBDIR)/logging.properties @@ -104,9 +110,9 @@ PSFONTPROPFILE_SRC_DIR = $(JDK_TOPDIR)/src/share/classes/sun/print PSFONTPROPFILE_SRCS = $(wildcard $(PSFONTPROPFILE_SRC_DIR)/*.properties*) PSFONTPROPFILE_TARGET_FILES = $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIBDIR),$(PSFONTPROPFILE_SRCS)) -$(PSFONTPROPFILE_TARGET_FILES): $(PSFONTPROPFILE_SRCS) +$(LIBDIR)/%: $(PSFONTPROPFILE_SRC_DIR)/% $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ COPY_FILES += $(PSFONTPROPFILE_TARGET_FILES) @@ -119,7 +125,7 @@ PLATFORM_LIB_SRC = $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/lib $(LIBDIR)/flavormap.properties: $(PLATFORM_LIB_SRC)/flavormap.properties $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ COPY_FILES += $(LIBDIR)/flavormap.properties @@ -129,7 +135,7 @@ CURSORS_PLATFORM_LIB_SRC = $(PLATFORM_LIB_SRC)/images/cursors $(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_PLATFORM_LIB_SRC)/cursors.properties $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ COPY_FILES += $(CURSORS_DEST_DIR)/cursors.properties @@ -142,9 +148,9 @@ CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB endif # PLATFORM CURSORS_TARGET_FILES = $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES)) -$(CURSORS_TARGET_FILES): $(CURSORS_SRC_FILES) +$(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/% $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ COPY_FILES += $(CURSORS_TARGET_FILES) @@ -155,13 +161,39 @@ CONTENT_TYPES_SRC=$(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/lib $(LIBDIR)/content-types.properties: $(CONTENT_TYPES_SRC)/content-types.properties $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ COPY_FILES += $(LIBDIR)/content-types.properties ########################################################################################## +CALENDARS_SRC := $(JDK_TOPDIR)/src/share/lib + +$(LIBDIR)/calendars.properties: $(CALENDARS_SRC)/calendars.properties + $(MKDIR) -p $(@D) + $(RM) -f $@ + $(CP) $< $@ + +COPY_FILES += $(LIBDIR)/calendars.properties + +########################################################################################## + +ifeq ($(PLATFORM),windows) + +TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/lib + +$(LIBDIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings + $(MKDIR) -p $(@D) + $(RM) -f $@ + $(CP) $< $@ + +COPY_FILES += $(LIBDIR)/tzmappings + +endif + +########################################################################################## + ICCPROFILE_DEST_DIR := $(LIBDIR)/cmm ifdef OPENJDK @@ -175,7 +207,7 @@ ICCPROFILE_TARGET_FILES:=$(subst $(ICCPROFILE_SRC_DIR),$(ICCPROFILE_DEST_DIR),$( $(ICCPROFILE_DEST_DIR)%.pf: $(ICCPROFILE_SRC_DIR)%.pf $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ $(CHMOD) 444 $@ @@ -209,8 +241,11 @@ ifdef OPENJDK endif endif - $(FREETYPE_LIB): + $(FREETYPE_LIB): $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $(CP) $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@ + ifeq ($(BUILD_OS), windows) + $(CHMOD) +rx $@ + endif COPY_FILES += $(FREETYPE_LIB) endif @@ -223,10 +258,336 @@ ifeq ($(PLATFORM),windows) MSVCRNN_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCRNN_DLL)) $(MSVCRNN_TARGET): $(MSVCRNN_DLL) $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ COPY_FILES += $(MSVCRNN_TARGET) endif ########################################################################################## + +HPROF_SRC=$(JDK_TOPDIR)/src/share/demo/jvmti/hprof/jvm.hprof.txt + +$(LIBDIR)/jvm.hprof.txt : $(HPROF_SRC) + $(MKDIR) -p $(@D) + $(RM) -f $@ + $(CP) $< $@ + +COPY_FILES += $(LIBDIR)/jvm.hprof.txt + +########################################################################################## + +# +# How to install jvm.cfg. +# +ifeq ($(JVM_VARIANT_ZERO), true) +JVMCFG_ARCH := zero +else + JVMCFG_ARCH := $(ARCH) +endif + +ifeq ($(PLATFORM),macosx) + ifeq ($(JVMCFG_ARCH),amd64) + JVMCFG_ARCH := x86_64 + endif + JVMCFG_SRC := $(JDK_TOPDIR)/src/macosx/bin/$(JVMCFG_ARCH)/jvm.cfg + JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib +else + JVMCFG_SRC := $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/bin/$(JVMCFG_ARCH)/jvm.cfg + JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib/$(LIBARCH) +endif + +JVMCFG := $(JVMCFG_DIR)/jvm.cfg + + +ifeq ($(ARCH_DATA_MODEL),32) + # On 32 bit machines, we can have client and/or server libjvms installed. + # Since the currently committed jvm.cfg expects clientANDserver, we need + # to patch the jvm.cfg when we have built only a client or only a server. + # This should also support -kernel, -zero and -zeroshark. + ifeq ($(JVM_VARIANTS),$(COMMA)client$(COMMA)) + # Create a patched jvm.cfg to use -client by default and alias -server to -client. + $(JVMCFG): + $(MKDIR) -p $(@D) + $(RM) -f $(JVMCFG) + $(PRINTF) "-client KNOWN\n">$(JVMCFG) + $(PRINTF) "-server IGNORE\n">>$(JVMCFG) + $(PRINTF) "-hotspot ALIASED_TO -client\n">>$(JVMCFG) + $(PRINTF) "-classic WARN\n">>$(JVMCFG) + $(PRINTF) "-native ERROR\n">>$(JVMCFG) + $(PRINTF) "-green ERROR\n">>$(JVMCFG) + + else + ifeq ($(JVM_VARIANTS),$(COMMA)server$(COMMA)) + # Create a patched jvm.cfg to use -server by default and alias -client to -server. + + $(JVMCFG): + $(MKDIR) -p $(@D) + $(RM) -f $(JVMCFG) + $(PRINTF) "-server KNOWN\n">$(JVMCFG) + $(PRINTF) "-client IGNORE\n">>$(JVMCFG) + $(PRINTF) "-hotspot IGNORE\n">>$(JVMCFG) + $(PRINTF) "-classic WARN\n">>$(JVMCFG) + $(PRINTF) "-native ERROR\n">>$(JVMCFG) + $(PRINTF) "-green ERROR\n">>$(JVMCFG) + else + # Use the default jvm.cfg for this 32 bit setup. + $(JVMCFG): $(JVMCFG_SRC) + $(MKDIR) -p $(@D) + $(RM) -f $@ + $(CP) $< $@ + endif + endif +else + # Use the default jvm.cfg for this 64 bit setup. + $(JVMCFG): $(JVMCFG_SRC) + $(MKDIR) -p $(@D) + $(RM) -f $@ + $(CP) $< $@ +endif + +COPY_FILES += $(JVMCFG) + +########################################################################################## + +PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security +PROPS_DST := $(JDK_OUTPUTDIR)/lib/security/java.security + +ifeq ($(PLATFORM), solaris) + PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-solaris +endif + +ifeq ($(PLATFORM), windows) + PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-windows +endif + +ifeq ($(PLATFORM), macosx) + PROPS_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.security-macosx +endif + +$(PROPS_DST): $(PROPS_SRC) + $(MKDIR) -p $(@D) + $(RM) -f $@ + $(CP) $< $@ + +COPY_FILES += $(PROPS_DST) + +########################################################################################## + +POLICY_SRC := $(JDK_TOPDIR)/src/share/lib/security/java.policy +POLICY_DST := $(JDK_OUTPUTDIR)/lib/security/java.policy + +$(POLICY_DST): $(POLICY_SRC) + $(MKDIR) -p $(@D) + $(RM) -f $@ + $(CP) $< $@ + +COPY_FILES += $(POLICY_DST) + +########################################################################################## + +CACERTS_SRC := $(CACERTS_FILE) +CACERTS_DST := $(JDK_OUTPUTDIR)/lib/security/cacerts + +$(CACERTS_DST): $(CACERTS_SRC) + $(MKDIR) -p $(@D) + $(RM) -f $@ + $(CP) $< $@ + +COPY_FILES += $(CACERTS_DST) + +########################################################################################## + +ifndef OPENJDK + +BLACKLIST_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/blacklist +BLACKLIST_DST := $(JDK_OUTPUTDIR)/lib/security/blacklist + +TRUSTEDLIBS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/trusted.libraries +TRUSTEDLIBS_DST := $(JDK_OUTPUTDIR)/lib/security/trusted.libraries + +$(BLACKLIST_DST): $(BLACKLIST_SRC) + $(MKDIR) -p $(@D) + $(RM) -f $@ + $(CP) $< $@ + +COPY_FILES += $(BLACKLIST_DST) + +$(TRUSTEDLIBS_DST): $(TRUSTEDLIBS_SRC) + $(MKDIR) -p $(@D) + $(RM) -f $@ + $(CP) $< $@ + +COPY_FILES += $(TRUSTEDLIBS_DST) + +endif + +########################################################################################## + +ifndef OPENJDK + +SHARED_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts +SHARED_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/fonts +SHARED_FONTS_FILES := \ + LucidaTypewriterRegular.ttf \ + LucidaTypewriterBold.ttf \ + LucidaBrightRegular.ttf \ + LucidaBrightDemiBold.ttf \ + LucidaBrightItalic.ttf \ + LucidaBrightDemiItalic.ttf \ + LucidaSansRegular.ttf \ + LucidaSansDemiBold.ttf \ + +SHARED_FONTS_SRC := $(foreach F,$(SHARED_FONTS_FILES),$(SHARED_FONTS_SRC_DIR)/$(F)) +SHARED_FONTS_DST := $(foreach F,$(SHARED_FONTS_FILES),$(SHARED_FONTS_DST_DIR)/$(F)) + +$(SHARED_FONTS_DST_DIR)/%.ttf : $(SHARED_FONTS_SRC_DIR)/%.ttf + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $@ + +$(SHARED_FONTS_DST_DIR)/fonts.dir : $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.fonts.dir + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $@ + +COPY_FILES += $(SHARED_FONTS_DST) $(SHARED_FONTS_DST_DIR)/fonts.dir + +ifeq ($(PLATFORM), linux) + +# The oblique fonts are only needed/wanted on Linux. + +OBL_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts/oblique +OBL_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/oblique-fonts +OBL_FONTS_FILES := LucidaTypewriterOblique.ttf LucidaTypewriterBoldOblique.ttf \ + LucidaSansOblique.ttf LucidaSansDemiOblique.ttf + +OBL_FONTS_SRC := $(foreach F,$(OBL_FONTS_FILES),$(OBL_FONTS_SRC_DIR)/$(F)) +OBL_FONTS_DST := $(foreach F,$(OBL_FONTS_FILES),$(OBL_FONTS_DST_DIR)/$(F)) + +$(OBL_FONTS_DST_DIR)/%.ttf : $(OBL_FONTS_SRC_DIR)/%.ttf + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $@ + +$(OBL_FONTS_DST_DIR)/fonts.dir : $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $@ + +COPY_FILES += $(OBL_FONTS_DST) $(OBL_FONTS_DST_DIR)/fonts.dir + +endif # linux +endif # OPENJDK + +########################################################################################## + +ifndef OPENJDK + +JS_RESOURCES_FILES := Messages.properties Messages_fr.properties +JS_RESOURCES_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/classes/sun/org/mozilla/javascript/internal/resources +JS_RESOURCES_DST_DIR := $(JDK_OUTPUTDIR)/classes/sun/org/mozilla/javascript/internal/resources + +JS_RESOURCES_SRC := $(foreach F,$(JS_RESOURCES_FILES),$(JS_RESOURCES_SRC_DIR)/$(F)) +JS_RESOURCES_DST := $(foreach F,$(JS_RESOURCES_FILES),$(JS_RESOURCES_DST_DIR)/$(F)) + +$(JS_RESOURCES_DST_DIR)/% : $(JS_RESOURCES_SRC_DIR)/% + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $@ + +COPY_FILES += $(JS_RESOURCES_DST) + +endif + +########################################################################################## + +ifndef OPENJDK + +# +# Solaris X11 Direct Graphics Access library +# + +_DGALIBS_sparc = \ + libxinerama.so \ + libjdgaSUNWcg6.so \ + libjdgaSUNWffb.so \ + libjdgaSUNWm64.so \ + libjdgaSUNWafb.so + +_DGALIBS_sparcv9 = \ + libxinerama.so \ + libjdgaSUNWcg6.so \ + libjdgaSUNWffb.so \ + libjdgaSUNWm64.so \ + libjdgaSUNWafb.so + +_DGALIBS_i586 = # no i586 library yet + +_DGALIBS_amd64 = # no amd64 library yet + +DGALIBS = $(_DGALIBS_$(ARCH):%=$(JDK_OUTPUTDIR)/lib/$(LIBARCH)/%) + +$(JDK_OUTPUTDIR)/lib/$(LIBARCH)/libxinerama.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(ARCH)/libxinerama.so + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $@ + +$(JDK_OUTPUTDIR)/lib/$(LIBARCH)/libjdgaSUNW%.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(ARCH)/libjdgaSUNW%.so + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $@ + +$(JDK_OUTPUTDIR)/lib/$(LIBARCH)/libjdgaSUNWafb.so: $(JDK_OUTPUTDIR)/lib/$(LIBARCH)/libjdgaSUNWffb.so + $(MKDIR) -p $(@D) + $(RM) $@ + $(LN) -s $< $@ + +COPY_FILES += $(DGALIBS) + +endif + +########################################################################################## + +ifeq ($(PLATFORM), solaris) + +SUNPKCS11_CFG_SRC := $(JDK_TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg +SUNPKCS11_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/sunpkcs11-solaris.cfg + +$(SUNPKCS11_CFG_DST) : $(SUNPKCS11_CFG_SRC) + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $@ + +COPY_FILES += $(SUNPKCS11_CFG_DST) + +endif + +########################################################################################## + +ifndef OPENJDK +ifeq ($(PLATFORM), solaris) + +UCRYPTO_CFG_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/ucrypto-solaris.cfg +UCRYPTO_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/ucrypto-solaris.cfg + +$(UCRYPTO_CFG_DST) : $(UCRYPTO_CFG_SRC) + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $@ + +COPY_FILES += $(UCRYPTO_CFG_DST) + +endif +endif + +########################################################################################## + +$(JDK_OUTPUTDIR)/lib/sound.properties : $(JDK_TOPDIR)/src/share/lib/sound.properties + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $(@) + +COPY_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties + +########################################################################################## diff --git a/jdk/makefiles/CopyIntoClasses.gmk b/jdk/makefiles/CopyIntoClasses.gmk index 9fef4c5fd0b..92f9330616d 100644 --- a/jdk/makefiles/CopyIntoClasses.gmk +++ b/jdk/makefiles/CopyIntoClasses.gmk @@ -83,6 +83,83 @@ COPY_FILES += \ COPY_FILES += \ $(JDK_TOPDIR)/src/share/classes/sun/net/idn/uidna.spp +# +# Swing plaf resources +# +SWING_PLAF_WINDOWS_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows +COPY_FILES += \ + $(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.gif) \ + $(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.png) + +ifndef OPENJDK + SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/windows + # Filter out JavaCup32.png from OpenJDK + COPY_FILES := $(filter-out $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/JavaCup32.png, $(COPY_FILES)) + # Alter JavaCup32.png from ClosedJDK + COPY_FILES += \ + $(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png +endif + +SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic +COPY_FILES += \ + $(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png) + +ifndef OPENJDK + SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/javax/swing/plaf/basic + # Filter out JavaCup16.png from OpenJDK + COPY_FILES := $(filter-out $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/JavaCup16.png, $(COPY_FILES)) + # Alter JavaCup16.png from ClosedJDK + COPY_FILES += \ + $(SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED)/icons/JavaCup16.png +endif + +ifdef OPENJDK + SWING_PLAF_MOTIF_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif + COPY_FILES += \ + $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \ + $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png) +else + SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/motif + COPY_FILES += \ + $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.gif) \ + $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.png) +endif + +SWING_PLAF_METAL_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/metal +COPY_FILES += \ + $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.gif) \ + $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.png) \ + $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.gif) \ + $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.png) \ + $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/sounds/*.wav) + +ifneq ($(PLATFORM), windows) + # Only copy GTK resources on Solaris/Linux + SWING_PLAF_GTK_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk + COPY_FILES += \ + $(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.gif) \ + $(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.png) \ + $(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/resources/metacity/SwingFallbackTheme/metacity-1/*.xml) +endif +# END: Swing plaf resources + +# The exception handling of swing beaninfo +# These resources violates the convention of having code and resources together under +# $(JDK_TOPDIR)/src/.../classes directories +SWING_BEANINFO_RESOURCES_SRC_DIR = $(JDK_TOPDIR)/make/tools/swing-beans/beaninfo/images +SWING_BEANINFO_RESOURCES_SRC = $(wildcard $(SWING_BEANINFO_RESOURCES_SRC_DIR)/*.gif) +OUT_BEANINFO_RESOURCES = $(addprefix $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/,\ + $(shell $(PRINTF) "$(SWING_BEANINFO_RESOURCES_SRC)\n" | $(SED) -e 's|/[^ ]*/beaninfo/images/||g')) + +COPY_EXTRA += $(OUT_BEANINFO_RESOURCES) +# END: Swing beaninfo resources + +# Swing text resources +SWING_TEXT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/text +COPY_FILES += \ + $(SWING_TEXT_RESOURCEDIR)/html/default.css \ + $(wildcard $(SWING_TEXT_RESOURCEDIR)/rtf/charsets/*.txt) + ########################################################################################## # # Copy the META-INF/services configuration files that are scattered around the source tree @@ -94,7 +171,7 @@ COPY_FILES += \ # are uncommented and the configuration file is stored in the output META-INF directory. # Make sure the output directory is created. -$(shell $(MKDIR) -p $(JDK_OUTPUTDIR)/newclasses/META-INF/services) +$(shell $(MKDIR) -p $(JDK_OUTPUTDIR)/classes/META-INF/services) # Find all META-INF/services/* files ALL_META-INF_DIRS_share:=$(shell $(FIND) $(JDK_TOPDIR)/src/share/classes -type d -a -name META-INF) ALL_META-INF_DIRS_hostapi:=$(shell $(FIND) $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes -type d -a -name META-INF) @@ -107,12 +184,22 @@ else ALL_META-INF_DIRS:=$(ALL_META-INF_DIRS_share) endif # Filter out META-INF dirs that shouldn't be included -ALL_META-INF_DIRS:=$(filter-out %sun/nio/cs/ext/META-INF,$(ALL_META-INF_DIRS)) ifdef OPENJDK ALL_META-INF_DIRS:=$(filter-out %com/sun/script/javascript/META-INF,$(ALL_META-INF_DIRS)) endif +ifndef OPENJDK +ifneq ($(PLATFORM), macosx) + ALL_META-INF_DIRS += $(JDK_TOPDIR)/src/closed/share/classes/sun/jdbc/odbc/META-INF +endif +endif + +ifndef OPENJDK + ALL_META-INF_DIRS += $(JDK_TOPDIR)/src/closed/share/classes/sun/java2d/cmm/kcms/META-INF +endif + SRC_SERVICES_FILES:=$(wildcard $(addsuffix /services/*,$(ALL_META-INF_DIRS))) + ifdef OPENJDK SRC_SERVICES_FILES:=$(filter-out %sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine,$(SRC_SERVICES_FILES)) SRC_SERVICES_FILES:=$(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.PCMM,$(SRC_SERVICES_FILES)) @@ -120,16 +207,17 @@ else SRC_SERVICES_FILES:=$(filter-out %sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine,$(SRC_SERVICES_FILES)) SRC_SERVICES_FILES:=$(filter-out %sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.PCMM,$(SRC_SERVICES_FILES)) endif + # The number of services files are relatively few. If the increase in numbers, then # we have to use ListPathsSafelyNow here. -# Change $(JDK_TOPDIR)/src/.../META-INF/services/yyyy into $(JDK_OUTPUTDIR)/newclasses/META-INF/services/yyyy +# Change $(JDK_TOPDIR)/src/.../META-INF/services/yyyy into $(JDK_OUTPUTDIR)/classes/META-INF/services/yyyy # The \n in the printf command is needed to make sed work on Solaris. -OUT_SERVICES_FILES:=$(addprefix $(JDK_OUTPUTDIR)/newclasses/META-INF/services/,\ +OUT_SERVICES_FILES:=$(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/,\ $(shell $(PRINTF) "$(SRC_SERVICES_FILES)\n" | $(SED) -e 's|/[^ ]*/META-INF/services/||g')) OUT_SERVICES_FILES_COLON:=$(addsuffix :,$(OUT_SERVICES_FILES)) # Exception handling for print services with no META-INF directory SRC_SERVICES_FILES_PRINT = $(wildcard $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes/sun/print/services/*) -OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/newclasses/META-INF/services/,\ +OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/,\ $(patsubst $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes/sun/print/services/%,%,\ $(SRC_SERVICES_FILES_PRINT))) OUT_SERVICES_FILES_PRINT_COLON = $(addsuffix :,$(OUT_SERVICES_FILES_PRINT)) @@ -148,3 +236,45 @@ $(foreach i,$(META-INF_RULES_SERVICES),$(eval $(call addto_meta-inf_services,$i) COPY_EXTRA += $(OUT_SERVICES_FILES) COPY_EXTRA += $(OUT_SERVICES_FILES_PRINT) + +### + +$(JDK_OUTPUTDIR)/classes/sun/nio/cs/ext/sjis0213.dat : $(JDK_OUTPUTDIR)/gensrc/sun/nio/cs/ext/sjis0213.dat + $(MKDIR) -p $(@D) + $(RM) $@ + $(CP) $< $(@) + +COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/sun/nio/cs/ext/sjis0213.dat + +### + +JAVAX_SOUND_SRC := $(JDK_TOPDIR)/src/share/classes/com/sun/media/sound/services + +JAVAX_SOUND_SRC_FILES := \ + javax.sound.midi.spi.MidiDeviceProvider \ + javax.sound.midi.spi.MidiFileReader \ + javax.sound.midi.spi.MidiFileWriter \ + javax.sound.midi.spi.SoundbankReader \ + javax.sound.sampled.spi.AudioFileReader \ + javax.sound.sampled.spi.AudioFileWriter \ + javax.sound.sampled.spi.FormatConversionProvider + +COPY_EXTRA += $(foreach F,$(notdir $(JAVAX_SOUND_SRC_FILES)),$(JDK_OUTPUTDIR)/classes/META-INF/services/${F}) + +ifeq ($(PLATFORM)-$(ARCH),windows-ia64) + JAVAX_SOUND_SRC_FILES += windows-ia64/javax.sound.sampled.spi.MixerProvider + COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider +else ifeq ($(PLATFORM),windows) + JAVAX_SOUND_SRC_FILES += windows-i586/javax.sound.sampled.spi.MixerProvider + COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider +else ifeq ($(PLATFORM)-$(ARCH),linux-i586) + JAVAX_SOUND_SRC_FILES += linux-i586/javax.sound.sampled.spi.MixerProvider + COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider +else + JAVAX_SOUND_SRC_FILES += javax.sound.sampled.spi.MixerProvider + COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/META-INF/services/javax.sound.sampled.spi.MixerProvider +endif + +JAVAX_SOUND_RULES := $(foreach F,$(JAVAX_SOUND_SRC_FILES),$(JDK_OUTPUTDIR)/classes/META-INF/services/$(notdir $F):$(JAVAX_SOUND_SRC)/$F) + +$(foreach R,$(JAVAX_SOUND_RULES),$(eval $(call addto_meta-inf_services,$R))) diff --git a/jdk/makefiles/CopySamples.gmk b/jdk/makefiles/CopySamples.gmk index bbc6f3ccef3..f373b26d341 100644 --- a/jdk/makefiles/CopySamples.gmk +++ b/jdk/makefiles/CopySamples.gmk @@ -46,7 +46,7 @@ ifndef OPENJDK SAMPLE_TARGET += $(SAMPLE_CLOSED_TARGET) endif -ifeq ($(PLATFORM),solaris) +ifneq (, $(filter $(PLATFORM), solaris macosx)) SAMPLE_SOLARIS_SOURCE := $(shell $(FIND) $(SAMPLE_SOLARIS_SOURCE_DIR) -type f -print) SAMPLE_SOLARIS_TARGET := $(subst $(SAMPLE_SOLARIS_SOURCE_DIR),$(SAMPLE_TARGET_DIR),$(SAMPLE_SOLARIS_SOURCE)) SAMPLE_TARGET += $(SAMPLE_SOLARIS_TARGET) @@ -54,17 +54,17 @@ endif $(SAMPLE_TARGET_DIR)/dtrace/%: $(SAMPLE_SOLARIS_SOURCE_DIR)/dtrace/% $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ $(SAMPLE_TARGET_DIR)/webservices/%: $(SAMPLE_CLOSED_SOURCE_DIR)/webservices/% $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ $(SAMPLE_TARGET_DIR)/%: $(SAMPLE_SOURCE_DIR)/% $(MKDIR) -p $(@D) - rm -f $@ + $(RM) -f $@ $(CP) $< $@ COPY_FILES += $(SAMPLE_TARGET) diff --git a/jdk/makefiles/CreateJars.gmk b/jdk/makefiles/CreateJars.gmk new file mode 100644 index 00000000000..681fdb70201 --- /dev/null +++ b/jdk/makefiles/CreateJars.gmk @@ -0,0 +1,809 @@ +# +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include $(SPEC) +include MakeBase.gmk +include JavaCompilation.gmk +include Setup.gmk + +default: all + +include Tools.gmk + + +MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf +BEANMANIFEST := $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest + +JARS:= + +########################################################################################## + +JCONSOLE_JAR_DEPS := \ + $(shell $(FIND) $(JDK_OUTPUTDIR)/classes/sun/tools/jconsole/ -name "_the.package") \ + $(shell $(FIND) $(JDK_OUTPUTDIR)/classes/com/sun/tools/jconsole/ -name "_the.package") + +$(eval $(call SetupArchive,BUILD_JCONSOLE_JAR,$(JCONSOLE_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/classes,\ + SUFFIXES:=.class .gif .png,\ + INCLUDES:=sun/tools/jconsole com/sun/tools/jconsole,\ + JARMAIN:=sun.tools.jconsole.JConsole,\ + JAR:=$(JDK_OUTPUTDIR)/lib/jconsole.jar,\ + SKIP_METAINF:=true)) + +JARS+=$(JDK_OUTPUTDIR)/lib/jconsole.jar + +########################################################################################## + +DNS_JAR_DEPS := \ + $(shell $(FIND) $(JDK_OUTPUTDIR)/classes/sun/net/spi/nameservice/dns/ -name "_the.package") \ + +$(eval $(call SetupArchive,BUILD_DNS_JAR,$(DNS_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/classes,\ + INCLUDES:=sun/net/spi/nameservice/dns,\ + EXTRA_FILES:=META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor,\ + JAR:=$(JDK_OUTPUTDIR)/lib/ext/dnsns.jar,\ + SKIP_METAINF:=true)) + +JARS+=$(JDK_OUTPUTDIR)/lib/ext/dnsns.jar + +########################################################################################## + +LOCALEDATA_INCLUDE_PATTERNS := \ + sun/text/resources/*_ar* \ + sun/text/resources/*_hi* \ + sun/text/resources/*_iw* \ + sun/text/resources/*_iw* \ + sun/text/resources/*_ja* \ + sun/text/resources/*_ko* \ + sun/text/resources/*_th.* \ + sun/text/resources/*_th_* \ + sun/text/resources/*_vi* \ + sun/text/resources/*_zh* \ + sun/text/resources/*Data_th \ + sun/text/resources/thai_dict \ + sun/util/resources/*_ar* \ + sun/util/resources/*_hi* \ + sun/util/resources/*_iw* \ + sun/util/resources/*_iw* \ + sun/util/resources/*_ja* \ + sun/util/resources/*_ko* \ + sun/util/resources/*_th_* \ + sun/util/resources/*_th.* \ + sun/util/resources/*_vi* \ + sun/util/resources/*_zh* + +LOCALEDATA_INCLUDES := $(patsubst $(JDK_OUTPUTDIR)/classes/%,%,\ + $(foreach i,$(LOCALEDATA_INCLUDE_PATTERNS), $(wildcard $(JDK_OUTPUTDIR)/classes/$i))) + +$(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\ + SRCS:=$(JDK_OUTPUTDIR)/classes,\ + SUFFIXES:=.class _dict _th,\ + INCLUDES:=$(LOCALEDATA_INCLUDES),\ + JAR:=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar,\ + SKIP_METAINF:=true)) + +JARS+=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar + +########################################################################################## +# rt.jar and resources.jar are being built in the same way as in the old build. They require +# the files to be in a certain order and converting that is not easy and will not be needed +# in jigsaw anyway. + +# Exclude list for rt.jar and resources.jar +RT_JAR_EXCLUDES := \ + com/sun/javadoc \ + com/sun/jdi \ + com/sun/jarsigner \ + com/sun/source \ + com/sun/istack/internal/tools \ + META-INF/services/com.sun.jdi.connect.Connector \ + META-INF/services/com.sun.jdi.connect.spi.TransportService \ + META-INF/services/com.sun.tools.xjc.Plugin \ + com/sun/tools \ + sun/jvmstat \ + sun/nio/cs/ext \ + sun/awt/HKSCS.class \ + sun/awt/motif/X11GB2312\$$$$Decoder.class \ + sun/awt/motif/X11GB2312\$$$$Encoder.class \ + sun/awt/motif/X11GB2312.class \ + sun/awt/motif/X11GBK\$$$$Encoder.class \ + sun/awt/motif/X11GBK.class \ + sun/awt/motif/X11KSC5601\$$$$Decoder.class \ + sun/awt/motif/X11KSC5601\$$$$Encoder.class \ + sun/awt/motif/X11KSC5601.class \ + META-INF/services/java.nio.charset.spi.CharsetProvider \ + sun/rmi/rmic \ + sun/tools/asm \ + sun/tools/java \ + sun/tools/javac \ + com/sun/tools/classfile \ + com/sun/tools/javap \ + sun/tools/jcmd \ + sun/tools/jconsole \ + sun/tools/jps \ + sun/tools/jstat \ + sun/tools/jstatd \ + sun/tools/native2ascii \ + sun/tools/serialver \ + sun/tools/tree \ + sun/tools/util \ + sun/security/tools/JarBASE64Encoder.class \ + sun/security/tools/JarSigner.class \ + sun/security/tools/JarSignerParameters.class \ + sun/security/tools/JarSignerResources.class \ + sun/security/tools/JarSignerResources_ja.class \ + sun/security/tools/JarSignerResources_zh_CN.class \ + sun/security/tools/SignatureFile\$$$$Block.class \ + sun/security/tools/SignatureFile.class \ + sun/security/tools/TimestampedSigner.class \ + sun/security/provider/Sun.class \ + sun/security/rsa/SunRsaSign.class \ + sun/security/ssl \ + sun/security/ec/ECDHKeyAgreement.class \ + sun/security/ec/ECDSASignature\$$$$Raw.class \ + sun/security/ec/ECDSASignature\$$$$SHA1.class \ + sun/security/ec/ECDSASignature\$$$$SHA224.class \ + sun/security/ec/ECDSASignature\$$$$SHA256.class \ + sun/security/ec/ECDSASignature\$$$$SHA384.class \ + sun/security/ec/ECDSASignature\$$$$SHA512.class \ + sun/security/ec/ECDSASignature.class \ + sun/security/ec/ECKeyPairGenerator.class \ + sun/security/ec/SunEC\$$$$1.class \ + sun/security/ec/SunEC.class \ + sun/security/ec/SunECEntries.class \ + sun/security/pkcs11 \ + com/sun/net/ssl/internal/ssl \ + javax/crypto \ + sun/security/internal \ + com/sun/crypto/provider \ + META-INF/services/com.sun.tools.attach.spi.AttachProvider \ + com/sun/tools/attach \ + org/relaxng/datatype \ + com/sun/codemodel \ + com/sun/xml/internal/dtdparser \ + com/sun/xml/internal/rngom \ + com/sun/xml/internal/xsom \ + com/sun/tools/script/shell \ + sun/tools/attach \ + sun/tools/jstack \ + sun/tools/jinfo \ + sun/tools/jmap \ + sun/net/spi/nameservice/dns \ + META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \ + javax/swing/beaninfo \ + javax/swing/AbstractButtonBeanInfo.class \ + javax/swing/BoxBeanInfo.class \ + javax/swing/JAppletBeanInfo.class \ + javax/swing/JButtonBeanInfo.class \ + javax/swing/JCheckBoxBeanInfo.class \ + javax/swing/JCheckBoxMenuItemBeanInfo.class \ + javax/swing/JColorChooserBeanInfo.class \ + javax/swing/JComboBoxBeanInfo.class \ + javax/swing/JComponentBeanInfo.class \ + javax/swing/JDesktopPaneBeanInfo.class \ + javax/swing/JDialogBeanInfo.class \ + javax/swing/JEditorPaneBeanInfo.class \ + javax/swing/JFileChooserBeanInfo.class \ + javax/swing/JFormattedTextFieldBeanInfo.class \ + javax/swing/JFrameBeanInfo.class \ + javax/swing/JInternalFrameBeanInfo.class \ + javax/swing/JLabelBeanInfo.class \ + javax/swing/JLayeredPaneBeanInfo.class \ + javax/swing/JListBeanInfo.class \ + javax/swing/JMenuBarBeanInfo.class \ + javax/swing/JMenuBeanInfo.class \ + javax/swing/JMenuItemBeanInfo.class \ + javax/swing/JOptionPaneBeanInfo.class \ + javax/swing/JPanelBeanInfo.class \ + javax/swing/JPasswordFieldBeanInfo.class \ + javax/swing/JPopupMenuBeanInfo.class \ + javax/swing/JProgressBarBeanInfo.class \ + javax/swing/JRadioButtonBeanInfo.class \ + javax/swing/JRadioButtonMenuItemBeanInfo.class \ + javax/swing/JScrollBarBeanInfo.class \ + javax/swing/JScrollPaneBeanInfo.class \ + javax/swing/JSeparatorBeanInfo.class \ + javax/swing/JSliderBeanInfo.class \ + javax/swing/JSpinnerBeanInfo.class \ + javax/swing/JSplitPaneBeanInfo.class \ + javax/swing/JTabbedPaneBeanInfo.class \ + javax/swing/JTableBeanInfo.class \ + javax/swing/JTextAreaBeanInfo.class \ + javax/swing/JTextFieldBeanInfo.class \ + javax/swing/JTextPaneBeanInfo.class \ + javax/swing/JToggleButtonBeanInfo.class \ + javax/swing/JToolBarBeanInfo.class \ + javax/swing/JTreeBeanInfo.class \ + javax/swing/JWindowBeanInfo.class \ + javax/swing/SwingBeanInfoBase.class \ + javax/swing/text/JTextComponentBeanInfo.class \ + sun/swing/BeanInfoUtils.class \ + $(LOCALEDATA_INCLUDES) + +ifndef OPENJDK +ifndef JAVASE_EMBEDDED +RT_JAR_EXCLUDES += \ + com/oracle/jrockit/jfr \ + oracle/jrockit/jfr +endif +endif + +# Find all files in the classes dir to use as dependencies. This could be more fine granular. +ALL_FILES_IN_CLASSES := $(shell $(FIND) $(JDK_OUTPUTDIR)/classes -type f \ + | $(GREP) -v -e '/_the\.*' -e '^_the\.*') + +RT_JAR_MANIFEST_FILE := $(JDK_OUTPUTDIR)/lib/_the.rt.jar_manifest +RESOURCE_JAR_MANIFEST_FILE := $(JDK_OUTPUTDIR)/lib/_the.resources.jar_manifest + +$(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST) + $(MKDIR) -p $(@D) + $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ + -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \ + $(MAINMANIFEST) >> $@ + $(ECHO) >> $@ + $(CAT) $(BEANMANIFEST) >> $@ + +$(RESOURCE_JAR_MANIFEST_FILE): $(MAINMANIFEST) + $(MKDIR) -p $(@D) + $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ + -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \ + $(MAINMANIFEST) >> $@ + +$(JDK_OUTPUTDIR)/lib/_the.jars.exclude: + $(MKDIR) -p $(@D) + $(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@) + +$(JDK_OUTPUTDIR)/lib/_the.jars.contents: $(BUILD_TOOLS) $(JDK_OUTPUTDIR)/lib/_the.jars.exclude \ + $(ALL_FILES_IN_CLASSES) + $(MKDIR) -p $(@D) + $(RM) $@.temp + ($(CD) $(JDK_OUTPUTDIR)/classes && \ + $(TOOL_JARREORDER) \ + -o $@.temp $(JDK_OUTPUTDIR)/lib/classlist $(JDK_OUTPUTDIR)/lib/_the.jars.exclude . ) + $(MV) $@.temp $@ + +$(JDK_OUTPUTDIR)/lib/_the.rt.jar.contents: $(JDK_OUTPUTDIR)/lib/_the.jars.contents + $(GREP) -e '\.class$$' $(JDK_OUTPUTDIR)/lib/_the.jars.contents > $@ + +$(JDK_OUTPUTDIR)/lib/_the.resources.jar.contents: $(JDK_OUTPUTDIR)/lib/_the.jars.contents + $(GREP) -v -e '\.class$$' -e '/_the\.*' -e '^_the\.*' $(JDK_OUTPUTDIR)/lib/_the.jars.contents > $@ + +$(JDK_OUTPUTDIR)/lib/rt.jar: $(JDK_OUTPUTDIR)/lib/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE) + $(ECHO) Creating rt.jar + $(CD) $(JDK_OUTPUTDIR)/classes && \ + $(JAR) cfm $@ $(RT_JAR_MANIFEST_FILE) \ + @$(JDK_OUTPUTDIR)/lib/_the.rt.jar.contents + +$(JDK_OUTPUTDIR)/lib/resources.jar: $(JDK_OUTPUTDIR)/lib/_the.resources.jar.contents \ + $(RESOURCE_JAR_MANIFEST_FILE) + $(ECHO) Creating resources.jar + $(CD) $(JDK_OUTPUTDIR)/classes && \ + $(JAR) cfm $@ $(RESOURCE_JAR_MANIFEST_FILE) \ + @$(JDK_OUTPUTDIR)/lib/_the.resources.jar.contents + +JARS+=$(JDK_OUTPUTDIR)/lib/rt.jar $(JDK_OUTPUTDIR)/lib/resources.jar + +########################################################################################## + +CHARSETS_JAR_DEPS := + +ifneq ($(HOST_OS), windows) + CHARSETS_EXTRA_FILES:=sun/awt/motif/X11GBK.class \ + sun/awt/motif/X11GB2312\$$$$Decoder.class \ + sun/awt/motif/X11GB2312.class \ + sun/awt/motif/X11KSC5601\$$$$Decoder.class \ + sun/awt/motif/X11KSC5601\$$$$Encoder.class \ + sun/awt/motif/X11GB2312\$$$$Encoder.class \ + sun/awt/motif/X11GBK\$$$$Encoder.class \ + sun/awt/motif/X11KSC5601.class +endif + +$(eval $(call SetupArchive,BUILD_CHARSETS_JAR,$(CHARSETS_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/classes, \ + SUFFIXES:=.class .dat,\ + INCLUDES:=sun/nio/cs/ext,\ + EXTRA_FILES := sun/awt/HKSCS.class \ + $(CHARSETS_EXTRA_FILES) \ + META-INF/services/java.nio.charset.spi.CharsetProvider, \ + JAR:=$(JDK_OUTPUTDIR)/lib/charsets.jar, \ + SKIP_METAINF := true)) + +JARS+=$(JDK_OUTPUTDIR)/lib/charsets.jar + +########################################################################################## + +ifndef OPENJDK + $(eval $(call SetupArchive,BUILD_JFR_JAR,,\ + SRCS:=$(JDK_OUTPUTDIR)/classes,\ + INCLUDES:=com/oracle/jrockit/jfr \ + oracle/jrockit/jfr,\ + JAR:=$(JDK_OUTPUTDIR)/lib/jfr.jar,\ + SKIP_METAINF:=true,\ + MANIFEST:=$(MAINMANIFEST))) + + JARS+=$(JDK_OUTPUTDIR)/lib/jfr.jar +endif + +########################################################################################## + +$(eval $(call SetupArchive,BUILD_JSSE_JAR,,\ + SRCS:=$(JDK_OUTPUTDIR)/classes,\ + INCLUDES:=sun/security/provider/Sun.class \ + sun/security/rsa/SunRsaSign.class \ + sun/security/ssl \ + com/sun/net/ssl/internal/ssl,\ + JAR:=$(JDK_OUTPUTDIR)/lib/jsse.jar,\ + SKIP_METAINF:=true,\ + MANIFEST:=$(MAINMANIFEST))) + +JARS+=$(JDK_OUTPUTDIR)/lib/jsse.jar + +########################################################################################## + +ifneq ($(PLATFORM)-$(ARCH_DATA_MODEL),windows-64) + SUNPKCS11_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunpkcs11.jar + + ifndef OPENJDK + + SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar + + $(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_SRC) + @$(ECHO) "\n>>>Installing prebuilt SunPKCS11 provider..." + $(RM) $@ + $(CP) $< $@ + + else + + $(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR,$(SUNPKCS11_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/classes, \ + SUFFIXES:=.class,\ + INCLUDES:=sun/security/pkcs11,\ + JAR:=$(SUNPKCS11_JAR_DST), \ + SKIP_METAINF := true)) + + endif + + JARS += $(SUNPKCS11_JAR_DST) +endif + +########################################################################################## + +SUNEC_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunec.jar + +ifndef OPENJDK + +SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar + +$(SUNEC_JAR_DST) : $(SUNEC_JAR_SRC) + @$(ECHO) "\n>>>Installing prebuilt SunEC provider..." + $(RM) $@ + $(CP) $< $@ + +else + +$(eval $(call SetupArchive,BUILD_SUNEC_JAR,,\ + SRCS:=$(JDK_OUTPUTDIR)/classes, \ + SUFFIXES:=.class,\ + INCLUDES:=sun/security/ec,\ + EXCLUDE_FILES := sun/security/ec/ECKeyFactory.class \ + sun/security/ec/ECParameters.class \ + sun/security/ec/ECPrivateKeyImpl.class \ + sun/security/ec/ECPublicKeyImpl.class \ + sun/security/ec/NamedCurve.class \ + sun/security/ec/ECKeyFactory*,\ + JAR:=$(SUNEC_JAR_DST), \ + SKIP_METAINF := true)) + +endif + +JARS += $(SUNEC_JAR_DST) + +########################################################################################## + +$(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR,,\ + SRCS:=$(JDK_OUTPUTDIR)/classes,\ + SUFFIXES:=BeanInfo.class .gif,\ + INCLUDES:=javax/swing sun/swing,\ + EXCLUDES:=javax/swing/plaf,\ + EXTRA_FILES:=javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class,\ + JAR:=$(JDK_OUTPUTDIR)/lib/dt.jar,\ + SKIP_METAINF:=true)) + +JARS+=$(JDK_OUTPUTDIR)/lib/dt.jar + +########################################################################################## + +SUNJCE_PROVIDER_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunjce_provider.jar + +ifndef OPENJDK + SUNJCE_PROVIDER_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/sunjce_provider.jar + + $(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_SRC) + @$(ECHO) "\n>>>Installing prebuilt SunJCE provider..." + $(RM) $@ + $(CP) $< $@ +else + + $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR,$(SUNJCE_PROVIDER_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/classes, \ + SUFFIXES:=.class,\ + INCLUDES:= com/sun/crypto/provider,\ + JAR:=$(SUNJCE_PROVIDER_JAR_DST), \ + MANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf, \ + EXTRA_MANIFEST_ATTR := Extension-Name: javax.crypto\nImplementation-Vendor-Id: com.sun, \ + SKIP_METAINF := true)) +endif + +JARS += $(SUNJCE_PROVIDER_JAR_DST) + +JCE_JAR_DST := $(JDK_OUTPUTDIR)/lib/jce.jar + +ifndef OPENJDK + +JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar + +$(JCE_JAR_DST) : $(JCE_JAR_SRC) + @$(ECHO) "\n>>>Installing prebuilt jce.jar..." + $(RM) $@ + $(CP) $< $@ + +else + +$(eval $(call SetupArchive,BUILD_JCE_JAR,$(JCE_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/classes, \ + SUFFIXES:=.class,\ + INCLUDES:= javax/crypto sun/security/internal,\ + JAR:=$(JCE_JAR_DST), \ + MANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf, \ + EXTRA_MANIFEST_ATTR := Extension-Name: javax.crypto\nImplementation-Vendor-Id: com.sun, \ + SKIP_METAINF := true)) +endif + +JARS += $(JCE_JAR_DST) + +########################################################################################## + +ifdef OPENJDK + +# +# TODO fix so that SetupArchive does not write files into SRCS +# then we don't need this extra copying +# +US_EXPORT_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar +US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited +US_EXPORT_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/US_export_policy_jar.tmp + +$(US_EXPORT_POLICY_JAR_TMP)/% : $(US_EXPORT_POLICY_JAR_SRC_DIR)/% + $(MKDIR) -p $(@D) + $(CP) $< $@ + +US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy + +$(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR,$(US_EXPORT_POLICY_JAR_DEPS),\ + SRCS:=$(US_EXPORT_POLICY_JAR_TMP), \ + SUFFIXES:= .policy,\ + JAR:=$(US_EXPORT_POLICY_JAR_DST), \ + EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \ + SKIP_METAINF := true)) + +JARS += $(US_EXPORT_POLICY_JAR_DST) + +endif + +########################################################################################## + + +ifdef OPENJDK + +# +# TODO fix so that SetupArchive does not write files into SRCS +# then we don't need this extra copying +# +LOCAL_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/local_policy.jar +LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited +LOCAL_POLICY_JAR_TMP := $(JDK_OUTPUTDIR)/local_policy_jar.tmp + +LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy $(LOCAL_POLICY_JAR_TMP)/default_local.policy + +$(LOCAL_POLICY_JAR_TMP)/% : $(LOCAL_POLICY_JAR_SRC_DIR)/% + $(MKDIR) -p $(@D) + $(CP) $< $@ + +$(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR,$(LOCAL_POLICY_JAR_DEPS),\ + SRCS:=$(LOCAL_POLICY_JAR_TMP),\ + SUFFIXES:= .policy,\ + JAR:=$(LOCAL_POLICY_JAR_DST), \ + EXTRA_MANIFEST_ATTR := Crypto-Strength: limited, \ + SKIP_METAINF := true)) + +JARS += $(LOCAL_POLICY_JAR_DST) + +endif + +########################################################################################## + +ifeq ($(PLATFORM),windows) + +SUNMSCAPI_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunmscapi.jar + +ifndef OPENJDK +SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar + +$(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_SRC) + @$(ECHO) "\n>>>Installing prebuilt SunMSCAPI provider..." + $(RM) $@ + $(CP) $< $@ + +else + +$(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR,$(SUNMSCAPI_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/classes, \ + SUFFIXES:=.class,\ + INCLUDES:= sun/security/mscapi,\ + JAR:=$(SUNMSCAPI_JAR_DST), \ + MANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf, \ + EXTRA_MANIFEST_ATTR := Extension-Name: javax.crypto\nImplementation-Vendor-Id: com.sun, \ + SKIP_METAINF := true)) +endif + +JARS += $(SUNMSCAPI_JAR_DST) + +endif + +########################################################################################## + +ifeq ($(PLATFORM),solaris) +ifndef OPENJDK + +UCRYPTO_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/ucrypto.jar +UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar + +$(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC) + @$(ECHO) "\n>>>Installing prebuilt OracleUcrypto provider..." + $(RM) $@ + $(CP) $< $@ + +JARS += $(UCRYPTO_JAR_DST) + +endif +endif + +########################################################################################## + +TOOLS_JAR_INCLUDES := \ + sun/tools/asm \ + sun/tools/jar \ + sun/tools/java \ + sun/tools/javac \ + sun/tools/jcmd \ + sun/tools/jps \ + sun/tools/jstat \ + sun/tools/jstatd \ + sun/tools/native2ascii \ + sun/tools/serialver \ + sun/tools/tree \ + sun/tools/util \ + sun/security/tools/JarBASE64Encoder.class \ + sun/security/tools/JarSigner.class \ + sun/security/tools/JarSignerParameters.class \ + sun/security/tools/JarSignerResources.class \ + sun/security/tools/JarSignerResources_ja.class \ + sun/security/tools/JarSignerResources_zh_CN.class \ + sun/security/tools/SignatureFile* \ + sun/security/tools/TimestampedSigner.class \ + sun/rmi/rmic \ + sun/applet \ + sun/jvmstat \ + com/sun/javadoc \ + com/sun/jdi \ + com/sun/jarsigner \ + com/sun/source \ + com/sun/tools/classfile \ + com/sun/tools/doclets \ + com/sun/tools/example/debug/expr \ + com/sun/tools/example/debug/tty \ + com/sun/tools/extcheck \ + com/sun/tools/hat \ + com/sun/tools/javac \ + com/sun/tools/javadoc \ + com/sun/tools/javah \ + com/sun/tools/javap \ + com/sun/tools/corba \ + com/sun/tools/internal/xjc \ + com/sun/tools/internal/ws \ + com/sun/istack/internal/tools \ + com/sun/tools/internal/jxc/ap \ + com/sun/tools/internal/ws/wscompile/plugin/at_generated \ + com/sun/codemodel \ + com/sun/tools/internal/jxc \ + com/sun/xml/internal/rngom \ + com/sun/xml/internal/xsom \ + org/relaxng/datatype \ + com/sun/xml/internal/dtdparser \ + com/sun/tools/jdi \ + com/sun/tools/script/shell \ + com/sun/tools/attach \ + sun/tools/attach \ + sun/tools/jstack \ + sun/tools/jinfo \ + sun/tools/jmap + +$(eval $(call SetupArchive,BUILD_TOOLS_JAR,$(TOOLS_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/classes,\ + SUFFIXES:=.class .prp .gif .properties .xml .css .xsd .js .html .txt .java \ + Tool aliasmap options,\ + INCLUDES:=$(TOOLS_JAR_INCLUDES),\ + EXTRA_FILES:=META-INF/services/com.sun.jdi.connect.Connector \ + META-INF/services/com.sun.jdi.connect.spi.TransportService \ + META-INF/services/com.sun.tools.attach.spi.AttachProvider \ + META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ + META-INF/services/com.sun.tools.internal.xjc.Plugin,\ + JAR:=$(JDK_OUTPUTDIR)/lib/tools.jar,\ + SKIP_METAINF:=true)) + +JARS+=$(JDK_OUTPUTDIR)/lib/tools.jar + +########################################################################################## + +include $(JDK_TOPDIR)/makefiles/docs/CORE_PKGS.gmk +include $(JDK_TOPDIR)/makefiles/docs/NON_CORE_PKGS.gmk + +# The compiler should not issue a "Proprietary" warning when compiling +# classes in the com.sun.java.swing.plaf packages, since we've always +# allowed, and even advocated, extending them (see bug 6476749). +# +# This approach is NOT to be used as a general purpose way to avoid such +# compiler warnings for non-core packages. The correct way is to document +# the packages in NON_CORE_PKGS.gmk, and include them in the NON_CORE_PKGS +# definition. +# +# Swing has taken this approach only as a temporary measure to avoid +# the compiler warnings until we can properly document these packages. +# This is covered under 6491853. +EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \ + com.sun.java.swing.plaf.motif \ + com.sun.java.swing.plaf.gtk + +# +# Include the exported private packages in ct.sym. +# This is an interim solution until the ct.sym is replaced +# with a new module system (being discussed for JDK 8). +# +EXPORTED_PRIVATE_PKGS = com.sun.servicetag \ + com.oracle.net \ + com.oracle.nio + +$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(JDK_OUTPUTDIR)/lib/rt.jar + $(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym + $(JAVA) \ + -Xbootclasspath/a:$(JDK_OUTPUTDIR)/classes \ + $(JAVAC_JARS) \ + -XDprocess.packages -proc:only \ + -processor com.sun.tools.javac.sym.CreateSymbols \ + -Acom.sun.tools.javac.sym.Jar=$(JDK_OUTPUTDIR)/lib/rt.jar \ + -Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \ + $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS) + $(TOUCH) $@ + +MAKE_SURE_DIR_EXISTS_DUMMY := $(shell $(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols) +$(eval $(call SetupArchive,BUILD_CT_SYM,$(IMAGES_OUTPUTDIR)/symbols/_the.symbols,\ + SRCS:=$(IMAGES_OUTPUTDIR)/symbols,\ + INCLUDES:=META-INF/sym,\ + JAR:=$(JDK_OUTPUTDIR)/lib/ct.sym)) + +JARS+=$(JDK_OUTPUTDIR)/lib/ct.sym + +########################################################################################## + +SRC_ZIP_INCLUDES = \ + java/applet \ + java/awt \ + java/beans \ + java/io \ + java/lang \ + java/math \ + java/net \ + java/nio \ + java/rmi \ + java/security \ + java/sql \ + java/text \ + java/util \ + com/sun/corba \ + com/sun/image/codec/jpeg \ + com/sun/imageio \ + com/sun/java/swing \ + com/sun/javadoc \ + com/sun/jmx \ + com/sun/source \ + com/sun/naming \ + com/sun/security/auth \ + com/sun/security/jgss \ + javax/accessibility \ + javax/annotation \ + javax/script \ + javax/imageio \ + javax/lang \ + javax/management \ + javax/naming \ + javax/print \ + javax/rmi \ + javax/security \ + javax/sound \ + javax/sql \ + javax/swing \ + javax/tools \ + javax/xml \ + com/sun/org/apache \ + com/sun/java_cup \ + com/sun/jlex \ + org/ietf \ + org/omg \ + org/w3c/dom \ + org/xml/sax \ + sunw + +SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes +SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc +SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/impsrc +SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gendocsrc_rmic +ifndef OPENJDK + SRC_ZIP_SRCS += $(JDK_TOPDIR)/src/closed/share/classes +endif + +# Need to copy launcher src files into desired directory structure +# before zipping the sources. +LAUNCHER_SRC_FILES := $(wildcard $(JDK_TOPDIR)/src/share/bin/*) \ + $(wildcard $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/bin/java_md*) +LAUNCHER_ZIP_SRC := $(patsubst $(JDK_TOPDIR)/src/share/bin/%,$(IMAGES_OUTPUTDIR)/src/launcher/%,\ + $(patsubst $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/bin/%,$(IMAGES_OUTPUTDIR)/src/launcher/%,\ + $(LAUNCHER_SRC_FILES))) + +$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/share/bin/% + $(MKDIR) -p $(@D) + $(CP) $< $@ + +$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/bin/% + $(MKDIR) -p $(@D) + $(CP) $< $@ + +$(IMAGES_OUTPUTDIR)/src.zip: $(LAUNCHER_ZIP_SRC) + +# This dir needs to exsist before macro is evaluated to avoid warning from find. +MAKE_SURE_DIR_EXISTS_DUMMY := $(shell $(MKDIR) -p $(IMAGES_OUTPUTDIR)/src) +$(eval $(call SetupZipArchive,BUILD_SRC_ZIP,\ + SRC:=$(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src,\ + INCLUDES:=$(SRC_ZIP_INCLUDES) launcher,\ + SUFFIXES:=.java .c .h,\ + ZIP:=$(IMAGES_OUTPUTDIR)/src.zip,\ + EXTRA_DEPS:=$(LAUNCHER_ZIP_SRC))) + +JARS+=$(IMAGES_OUTPUTDIR)/src.zip + +########################################################################################## + +all: $(JARS) + +.PHONY: default all diff --git a/jdk/makefiles/GendataBreakIterator.gmk b/jdk/makefiles/GendataBreakIterator.gmk index 64068285aff..6321afbf7ad 100644 --- a/jdk/makefiles/GendataBreakIterator.gmk +++ b/jdk/makefiles/GendataBreakIterator.gmk @@ -62,7 +62,7 @@ $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR,\ UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData/UnicodeData.txt # output -DATA_PKG_DIR = $(JDK_OUTPUTDIR)/newclasses/sun/text/resources +DATA_PKG_DIR = $(JDK_OUTPUTDIR)/classes/sun/text/resources BIFILES = $(DATA_PKG_DIR)/CharacterBreakIteratorData \ $(DATA_PKG_DIR)/WordBreakIteratorData \ $(DATA_PKG_DIR)/LineBreakIteratorData \ @@ -75,23 +75,23 @@ $(BREAK_ITERATOR_DIR)/_the.bifiles: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITER $(BREAK_ITERATOR_DIR)/_the.bifiles: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR) $(ECHO) "Generating BreakIteratorData" $(MKDIR) -p $(DATA_PKG_DIR) - rm -f $(BIFILES) + $(RM) -f $(BIFILES) $(TOOL_GENERATEBREAKITERATORDATA) \ -o $(DATA_PKG_DIR) \ -spec $(UNICODEDATA) - touch $@ + $(TOUCH) $@ $(BIFILES_TH): $(BREAK_ITERATOR_DIR)/_the.bifiles_th $(BREAK_ITERATOR_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES) $(BREAK_ITERATOR_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR) $(ECHO) "Generating BreakIteratorData_th" $(MKDIR) -p $(DATA_PKG_DIR) - rm -f $(BIFILES_TH) + $(RM) -f $(BIFILES_TH) $(TOOL_GENERATEBREAKITERATORDATA) \ -o $(DATA_PKG_DIR) \ -spec $(UNICODEDATA) \ -language th - touch $@ + $(TOUCH) $@ BREAK_ITERATOR += $(BIFILES) $(BIFILES_TH) diff --git a/jdk/makefiles/GendataFontConfig.gmk b/jdk/makefiles/GendataFontConfig.gmk new file mode 100644 index 00000000000..dec8b5bb0fc --- /dev/null +++ b/jdk/makefiles/GendataFontConfig.gmk @@ -0,0 +1,84 @@ +# +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +GENDATA_FONT_CONFIG_DST := $(JDK_OUTPUTDIR)/lib + +ifeq ($(PLATFORM), windows) +GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows +GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties +GENDATA_FONT_CONFIG_SRC_PREFIX := +endif + +ifeq ($(PLATFORM), linux) +GENDATA_FONT_CONFIG_SRC_PREFIX := linux. +ifdef OPENJDK +GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs +GENDATA_FONT_CONFIG_SRC_FILES := \ + fontconfig.properties \ + fontconfig.SuSE.properties \ + fontconfig.Ubuntu.properties \ + fontconfig.Fedora.properties +else +GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/closed/solaris/classes/sun/awt/fontconfigs +GENDATA_FONT_CONFIG_SRC_FILES := \ + fontconfig.properties \ + fontconfig.RedHat.5.properties \ + fontconfig.RedHat.6.properties \ + fontconfig.Turbo.properties \ + fontconfig.SuSE.10.properties \ + fontconfig.SuSE.11.properties +endif +endif + +ifeq ($(PLATFORM), solaris) +GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs +GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties +GENDATA_FONT_CONFIG_SRC_PREFIX := solaris. +endif + +ifeq ($(PLATFORM), macosx) +GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/macosx/classes/sun/awt/fontconfigs +GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties +GENDATA_FONT_CONFIG_SRC_PREFIX := macosx. +endif # PLATFORM + +### + +$(GENDATA_FONT_CONFIG_DST)/%.src : $(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)% + $(MKDIR) -p $(@D) + $(CP) $< $@ + +$(GENDATA_FONT_CONFIG_DST)/%.bfc : $(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%.properties + $(MKDIR) -p $(@D) + $(TOOL_COMPILEFONTCONFIG) $< $@ + +### + +GENDATA_FONT_CONFIGS := $(GENDATA_FONT_CONFIG_SRC_FILES:%=$(GENDATA_FONT_CONFIG_DST)/%.src) +GENDATA_BFONT_CONFIGS := $(GENDATA_FONT_CONFIG_SRC_FILES:%.properties=$(GENDATA_FONT_CONFIG_DST)/%.bfc) + +GENDATA_FONT_CONFIG := $(GENDATA_FONT_CONFIGS) $(GENDATA_BFONT_CONFIGS) + +### diff --git a/jdk/makefiles/com/apple/Makefile b/jdk/makefiles/GendataHtml32dtd.gmk similarity index 77% rename from jdk/makefiles/com/apple/Makefile rename to jdk/makefiles/GendataHtml32dtd.gmk index c336c610990..29ae389bd0b 100644 --- a/jdk/makefiles/com/apple/Makefile +++ b/jdk/makefiles/GendataHtml32dtd.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,17 +23,14 @@ # questions. # -# -# Makefile for building com/apple -# +GENDATA_HTML32DTD := -BUILDDIR = ../.. -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk +HTML32DTD = $(JDK_OUTPUTDIR)/classes/javax/swing/text/html/parser/html32.bdtd +$(HTML32DTD): $(BUILD_TOOLS) + $(ECHO) "Generating HTML DTD file" + $(MKDIR) -p $(@D) + $(RM) $@ + ($(TOOL_DTDBUILDER) html32 > $@) || exit 1 -SUBDIRS = osx osxui +GENDATA_HTML32DTD += $(HTML32DTD) -include $(BUILDDIR)/common/Subdirs.gmk - -all build clean clobber:: - $(SUBDIRS-loop) diff --git a/jdk/makefiles/sun/javazic/Makefile b/jdk/makefiles/GendataTimeZone.gmk similarity index 54% rename from jdk/makefiles/sun/javazic/Makefile rename to jdk/makefiles/GendataTimeZone.gmk index cbe9b6667ef..af1f34451f4 100644 --- a/jdk/makefiles/sun/javazic/Makefile +++ b/jdk/makefiles/GendataTimeZone.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,49 +23,34 @@ # questions. # -# Makefile for building javazic utility & TimeZone resource files +GENDATA_TIMEZONE := +# TODO: read from make/sun/javazic/tzdata/VERSION +GENDATA_TIMEZONE_VERSION := tzdata2012c -BUILDDIR = ../.. -PACKAGE = sun.javazic -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk +GENDATA_TIMEZONE_DST := $(JDK_OUTPUTDIR)/lib/zi +GENDATA_TIMEZONE_TMP := $(JDK_OUTPUTDIR)/gendata_timezone -# Time zone data file creation -TZDATA = $(BUILDDIR)/../make/sun/javazic/tzdata/ -TZDATA_VER = `$(GREP) '^tzdata' $(TZDATA)VERSION` -TZFILE = \ +TZFILE0 := \ africa antarctica asia australasia europe northamerica \ pacificnew southamerica backward \ etcetera solar87 solar88 solar89 systemv -JDKTZDATA = $(BUILDDIR)/../make/sun/javazic/tzdata_jdk/ -JDKTZFILES = gmt jdk11_backward -TZFILES = \ - $(addprefix $(TZDATA),$(TZFILE)) \ - $(addprefix $(JDKTZDATA),$(JDKTZFILES)) -WORKDIR = $(TEMPDIR)/zi -INSTALLDIR = $(LIBDIR)/zi -MAPFILE = ZoneInfoMappings +TZFILE1 := \ + gmt jdk11_backward -# -# Rules -# -include $(BUILDDIR)/common/Classes.gmk +TZFILES := \ + $(addprefix $(JDK_TOPDIR)/make/sun/javazic/tzdata/,$(TZFILE0)) \ + $(addprefix $(JDK_TOPDIR)/make/sun/javazic/tzdata_jdk/,$(TZFILE1)) -# Add to the build rule -build: $(INSTALLDIR)/$(MAPFILE) +GENDATA_TIMEZONE_MAPFILE:=ZoneInfoMappings -$(WORKDIR)/$(MAPFILE): $(BUILD_TOOLS) $(TZFILES) - $(RM) -r $(@D) - $(prep-target) - $(TOOL_JAVAZIC) -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES) - @$(java-vm-cleanup) +$(GENDATA_TIMEZONE_DST)/$(GENDATA_TIMEZONE_MAPFILE) : $(TZFILES) + $(RM) -rf $(GENDATA_TIMEZONE_TMP) + $(MKDIR) -p $(GENDATA_TIMEZONE_TMP) + $(RM) -rf $(GENDATA_TIMEZONE_DST) + $(MKDIR) -p $(GENDATA_TIMEZONE_DST) + $(TOOL_JAVAZIC) -V "$(GENDATA_TIMEZONE_VERSION)" -d $(GENDATA_TIMEZONE_TMP) $(TZFILES) + $(CP) -r $(GENDATA_TIMEZONE_TMP)/* $(GENDATA_TIMEZONE_DST)/ -$(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE) - $(RM) -r $(@D) - $(prep-target) - $(CP) -r $(WORKDIR)/* $(@D) - -clean clobber:: - $(RM) -r $(TEMPDIR) $(INSTALLDIR) +GENDATA_TIMEZONE += $(GENDATA_TIMEZONE_DST)/$(GENDATA_TIMEZONE_MAPFILE) diff --git a/jdk/makefiles/GenerateClasses.gmk b/jdk/makefiles/GenerateClasses.gmk index 8727e51e6f4..a5e68c8b77e 100644 --- a/jdk/makefiles/GenerateClasses.gmk +++ b/jdk/makefiles/GenerateClasses.gmk @@ -30,12 +30,9 @@ include MakeBase.gmk include RMICompile.gmk CLASSES_DIR := $(JDK_OUTPUTDIR)/classes -# Depend on files in newclasses for now to avoid bad dependency handling caused by -# copy always updating timestamps in classes. -NEWCLASSES_DIR := $(JDK_OUTPUTDIR)/newclasses -# Generate classes into separate dir for now. Can't drop in same dir as JavaCompilation -# macros as that will mess up recompile deps. -STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/newrmicclasses +# NOTE: If the smart javac dependency management is reintroduced, these classes risk +# interfering with the dependency checking. In that case they will need to be kept separate. +STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/rmicclasses RMIC_GENSRC_DIR := $(JDK_OUTPUTDIR)/gendocsrc_rmic GENCLASSES := @@ -49,7 +46,7 @@ $(eval $(call SetupRMICompilation,RMI_12,\ CLASSES:=sun.rmi.server.Activation$$$$ActivationSystemImpl\ java.rmi.activation.ActivationGroup\ com.sun.jndi.rmi.registry.ReferenceWrapper,\ - CLASSES_DIR:=$(NEWCLASSES_DIR),\ + CLASSES_DIR:=$(CLASSES_DIR),\ STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\ RUN_V12:=true)) GENCLASSES += $(RMI_12) @@ -57,7 +54,7 @@ GENCLASSES += $(RMI_12) $(eval $(call SetupRMICompilation,RMI_11,\ CLASSES:=sun.rmi.registry.RegistryImpl\ sun.rmi.transport.DGCImpl,\ - CLASSES_DIR:=$(NEWCLASSES_DIR),\ + CLASSES_DIR:=$(CLASSES_DIR),\ STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\ RUN_V11:=true)) GENCLASSES += $(RMI_11) @@ -69,7 +66,7 @@ JMAN_RMI_CLASSES:=javax.management.remote.rmi.RMIConnectionImpl\ javax.management.remote.rmi.RMIServerImpl $(eval $(call SetupRMICompilation,RMI_IIOP,\ CLASSES:=$(JMAN_RMI_CLASSES),\ - CLASSES_DIR:=$(NEWCLASSES_DIR),\ + CLASSES_DIR:=$(CLASSES_DIR),\ STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\ RUN_V12:=true,\ RUN_IIOP:=true,\ @@ -80,7 +77,7 @@ GENCLASSES += $(RMI_IIOP) # so that javadoc can include them in the API (4997471) $(eval $(call SetupRMICompilation,RMI_SRC,\ CLASSES:=$(JMAN_RMI_CLASSES),\ - CLASSES_DIR:=$(NEWCLASSES_DIR),\ + CLASSES_DIR:=$(CLASSES_DIR),\ STUB_CLASSES_DIR:=$(RMIC_GENSRC_DIR),\ RUN_V12:=true,\ KEEP_GENERATED:=true)) diff --git a/jdk/makefiles/GenerateData.gmk b/jdk/makefiles/GenerateData.gmk index 389bf965489..d2eebf01097 100644 --- a/jdk/makefiles/GenerateData.gmk +++ b/jdk/makefiles/GenerateData.gmk @@ -35,11 +35,43 @@ include Setup.gmk include Tools.gmk # Now include all the rules that generate data resources. -# These are written directly into newclasses dir. +# These are written directly into classes dir. +GENDATA := include GendataBreakIterator.gmk GENDATA += $(BREAK_ITERATOR) +include GendataFontConfig.gmk +GENDATA += $(GENDATA_FONT_CONFIG) + +include GendataTimeZone.gmk +GENDATA += $(GENDATA_TIMEZONE) + +include GendataHtml32dtd.gmk +GENDATA += $(GENDATA_HTML32DTD) + +########################################################################################## + +GENDATA_UNINAME := $(JDK_OUTPUTDIR)/classes/java/lang/uniName.dat + +$(GENDATA_UNINAME): $(JDK_TOPDIR)/make/tools/UnicodeData/UnicodeData.txt $(BUILD_TOOLS) + $(MKDIR) -p $(@D) + $(TOOL_CHARACTERNAME) $< $@ + +GENDATA += $(GENDATA_UNINAME) + +########################################################################################## + +GENDATA_CURDATA := $(JDK_OUTPUTDIR)/lib/currency.data + +$(GENDATA_CURDATA): $(JDK_TOPDIR)/src/share/classes/java/util/CurrencyData.properties $(BUILD_TOOLS) + $(MKDIR) -p $(@D) + $(RM) $@ + $(TOOL_GENERATECURRENCYDATA) -o $@.temp < $< + $(MV) $@.temp $@ + +GENDATA += $(GENDATA_CURDATA) + ########################################################################################## $(GENDATA) : $(BUILD_TOOLS) diff --git a/jdk/makefiles/GenerateJavaSources.gmk b/jdk/makefiles/GenerateJavaSources.gmk index 35c077af8e5..70b464a2730 100644 --- a/jdk/makefiles/GenerateJavaSources.gmk +++ b/jdk/makefiles/GenerateJavaSources.gmk @@ -53,16 +53,57 @@ GENSRC += $(GENSRC_JDWP) include GensrcMisc.gmk GENSRC += $(GENSRC_MISC) +include GensrcCharsetMapping.gmk +GENSRC += $(GENSRC_CHARSETMAPPING) + +include GensrcCharsetCoder.gmk +GENSRC += $(GENSRC_CHARSETCODER) + +include GensrcBuffer.gmk +GENSRC += $(GENSRC_BUFFER) + +include GensrcExceptions.gmk +GENSRC += $(GENSRC_EXCEPTIONS) + +ifneq ($(HOST_OS),windows) +include GensrcIcons.gmk +GENSRC += $(GENSRC_ICONS) + +include GensrcX11Wrappers.gmk +GENSRC += $(GENSRC_X11WRAPPERS) +endif + +include GensrcSwing.gmk +ifndef DISABLE_NIMBUS + GENSRC += $(GENSRC_SWING_NIMBUS) +endif + $(GENSRC) : $(BUILD_TOOLS) -all: $(GENSRC) +# The exception handling of swing beaninfo +# gensrc_swing/javax/swing/beaninfo/* have not be in src.zip +all: $(GENSRC) $(GENSRC_SWING_BEANINFO) $(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc (cd $(JDK_OUTPUTDIR) && \ - chmod -R u+rw gensrc && \ - cp -rp gensrc_characterdata/* gensrc && \ - cp -rp gensrc_properties/* gensrc && \ - cp -rp gensrc_localedatametainfo/* gensrc && \ - cp -rp gensrc_jdwp/* gensrc && \ - cp -rp gensrc_misc/* gensrc) + $(CHMOD) -R u+rw gensrc && \ + $(CP) -rp gensrc_characterdata/* gensrc && \ + $(CP) -rp gensrc_properties/* gensrc && \ + $(CP) -rp gensrc_localedatametainfo/* gensrc && \ + $(CP) -rp gensrc_jdwp/* gensrc && \ + $(CP) -rp gensrc_misc/* gensrc && \ + $(CP) -rp gensrc_charsetmapping/* gensrc && \ + $(CP) -rp gensrc_charsetcoder/* gensrc && \ + $(CP) -rp gensrc_exceptions/* gensrc && \ + $(CP) -rp gensrc_buffer/* gensrc) + if [ -d $(JDK_OUTPUTDIR)/gensrc_swing/javax/swing/plaf ] ; then \ + (cd $(JDK_OUTPUTDIR) && \ + $(MKDIR) -p gensrc/javax/swing/plaf && \ + $(CP) -rp gensrc_swing/javax/swing/plaf/* gensrc/javax/swing/plaf) \ + fi +ifneq ($(HOST_OS),windows) + (cd $(JDK_OUTPUTDIR) && \ + $(CP) -rp gensrc_icons/* gensrc && \ + $(CP) -rp gensrc_x11wrappers/classes/* gensrc) +endif .PHONY: all diff --git a/jdk/makefiles/GensrcBuffer.gmk b/jdk/makefiles/GensrcBuffer.gmk new file mode 100644 index 00000000000..bc9c150da6b --- /dev/null +++ b/jdk/makefiles/GensrcBuffer.gmk @@ -0,0 +1,371 @@ +# +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +GENSRC_BUFFER := + +GENSRC_BUFFER_TMP := $(JDK_OUTPUTDIR)/gensrc_buffer +GENSRC_BUFFER_DST := $(JDK_OUTPUTDIR)/gensrc_buffer/java/nio + +GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio + +### + +$(GENSRC_BUFFER_DST)/_the.dir : + $(ECHO) "Generating buffer classes" + $(MKDIR) -p $(@D) + $(TOUCH) $@ + +define fixRw + $1_RW := $2 + $1_rwkey := rw + ifeq (R,$2) + $1_rwkey := ro + endif +endef + +define typesAndBits + # param 1 target + # param 2 type + # param 3 BO + $1_a := a + $1_A := A + + $1_type := $2 + + ifeq ($2, byte) + $1_x := b + $1_Type := Byte + $1_fulltype := byte + $1_Fulltype := Byte + $1_category := integralType + $1_LBPV := 0 + endif + + ifeq ($2, char) + $1_x := c + $1_Type := Char + $1_fulltype := character + $1_Fulltype := Character + $1_category := integralType + $1_LBPV := 1 + endif + + ifeq ($2, short) + $1_x := s + $1_Type := Short + $1_fulltype := short + $1_Fulltype := Short + $1_category := integralType + $1_LBPV := 1 + endif + + ifeq ($2, int) + $1_a := an + $1_A := An + $1_x := i + $1_Type := Int + $1_fulltype := integer + $1_Fulltype := Integer + $1_category := integralType + $1_LBPV := 2 + endif + + ifeq ($2, long) + $1_x := l + $1_Type := Long + $1_fulltype := long + $1_Fulltype := Long + $1_category := integralType + $1_LBPV := 3 + endif + + ifeq ($2, float) + $1_x := f + $1_Type := Float + $1_fulltype := float + $1_Fulltype := Float + $1_category := floatingPointType + $1_LBPV := 2 + endif + + ifeq ($2, double) + $1_x := d + $1_Type := Double + $1_fulltype := double + $1_Fulltype := Double + $1_category := floatingPointType + $1_LBPV := 3 + endif + + $1_Swaptype := $$($1_Type) + $1_memtype := $2 + $1_Memtype := $$($1_Type) + + ifeq ($2, float) + $1_memtype := int + $1_Memtype := Int + ifneq ($3,U) + $1_Swaptype := Int + $1_fromBits := Float.intBitsToFloat + $1_toBits := Float.floatToRawIntBits + endif + endif + + ifeq ($2, double) + $1_memtype := long + $1_Memtype := Long + ifneq ($3,U) + $1_Swaptype := Long + $1_fromBits := Double.longBitsToDouble + $1_toBits := Double.doubleToRawLongBits + endif + endif + + ifeq ($3, S) + $1_swap := Bits.swap + endif +endef + +define genBinOps + # param 1 target + # param 2 type + # param 3 BO + # param 4 RW + # param 5 nbytes + # param 6 nbytesButOne + $(call typesAndBits,$1,$2,$3) + $(call fixRw,$1,$4) + $1_nbytes := $5 + $1_nbytesButOne := $6 + $1_CMD := $(TOOL_SPP) \ + -Dtype=$$($1_type) \ + -DType=$$($1_Type) \ + -Dfulltype=$$($1_fulltype) \ + -Dmemtype=$$($1_memtype) \ + -DMemtype=$$($1_Memtype) \ + -DfromBits=$$($1_fromBits) \ + -DtoBits=$$($1_toBits) \ + -DLG_BYTES_PER_VALUE=$$($1_LBPV) \ + -DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \ + -Dnbytes=$$($1_nbytes) \ + -DnbytesButOne=$$($1_nbytesButOne) \ + -DRW=$$($1_RW) \ + -K$$($1_rwkey) \ + -Da=$$($1_a) \ + -be +endef + +define SetupGenBuffer + # param 1 is for output file + # param 2 is template dependency + # param 3-9 are named args. + # type := + # BIN := + # RW := Mutability (R)ead-only (W)ritable + # BO := (U)nswapped/(S)wapped/(L)ittle/(B)ig + # + $(if $3,$1_$(strip $3)) + $(if $4,$1_$(strip $4)) + $(if $5,$1_$(strip $5)) + $(if $6,$1_$(strip $6)) + $(if $7,$1_$(strip $7)) + $(if $8,$1_$(strip $8)) + $(if $9,$1_$(strip $9)) + $(if $(10),$1_$(strip $(10))) + $(if $(11),$1_$(strip $(11))) + $(if $(12),$1_$(strip $(12))) + $(if $(13),$1_$(strip $(13))) + $(if $(14),$1_$(strip $(14))) + + $(call fixRw,$1,$$($1_RW)) + $(call typesAndBits,$1,$$($1_type),$$($1_BO)) + + $1_DST := $(GENSRC_BUFFER_DST)/$1.java + $1_SRC := $(GENSRC_BUFFER_SRC)/$(strip $2).java.template + $1_SRC_BIN := $(GENSRC_BUFFER_SRC)/$(strip $2)-bin.java.template + + $1_DEP := $$($1_SRC) + ifneq ($$($1_BIN),1) + $1_DEP := $$($1_SRC) + $1_OUT := $$($1_DST) + else + $1_DEP += $$($1_SRC) $$($1_SRC_BIN) + $1_OUT := $(GENSRC_BUFFER_DST)/$1.binop.0.java + endif + + ifeq ($$($1_BIN),1) + $(call genBinOps,$1_char,char,$$($1_BO),$$($1_RW),two,one) + $(call genBinOps,$1_short,short,$$($1_BO),$$($1_RW),two,one) + $(call genBinOps,$1_int,int,$$($1_BO),$$($1_RW),four,three) + $(call genBinOps,$1_long,long,$$($1_BO),$$($1_RW),eight,seven) + $(call genBinOps,$1_float,float,$$($1_BO),$$($1_RW),four,three) + $(call genBinOps,$1_double,double,$$($1_BO),$$($1_RW),eight,seven) + endif + +$$($1_DST) : $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.dir + $(TOOL_SPP) < $$($1_SRC) > $$($1_OUT).temp \ + -K$$($1_type) \ + -K$$($1_category) \ + -Dtype=$$($1_type) \ + -DType=$$($1_Type) \ + -Dfulltype=$$($1_fulltype) \ + -DFulltype=$$($1_Fulltype) \ + -Dx=$$($1_x) \ + -Dmemtype=$$($1_memtype) \ + -DMemtype=$$($1_Memtype) \ + -DSwaptype=$$($1_Swaptype) \ + -DfromBits=$$($1_fromBits) \ + -DtoBits=$$($1_toBits) \ + -DLG_BYTES_PER_VALUE=$$($1_LBPV) \ + -DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \ + -DBO=$$($1_BO) \ + -Dswap=$$($1_swap) \ + -DRW=$$($1_RW) \ + -K$$($1_rwkey) \ + -Da=$$($1_a) \ + -DA=$$($1_A) \ + -Kbo$$($1_BO) + $(MV) $$($1_OUT).temp $$($1_OUT) +# Do the extra bin thing +ifeq ($$($1_BIN),1) + $(SED) -e '/#BIN/,$$$$d' < $$($1_OUT) > $$($1_DST).temp + $(RM) $$($1_OUT) + $$($1_char_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp + $$($1_short_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp + $$($1_int_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp + $$($1_long_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp + $$($1_float_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp + $$($1_double_CMD) < $$($1_SRC_BIN) >> $$($1_DST).temp + $(PRINTF) "}\n" >> $$($1_DST).temp + mv $$($1_DST).temp $$($1_DST) +endif + +GENSRC_BUFFER += $$($1_DST) + +endef + +### + +X_BUF :=X-Buffer + +$(eval $(call SetupGenBuffer,ByteBuffer, $(X_BUF),type:=byte,BIN:=1)) +$(eval $(call SetupGenBuffer,CharBuffer, $(X_BUF),type:=char)) +$(eval $(call SetupGenBuffer,ShortBuffer, $(X_BUF),type:=short)) +$(eval $(call SetupGenBuffer,IntBuffer, $(X_BUF),type:=int)) +$(eval $(call SetupGenBuffer,LongBuffer, $(X_BUF),type:=long)) +$(eval $(call SetupGenBuffer,FloatBuffer, $(X_BUF),type:=float)) +$(eval $(call SetupGenBuffer,DoubleBuffer,$(X_BUF),type:=double)) + +# Buffers whose contents are heap-allocated +# +HEAP_X_BUF := Heap-X-Buffer + +$(eval $(call SetupGenBuffer,HeapByteBuffer, $(HEAP_X_BUF),type:=byte)) +$(eval $(call SetupGenBuffer,HeapByteBufferR, $(HEAP_X_BUF),type:=byte,RW:=R)) +$(eval $(call SetupGenBuffer,HeapCharBuffer, $(HEAP_X_BUF),type:=char)) +$(eval $(call SetupGenBuffer,HeapCharBufferR, $(HEAP_X_BUF),type:=char,RW:=R)) +$(eval $(call SetupGenBuffer,HeapShortBuffer, $(HEAP_X_BUF),type:=short)) +$(eval $(call SetupGenBuffer,HeapShortBufferR, $(HEAP_X_BUF),type:=short,RW:=R)) +$(eval $(call SetupGenBuffer,HeapIntBuffer, $(HEAP_X_BUF),type:=int)) +$(eval $(call SetupGenBuffer,HeapIntBufferR, $(HEAP_X_BUF),type:=int,RW:=R)) +$(eval $(call SetupGenBuffer,HeapLongBuffer, $(HEAP_X_BUF),type:=long)) +$(eval $(call SetupGenBuffer,HeapLongBufferR, $(HEAP_X_BUF),type:=long,RW:=R)) +$(eval $(call SetupGenBuffer,HeapFloatBuffer, $(HEAP_X_BUF),type:=float)) +$(eval $(call SetupGenBuffer,HeapFloatBufferR, $(HEAP_X_BUF),type:=float,RW:=R)) +$(eval $(call SetupGenBuffer,HeapDoubleBuffer, $(HEAP_X_BUF),type:=double)) +$(eval $(call SetupGenBuffer,HeapDoubleBufferR,$(HEAP_X_BUF),type:=double,RW:=R)) + +# Direct byte buffer +# +DIRECT_X_BUF := Direct-X-Buffer + +$(eval $(call SetupGenBuffer,DirectByteBuffer, $(DIRECT_X_BUF),type:=byte,BIN:=1)) +$(eval $(call SetupGenBuffer,DirectByteBufferR,$(DIRECT_X_BUF),type:=byte,BIN:=1,RW:=R)) + +# Unswapped views of direct byte buffers +# +$(eval $(call SetupGenBuffer,DirectCharBufferU, $(DIRECT_X_BUF),type:=char,BO:=U)) +$(eval $(call SetupGenBuffer,DirectCharBufferRU, $(DIRECT_X_BUF),type:=char,RW:=R,BO:=U)) +$(eval $(call SetupGenBuffer,DirectShortBufferU, $(DIRECT_X_BUF),type:=short,BO:=U)) +$(eval $(call SetupGenBuffer,DirectShortBufferRU, $(DIRECT_X_BUF),type:=short,RW:=R,BO:=U)) +$(eval $(call SetupGenBuffer,DirectIntBufferU, $(DIRECT_X_BUF),type:=int,BO:=U)) +$(eval $(call SetupGenBuffer,DirectIntBufferRU, $(DIRECT_X_BUF),type:=int,RW:=R,BO:=U)) +$(eval $(call SetupGenBuffer,DirectLongBufferU, $(DIRECT_X_BUF),type:=long,BO:=U)) +$(eval $(call SetupGenBuffer,DirectLongBufferRU, $(DIRECT_X_BUF),type:=long,RW:=R,BO:=U)) +$(eval $(call SetupGenBuffer,DirectFloatBufferU, $(DIRECT_X_BUF),type:=float,BO:=U)) +$(eval $(call SetupGenBuffer,DirectFloatBufferRU, $(DIRECT_X_BUF),type:=float,RW:=R,BO:=U)) +$(eval $(call SetupGenBuffer,DirectDoubleBufferU, $(DIRECT_X_BUF),type:=double,BO:=U)) +$(eval $(call SetupGenBuffer,DirectDoubleBufferRU,$(DIRECT_X_BUF),type:=double,RW:=R,BO:=U)) + +# Swapped views of direct byte buffers +# +$(eval $(call SetupGenBuffer,DirectCharBufferS, $(DIRECT_X_BUF),type:=char,BO:=S)) +$(eval $(call SetupGenBuffer,DirectCharBufferRS, $(DIRECT_X_BUF),type:=char,RW:=R,BO:=S)) +$(eval $(call SetupGenBuffer,DirectShortBufferS, $(DIRECT_X_BUF),type:=short,BO:=S)) +$(eval $(call SetupGenBuffer,DirectShortBufferRS, $(DIRECT_X_BUF),type:=short,RW:=R,BO:=S)) +$(eval $(call SetupGenBuffer,DirectIntBufferS, $(DIRECT_X_BUF),type:=int,BO:=S)) +$(eval $(call SetupGenBuffer,DirectIntBufferRS, $(DIRECT_X_BUF),type:=int,RW:=R,BO:=S)) +$(eval $(call SetupGenBuffer,DirectLongBufferS, $(DIRECT_X_BUF),type:=long,BO:=S)) +$(eval $(call SetupGenBuffer,DirectLongBufferRS, $(DIRECT_X_BUF),type:=long,RW:=R,BO:=S)) +$(eval $(call SetupGenBuffer,DirectFloatBufferS, $(DIRECT_X_BUF),type:=float,BO:=S)) +$(eval $(call SetupGenBuffer,DirectFloatBufferRS, $(DIRECT_X_BUF),type:=float,RW:=R,BO:=S)) +$(eval $(call SetupGenBuffer,DirectDoubleBufferS, $(DIRECT_X_BUF),type:=double,BO:=S)) +$(eval $(call SetupGenBuffer,DirectDoubleBufferRS,$(DIRECT_X_BUF),type:=double,RW:=R,BO:=S)) + +# Big-endian views of byte buffers +# +BYTE_X_BUF := ByteBufferAs-X-Buffer + +$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferB, $(BYTE_X_BUF),type:=char,BO:=B)) +$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRB, $(BYTE_X_BUF),type:=char,RW:=R,BO:=B)) +$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferB, $(BYTE_X_BUF),type:=short,BO:=B)) +$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRB, $(BYTE_X_BUF),type:=short,RW:=R,BO:=B)) +$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferB, $(BYTE_X_BUF),type:=int,BO:=B)) +$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRB, $(BYTE_X_BUF),type:=int,RW:=R,BO:=B)) +$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferB, $(BYTE_X_BUF),type:=long,BO:=B)) +$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRB, $(BYTE_X_BUF),type:=long,RW:=R,BO:=B)) +$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferB, $(BYTE_X_BUF),type:=float,BO:=B)) +$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRB, $(BYTE_X_BUF),type:=float,RW:=R,BO:=B)) +$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferB, $(BYTE_X_BUF),type:=double,BO:=B)) +$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRB,$(BYTE_X_BUF),type:=double,RW:=R,BO:=B)) + +# Little-endian views of byte buffers +# +$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferL, $(BYTE_X_BUF),type:=char,BO:=L)) +$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRL, $(BYTE_X_BUF),type:=char,RW:=R,BO:=L)) +$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferL, $(BYTE_X_BUF),type:=short,BO:=L)) +$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRL, $(BYTE_X_BUF),type:=short,RW:=R,BO:=L)) +$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferL, $(BYTE_X_BUF),type:=int,BO:=L)) +$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRL, $(BYTE_X_BUF),type:=int,RW:=R,BO:=L)) +$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferL, $(BYTE_X_BUF),type:=long,BO:=L)) +$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRL, $(BYTE_X_BUF),type:=long,RW:=R,BO:=L)) +$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferL, $(BYTE_X_BUF),type:=float,BO:=L)) +$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRL, $(BYTE_X_BUF),type:=float,RW:=R,BO:=L)) +$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferL, $(BYTE_X_BUF),type:=double,BO:=L)) +$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRL,$(BYTE_X_BUF),type:=double,RW:=R,BO:=L)) + +### + +$(GENSRC_BUFFER) : $(BUILD_TOOLS) diff --git a/jdk/makefiles/GensrcCharacterData.gmk b/jdk/makefiles/GensrcCharacterData.gmk index 5321305f7ea..630b547e2b1 100644 --- a/jdk/makefiles/GensrcCharacterData.gmk +++ b/jdk/makefiles/GensrcCharacterData.gmk @@ -34,8 +34,8 @@ UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData define SetupCharacterData $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/$1.java : $(CHARACTERDATA)/$1.java.template $(BUILD_TOOLS) - mkdir -p $$(@D) - echo Generating $1.java + $(MKDIR) -p $$(@D) + $(ECHO) Generating $1.java $(TOOL_GENERATECHARACTER) $2 \ -template $(CHARACTERDATA)/$1.java.template \ -spec $(UNICODEDATA)/UnicodeData.txt \ @@ -56,7 +56,7 @@ $(eval $(call SetupCharacterData,CharacterData0E,-plane 14,11 4 1)) # Copy two Java files that need no preprocessing. $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/%.java : $(CHARACTERDATA)/%.java.template $(MKDIR) -p $(@D) - echo Generating $(@F) + $(ECHO) Generating $(@F) $(CP) -f $< $@ GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc_characterdata/java/lang/CharacterDataUndefined.java \ diff --git a/jdk/makefiles/GensrcCharsetCoder.gmk b/jdk/makefiles/GensrcCharsetCoder.gmk new file mode 100644 index 00000000000..40b953eed9c --- /dev/null +++ b/jdk/makefiles/GensrcCharsetCoder.gmk @@ -0,0 +1,107 @@ +# +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +GENSRC_CHARSETCODER := + +GENSRC_CHARSETCODER_TMP := $(JDK_OUTPUTDIR)/gensrc_charsetcoder +GENSRC_CHARSETCODER_DST := $(JDK_OUTPUTDIR)/gensrc_charsetcoder/java/nio/charset + +GENSRC_CHARSETCODER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio + +GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Coder.java.template + +### + +$(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java : $(GENSRC_CHARSETCODER_TEMPLATE) + $(MKDIR) -p $(@D) + -$(RM) $@.temp + $(TOOL_SPP) < $< >$@.temp \ + -Kdecoder \ + -DA='A' \ + -Da='a' \ + -DCode='Decode' \ + -Dcode='decode' \ + -DitypesPhrase='bytes in a specific charset' \ + -DotypesPhrase='sixteen-bit Unicode characters' \ + -Ditype='byte' \ + -Dotype='character' \ + -DItype='Byte' \ + -DOtype='Char' \ + -Dcoder='decoder' \ + -DCoder='Decoder' \ + -Dcoding='decoding' \ + -DOtherCoder='Encoder' \ + -DreplTypeName='string' \ + -DdefaultRepl='"\\uFFFD"' \ + -DdefaultReplName='"\\uFFFD"<\/tt>' \ + -DreplType='String' \ + -DreplFQType='java.lang.String' \ + -DreplLength='length()' \ + -DItypesPerOtype='CharsPerByte' \ + -DnotLegal='not legal for this charset' \ + -Dotypes-per-itype='chars-per-byte' \ + -DoutSequence='Unicode character' + $(MV) $@.temp $@ + +GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java + +### + +$(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java : $(GENSRC_CHARSETCODER_TEMPLATE) + $(MKDIR) -p $(@D) + -$(RM) $@.temp + $(TOOL_SPP) < $< >$@.temp \ + -Kencoder \ + -DA='An' \ + -Da='an' \ + -DCode='Encode' \ + -Dcode='encode' \ + -DitypesPhrase='sixteen-bit Unicode characters' \ + -DotypesPhrase='bytes in a specific charset' \ + -Ditype='character' \ + -Dotype='byte' \ + -DItype='Char' \ + -DOtype='Byte' \ + -Dcoder='encoder' \ + -DCoder='Encoder' \ + -Dcoding='encoding' \ + -DOtherCoder='Decoder' \ + -DreplTypeName='byte array' \ + -DdefaultRepl='new byte[] { (byte)'"'"\\?"'"' }' \ + -DdefaultReplName='{<\/tt>\ (byte)'"'"\\?"'"'<\/tt>\ }<\/tt>' \ + -DreplType='byte[]' \ + -DreplFQType='byte[]' \ + -DreplLength='length' \ + -DItypesPerOtype='BytesPerChar' \ + -DnotLegal='not a legal sixteen-bit Unicode sequence' \ + -Dotypes-per-itype='bytes-per-char' \ + -DoutSequence='byte sequence in the given charset' + $(MV) $@.temp $@ + +GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java + +### + +$(GENSRC_CHARSETCODER) : $(BUILD_TOOLS) diff --git a/jdk/makefiles/GensrcCharsetMapping.gmk b/jdk/makefiles/GensrcCharsetMapping.gmk new file mode 100644 index 00000000000..6ff21ad624e --- /dev/null +++ b/jdk/makefiles/GensrcCharsetMapping.gmk @@ -0,0 +1,105 @@ +# +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +GENSRC_CHARSETMAPPING:= + +GENSRC_TMP := $(JDK_OUTPUTDIR)/gensrc_charsetmapping +GENSRC_DST := $(JDK_OUTPUTDIR)/gensrc_charsetmapping/sun/nio/cs + +GENSRC_SRC := $(JDK_TOPDIR)/make/tools/CharsetMapping +GENSRC_JAVA_SRC := $(JDK_TOPDIR)/make/tools/src/build/tools/charsetmapping + +GENSRC_TEMPLATES := $(GENSRC_SRC)/SingleByte-X.java.template $(GENSRC_SRC)/DoubleByte-X.java.template + +### + +$(GENSRC_TMP)/_the.dir : + $(ECHO) Generating charsetmapping classes + $(MKDIR) -p $(GENSRC_DST)/ext + $(TOUCH) $@ + +### + +GENSRC_SB := $(GENSRC_TMP)/gensrc_the.charsetmapping.sbcs + +$(GENSRC_SB) : $(GENSRC_SRC)/sbcs $(GENSRC_TEMPLATES) $(GENSRC_TMP)/_the.dir + $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(GENSRC_DST) sbcs + $(TOUCH) $@ + +GENSRC_CHARSETMAPPING += $(GENSRC_SB) + +### + +$(GENSRC_DST)/ext/sjis0213.dat : $(GENSRC_SRC)/sjis0213.map $(GENSRC_SB) + $(TOOL_CHARSETMAPPING) $< $@ sjis0213 + +GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/sjis0213.dat + +### + +$(GENSRC_DST)/ext/EUC_TWMapping.java : $(GENSRC_JAVA_SRC)/EUC_TW.java $(GENSRC_SB) + $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(GENSRC_DST)/ext euctw $(GENSRC_JAVA_SRC)/EUC_TW.java + +GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/EUC_TWMapping.java + +### + +$(GENSRC_DST)/ext/HKSCSMapping.java : $(GENSRC_JAVA_SRC)/HKSCS.java $(GENSRC_SB) + $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(GENSRC_DST)/ext hkscs $(GENSRC_JAVA_SRC)/HKSCS.java + +GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/HKSCSMapping.java + +### + +$(GENSRC_TMP)/gensrc_the.charsetmapping.extsbcs : $(GENSRC_SRC)/extsbcs $(GENSRC_TEMPLATES) $(GENSRC_SB) + $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(GENSRC_DST)/ext extsbcs + $(TOUCH) $@ + +GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.extsbcs + +### + +$(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs : $(GENSRC_SRC)/dbcs $(GENSRC_TEMPLATES) $(GENSRC_SB) + $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(GENSRC_DST)/ext dbcs + $(TOUCH) $@ + +GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs + +### + +GENSRC_CHARSET_PROVIDER_CMD := $(JDK_TOPDIR)/makefiles/scripts/genCharsetProvider.sh + +$(GENSRC_DST)/StandardCharsets.java : $(JDK_TOPDIR)/src/share/classes/sun/nio/cs/standard-charsets \ + $(GENSRC_CHARSET_PROVIDER_CMD) \ + $(GENSRC_TMP)/_the.dir + + NAWK="$(NAWK)" TEMPDIR="$(GENSRC_TMP)" SH="$(SH)" \ + HASHER="$(TOOL_HASHER)" \ + SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" \ + $(SH) -e $(GENSRC_CHARSET_PROVIDER_CMD) $< $(@D) + +GENSRC_CHARSETMAPPING += $(GENSRC_DST)/StandardCharsets.java + +$(GENSRC_CHARSETMAPPING) : $(BUILD_TOOLS) diff --git a/jdk/makefiles/java/java_crw_demo/Makefile b/jdk/makefiles/GensrcExceptions.gmk similarity index 52% rename from jdk/makefiles/java/java_crw_demo/Makefile rename to jdk/makefiles/GensrcExceptions.gmk index ebcadd74656..1a1f71769da 100644 --- a/jdk/makefiles/java/java_crw_demo/Makefile +++ b/jdk/makefiles/GensrcExceptions.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -23,41 +23,33 @@ # questions. # -BUILDDIR = ../.. +GENSRC_EXCEPTIONS := -LIBRARY = java_crw_demo -PRODUCT = sun -LIBRARY_OUTPUT = java_crw_demo +GENSRC_EXCEPTIONS_TMP := $(JDK_OUTPUTDIR)/gensrc_exceptions +GENSRC_EXCEPTIONS_DST := $(JDK_OUTPUTDIR)/gensrc_exceptions/java/nio -# Configure the CFLAGS for this library. +GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio +GENSRC_EXCEPTIONS_CMD := $(JDK_TOPDIR)/makefiles/scripts/genExceptions.sh -include $(BUILDDIR)/common/Defs.gmk +GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels -SRCDIR=$(SHARE_SRC)/demo/jvmti/java_crw_demo +### -# Use the mapfile-vers (See the mapfile located with this Makefile) -FILES_m = mapfile-vers -ifdef FILES_m -include $(BUILDDIR)/common/Mapfile-vers.gmk -endif +$(GENSRC_EXCEPTIONS_DST)/_the.dir : + $(ECHO) "Generating exceptions classes" + $(MKDIR) -p $(@D) + $(TOUCH) $@ -# -# Files to compile. -# -FILES_c = java_crw_demo.c -OTHER_INCLUDES = -I$(SRCDIR) +### -# -# Library to compile. -# -include $(BUILDDIR)/common/Library.gmk +$(GENSRC_EXCEPTIONS_DST)/_the.% : $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \ + $(GENSRC_EXCEPTIONS_CMD) \ + $(GENSRC_EXCEPTIONS_DST)/_the.dir + $(MKDIR) -p $(@D)/$* + SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$* + $(TOUCH) $@ -# We don't want to link against -ljava -JAVALIB= - -# -# Add to ambient vpath so we pick up the library files -# -vpath %.c $(SRCDIR) +GENSRC_EXCEPTIONS += $(foreach D,$(GENSRC_EXCEPTIONS_SRC_DIRS),$(GENSRC_EXCEPTIONS_DST)/_the.$(D)) +$(GENSRC_EXCEPTIONS) : $(BUILD_TOOLS) diff --git a/jdk/makefiles/GensrcIcons.gmk b/jdk/makefiles/GensrcIcons.gmk new file mode 100644 index 00000000000..3e9f07437ba --- /dev/null +++ b/jdk/makefiles/GensrcIcons.gmk @@ -0,0 +1,112 @@ +# +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +GENSRC_ICONS := +GENSRC_ICONS_SRC := +GENSRC_ICONS_TMP := $(JDK_OUTPUTDIR)/gensrc_icons +GENSRC_ICONS_DST := $(GENSRC_ICONS_TMP)/sun/awt/X11 + +ifdef OPENJDK + ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API) +else + ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/solaris +endif + +GENSRC_ICONS_SRC += \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \ + $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png + + +ICONPATH := $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes/sun/awt/X11 + +GENSRC_ICONS_SRC += \ + $(ICONPATH)/security-icon-bw16.png \ + $(ICONPATH)/security-icon-interim16.png \ + $(ICONPATH)/security-icon-yellow16.png \ + $(ICONPATH)/security-icon-bw24.png \ + $(ICONPATH)/security-icon-interim24.png \ + $(ICONPATH)/security-icon-yellow24.png \ + $(ICONPATH)/security-icon-bw32.png \ + $(ICONPATH)/security-icon-interim32.png \ + $(ICONPATH)/security-icon-yellow32.png \ + $(ICONPATH)/security-icon-bw48.png \ + $(ICONPATH)/security-icon-interim48.png \ + $(ICONPATH)/security-icon-yellow48.png + +GENSRC_ICONS_FILES := $(notdir $(GENSRC_ICONS_SRC)) + +GENSRC_ICONS_SHORT_NAME = $(subst .,_,$(subst -,_,$(1))) +GENSRC_ICONS_DST_NAME = XAWTIcon$(2)_$(subst .,_,$(subst -,_,$(1))) + +### + +$(GENSRC_ICONS_TMP)/_the.dir : + $(ECHO) Generating icon classes + $(MKDIR) -p $(GENSRC_ICONS_DST) + $(TOUCH) $@ + +### + +define SetupGensrcIcon + # param 1 is for src-file + # param 2 is for src-dir + $1_SHORTNAME := $(call GENSRC_ICONS_SHORT_NAME,$1) + $1_NAME32 := $(call GENSRC_ICONS_DST_NAME,$1,32) + $1_TARGET32 := $(GENSRC_ICONS_DST)/$$($1_NAME32).java + $1_NAME64 := $(call GENSRC_ICONS_DST_NAME,$1,64) + $1_TARGET64 := $(GENSRC_ICONS_DST)/$$($1_NAME64).java + +$$($1_TARGET32) : $2/$1 $(GENSRC_ICONS_TMP)/_the.dir + $(RM) $$@ $$@.tmp + $(ECHO) "package sun.awt.X11;" > $$@.tmp + $(ECHO) "public class $$($1_NAME32) {" >> $$@.tmp + $(ECHO) "public static int[] $$($1_SHORTNAME) = { " >> $$@.tmp +# TODO FIX FIX FIX +ifneq ($(PLATFORM),macosx) + $(CAT) $$< | $(TOOL_TOBIN) >> $$@.tmp +endif + $(ECHO) "}; }" >> $$@.tmp + $(MV) $$@.tmp $$@ + +GENSRC_ICONS += $$($1_TARGET32) + +$$($1_TARGET64) : $2/$1 $(GENSRC_ICONS_TMP)/_the.dir + $(RM) $$@ $$@.tmp + $(ECHO) "package sun.awt.X11;" > $$@.tmp + $(ECHO) "public class $$($1_NAME64) {" >> $$@.tmp + $(ECHO) "public static long[] $$($1_SHORTNAME) = { " >> $$@.tmp +# TODO FIX FIX FIX +ifneq ($(PLATFORM),macosx) + $(CAT) $$< | $(TOOL_TOBIN) >> $$@.tmp +endif + $(ECHO) "}; }" >> $$@.tmp + $(MV) $$@.tmp $$@ + +GENSRC_ICONS += $$($1_TARGET64) +endef + +$(foreach I,$(GENSRC_ICONS_SRC), $(eval $(call SetupGensrcIcon,$(notdir $(I)),$(dir $(I))))) diff --git a/jdk/makefiles/GensrcJDWP.gmk b/jdk/makefiles/GensrcJDWP.gmk index 7a0a06716bc..e469ab977cd 100644 --- a/jdk/makefiles/GensrcJDWP.gmk +++ b/jdk/makefiles/GensrcJDWP.gmk @@ -29,8 +29,8 @@ $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h : $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec $(JDK_OUTPUTDIR)/gensrc_jdwp/com/sun/tools/jdi/JDWP.java : $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec - mkdir -p $(@D) - mkdir -p $(JDK_OUTPUTDIR)/gensrc_jdwp_headers + $(MKDIR) -p $(@D) + $(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_jdwp_headers $(ECHO) Creating JDWP.java and JDWPCommands.h from jdwp.spec $(TOOL_JDWPGEN) $< -jdi $@ -include $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h diff --git a/jdk/makefiles/GensrcLocaleDataMetaInfo.gmk b/jdk/makefiles/GensrcLocaleDataMetaInfo.gmk index 1e3c19201fe..7e9229d84f1 100644 --- a/jdk/makefiles/GensrcLocaleDataMetaInfo.gmk +++ b/jdk/makefiles/GensrcLocaleDataMetaInfo.gmk @@ -84,10 +84,26 @@ $(eval SED_ARGS+=-e $(call CAPTURE_LOCALE,CalendarData,Non,filter)) $(JDK_OUTPUTDIR)/gensrc_localedatametainfo/sun/util/LocaleDataMetaInfo.java: \ $(JDK_TOPDIR)/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template - mkdir -p $(@D) + $(MKDIR) -p $(@D) $(ECHO) Creating sun/util/LocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources. $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" > $(JDK_OUTPUTDIR)/gensrc_localedatametainfo/_the.locale_resources $(SED) $(SED_ARGS) $(JDK_TOPDIR)/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template \ > $(JDK_OUTPUTDIR)/gensrc_localedatametainfo/sun/util/LocaleDataMetaInfo.java GENSRC_LOCALEDATAMETAINFO:=$(JDK_OUTPUTDIR)/gensrc_localedatametainfo/sun/util/LocaleDataMetaInfo.java + +### + +GENSRC_CRBC_DST := $(JDK_OUTPUTDIR)/gensrc_localedatametainfo/sun/util/CoreResourceBundleControl.java +GENSRC_CRBC_CMD := $(JDK_TOPDIR)/makefiles/scripts/localelist.sh + +JRE_NONEXIST_LOCALES := en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh + +$(GENSRC_CRBC_DST) : $(JDK_TOPDIR)/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template \ + $(GENSRC_CRBC_CMD) + $(MKDIR) -p $(@D) + NAWK="$(NAWK)" SED="$(SED)" $(SH) $(GENSRC_CRBC_CMD) "$(JRE_NONEXIST_LOCALES)" $< $@ + +GENSRC_LOCALEDATAMETAINFO += $(GENSRC_CRBC_DST) + +### diff --git a/jdk/makefiles/GensrcMisc.gmk b/jdk/makefiles/GensrcMisc.gmk index e7d1ba657e5..d2acd806e5c 100644 --- a/jdk/makefiles/GensrcMisc.gmk +++ b/jdk/makefiles/GensrcMisc.gmk @@ -31,7 +31,7 @@ $(JDK_OUTPUTDIR)/gensrc_misc/sun/misc/Version.java: \ $(JDK_TOPDIR)/src/share/classes/sun/misc/Version.java.template $(MKDIR) -p $(@D) - echo Generating sun/misc/Version.java + $(ECHO) Generating sun/misc/Version.java $(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \ -e 's/@@java_version@@/$(RELEASE)/g' \ -e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \ @@ -46,7 +46,7 @@ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/misc/Version.java $(JDK_OUTPUTDIR)/gensrc_misc/sun/tools/jconsole/Version.java: \ $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/Version.java.template $(MKDIR) -p $(@D) - echo Generating sun/tools/jconsole/Version.java + $(ECHO) Generating sun/tools/jconsole/Version.java $(SED) -e 's/@@jconsole_version@@/$(FULL_VERSION)/g' $< > $@ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/tools/jconsole/Version.java @@ -64,7 +64,7 @@ ifeq ($(HOST_OS_API),posix) $(JDK_OUTPUTDIR)/gensrc_misc/java/lang/UNIXProcess.java : \ $(JDK_TOPDIR)/src/solaris/classes/java/lang/UNIXProcess.java.$(UPSUFFIX) $(MKDIR) -p $(@D) - echo Copying UNIXProcess.java.$(PLATFORM) to java/lang/UNIXProcess.java + $(ECHO) Copying UNIXProcess.java.$(PLATFORM) to java/lang/UNIXProcess.java $(CP) $< $@ $(CHMOD) u+rw $@ @@ -72,3 +72,114 @@ ifeq ($(HOST_OS_API),posix) endif ########################################################################################## + +ifndef OPENJDK +ifneq ($(PLATFORM), windows) +ifneq ($(PLATFORM), macosx) + # These file(s) are needed for building fake .so libs on !windows for jdbcodbc + + $(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc/dummyodbc1.c : + $(MKDIR) -p $(@D) + $(ECHO) Creating $@ + $(PRINTF) "void dummyOdbc(void){}\n" > $@ + $(ECHO) Created $@ + + $(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc/dummyodbc2.c : + $(MKDIR) -p $(@D) + $(ECHO) Creating $@ + $(PRINTF) "void dummyOdbc(void){}\n" > $@ + $(ECHO) Created $@ + + GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc/dummyodbc1.c $(JDK_OUTPUTDIR)/gensrc_c/libjdbcodbc/dummyodbc2.c +endif +endif +endif + +########################################################################################## + +GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/ch/SocketOptionRegistry.java + +GENSRC_SOR_SRC := $(JDK_TOPDIR)/src/share/native/sun/nio/ch +GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c +GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/objs/gensrc/genSocketOptionRegistry +GENSRC_SOR_EXE := $(GENSRC_SOR_BIN)/genSocketOptionRegistry$(EXE_SUFFIX) + +SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOR_SRC)/$(GENSRC_SOR_SRC_FILE) | \ + $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') + +$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/ch/SocketOptionRegistry.java : $(GENSRC_SOR_EXE) + $(MKDIR) -p $(@D) + NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp + $(GENSRC_SOR_EXE) >> $@.tmp + $(MV) $@.tmp $@ + + +$(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE,\ + SRC:=$(GENSRC_SOR_SRC),\ + INCLUDE_FILES:=$(GENSRC_SOR_SRC_FILE),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB),\ + BIN:=$(GENSRC_SOR_BIN),\ + EXE:=$(GENSRC_SOR_EXE))) + +########################################################################################## + +ifneq ($(PLATFORM),windows) + +GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/UnixConstants.java + +GENSRC_UC_SRC := $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/nio/fs +GENSRC_UC_SRC_FILE := genUnixConstants.c +GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/objs/gensrc/genUnixConstants +GENSRC_UC_EXE := $(GENSRC_UC_BIN)/genUnixConstants$(EXE_SUFFIX) + +UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \ + $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') + +$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/UnixConstants.java : $(GENSRC_UC_EXE) + $(MKDIR) -p $(@D) + NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp + $(GENSRC_UC_EXE) >> $@.tmp + $(MV) $@.tmp $@ + + +$(eval $(call SetupNativeCompilation,BUILD_GENSRC_UC_EXE,\ + SRC:=$(GENSRC_UC_SRC),\ + INCLUDE_FILES:=$(GENSRC_UC_SRC_FILE),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB),\ + BIN:=$(GENSRC_UC_BIN),\ + EXE:=$(GENSRC_UC_EXE))) + +endif + +########################################################################################## + +ifeq ($(PLATFORM),solaris) + +GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/SolarisConstants.java + +GENSRC_SOL_SRC := $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/native/sun/nio/fs +GENSRC_SOL_SRC_FILE := genSolarisConstants.c +GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/objs/gensrc/genSolarisConstants +GENSRC_SOL_EXE := $(GENSRC_SOL_BIN)/genSolarisConstants$(EXE_SUFFIX) + +SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \ + $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') + +$(JDK_OUTPUTDIR)/gensrc_misc/sun/nio/fs/SolarisConstants.java : $(GENSRC_SOL_EXE) + $(MKDIR) -p $(@D) + NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp + $(GENSRC_SOL_EXE) >> $@.tmp + $(MV) $@.tmp $@ + + +$(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOL_EXE,\ + SRC:=$(GENSRC_SOL_SRC),\ + INCLUDE_FILES:=$(GENSRC_SOL_SRC_FILE),\ + LANG:=C,\ + CFLAGS:=$(CFLAGS_JDKLIB),\ + BIN:=$(GENSRC_SOL_BIN),\ + EXE:=$(GENSRC_SOL_EXE))) + +endif diff --git a/jdk/makefiles/GensrcProperties.gmk b/jdk/makefiles/GensrcProperties.gmk index 3226f33dd01..4d663534b5a 100644 --- a/jdk/makefiles/GensrcProperties.gmk +++ b/jdk/makefiles/GensrcProperties.gmk @@ -85,7 +85,7 @@ define add_properties_to_clean ALL_CLEANED_PROPSOURCES+=$2 # Generate the list of to be created java files. - $1_PROPOUTPUT:=$$(patsubst %,$(JDK_OUTPUTDIR)/newclasses/%.properties,$$($1_PROPPATHS)) + $1_PROPOUTPUT:=$$(patsubst %,$(JDK_OUTPUTDIR)/classes/%.properties,$$($1_PROPPATHS)) # If the properties target file isn't in a "resources" dir, add one. ifneq ($5,) $1_PROPOUTPUT:=$$(foreach p,$$($1_PROPOUTPUT), $$(dir $$p)$5/$$(notdir $$p)) @@ -121,9 +121,32 @@ $(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY_HK,\ $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources -name "*.properties"),\ ListResourceBundle,%zh_TW,%zh_HK)) #com/sun/imageio/plugins/common +$(eval $(call add_properties_to_clean,COM_SUN_IMAGEIO,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/imageio -name "*.properties"))) #com/sun/java/swing/plaf/gtk/resources +ifneq ($(PLATFORM), windows) +# Only compile GTK resource bundles on Solaris/Linux +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources -name "*.properties"),\ + ListResourceBundle)) +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK_HK,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources -name "*.properties"),\ + ListResourceBundle,%zh_TW,%zh_HK)) +endif #com/sun/java/swing/plaf/motif/resources +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources -name "*.properties"),\ + ListResourceBundle)) +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF_HK,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources -name "*.properties"),\ + ListResourceBundle,%zh_TW,%zh_HK)) #com/sun/java/swing/plaf/windows/resources +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources -name "*.properties"),\ + ListResourceBundle)) +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS_HK,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources -name "*.properties"),\ + ListResourceBundle,%zh_TW,%zh_HK)) #com/sun/java/util/jar/pack $(eval $(call add_properties_to_clean,JNDI_COSNAMING,\ $(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties)) @@ -149,8 +172,26 @@ $(eval $(call add_properties_to_clean,COM_SUN_ROWSET_HK,\ #com/sun/servicetag/resources #com/sun/swing/internal/plaf/basic/resources +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources -name "*.properties"),\ + ListResourceBundle)) +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC_HK,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources -name "*.properties"),\ + ListResourceBundle,%zh_TW,%zh_HK)) #com/sun/swing/internal/plaf/metal/resources +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources -name "*.properties"),\ + ListResourceBundle)) +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL_HK,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources -name "*.properties"),\ + ListResourceBundle,%zh_TW,%zh_HK)) #com/sun/swing/internal/plaf/synth/resources +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources -name "*.properties"),\ + ListResourceBundle)) +$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH_HK,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources -name "*.properties"),\ + ListResourceBundle,%zh_TW,%zh_HK)) #com/sun/tools/jdi/resources $(eval $(call add_properties_to_compile,COM_SUN_TOOLS_JDI,\ @@ -160,6 +201,8 @@ $(eval $(call add_properties_to_compile,COM_SUN_TOOLS_JDI,\ #com/sun/tools/script/shell #java/util #javax/sql/rowset +$(eval $(call add_properties_to_clean,JAVAX_SQL_ROWSET,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/javax/sql/rowset -name "*.properties"))) #sun/awt/resources $(eval $(call add_properties_to_compile,SUN_AWT,\ $(shell find $(JDK_TOPDIR)/src/share/classes/sun/awt/resources -name "*.properties"),\ @@ -175,6 +218,12 @@ $(eval $(call add_properties_to_compile,SUN_LAUNCHER_HK,\ $(shell find $(JDK_TOPDIR)/src/share/classes/sun/launcher/resources -name "*.properties"),\ ListResourceBundle,%zh_TW,%zh_HK)) #sun/management/resources +$(eval $(call add_properties_to_compile,SUN_MANAGEMENT,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/sun/management/resources -name "*.properties"),\ + ListResourceBundle)) +$(eval $(call add_properties_to_compile,SUN_MANAGEMENT_KH,\ + $(shell find $(JDK_TOPDIR)/src/share/classes/sun/management/resources -name "*.properties"),\ + ListResourceBundle,%zh_TW,%zh_HK)) #sun/print #sun/print/resources $(eval $(call add_properties_to_compile,SUN_PRINT,\ @@ -231,31 +280,30 @@ $(eval $(call add_properties_to_compile,SUN_UTIL,\ $(shell find $(JDK_TOPDIR)/src/share/classes/sun/util/resources -name "*.properties"),\ LocaleNamesBundle)) - # Now setup the rule for the generation of the resource bundles. $(JDK_OUTPUTDIR)/gensrc_properties/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $(BUILD_TOOLS) $(RM) -rf $(JDK_OUTPUTDIR)/gensrc_properties/* # Generate all output directories in advance since the build tool does not do that... $(MKDIR) -p $(sort $(dir $(ALL_COMPILED_PROPJAVAS))) - echo Compiling $(words $(ALL_COMPILED_PROPSOURCES)) properties into resource bundles + $(ECHO) Compiling $(words $(ALL_COMPILED_PROPSOURCES)) properties into resource bundles $(call ListPathsSafely,COMPILE_PROPCMDLINE,\n, >> $(JDK_OUTPUTDIR)/gensrc_properties/_the.cmdline) $(TOOL_COMPILEPROPERTIES) -quiet @$(JDK_OUTPUTDIR)/gensrc_properties/_the.cmdline - touch $@ + $(TOUCH) $@ # Now setup the rule for the generation of the cleaned properties. # FIXME: We currently don't handle removed properties incrementally. -$(JDK_OUTPUTDIR)/newclasses/_the.cleaned_properties : $(ALL_CLEANED_PROPSOURCES) $(BUILD_TOOLS) - $(RM) -f $(JDK_OUTPUTDIR)/newclasses/_the.cleaned_properties.cmdline +$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties : $(ALL_CLEANED_PROPSOURCES) $(BUILD_TOOLS) + $(RM) -f $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline # Generate all output directories in advance since the build tool does not do that... $(MKDIR) -p $(sort $(dir $(ALL_CLEANED_PROPOUTPUT))) - echo Copying and cleaning $(words $(ALL_CLEANED_PROPSOURCES)) properties - $(call ListPathsSafely,CLEAN_PROPCMDLINE,\n, >> $(JDK_OUTPUTDIR)/newclasses/_the.cleaned_properties.cmdline) - $(TOOL_STRIPPROPERTIES) @$(JDK_OUTPUTDIR)/newclasses/_the.cleaned_properties.cmdline - touch $@ + $(ECHO) Copying and cleaning $(words $(ALL_CLEANED_PROPSOURCES)) properties + $(call ListPathsSafely,CLEAN_PROPCMDLINE,\n, >> $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline) + $(TOOL_STRIPPROPERTIES) @$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline + $(TOUCH) $@ $(ALL_COMPILED_PROPJAVAS) : $(JDK_OUTPUTDIR)/gensrc_properties/_the.compiled_properties -$(ALL_CLEANED_PROPOUTPUT) : $(JDK_OUTPUTDIR)/newclasses/_the.cleaned_properties +$(ALL_CLEANED_PROPOUTPUT) : $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties # Some zh_HK resources are just copied of zh_TW @@ -265,7 +313,9 @@ $(JDK_OUTPUTDIR)/gensrc_properties/%_zh_HK.java: $(JDK_TOPDIR)/src/share/classes ZH_HK_JAVA:= sun/applet/resources/MsgAppletViewer_zh_HK.java \ sun/misc/resources/Messages_zh_HK.java \ - sun/security/util/AuthResources_zh_HK.java + sun/security/util/AuthResources_zh_HK.java \ + sun/security/util/Resources_zh_HK.java + ZH_HK_JAVA_FILES:=$(addprefix $(JDK_OUTPUTDIR)/gensrc_properties/,$(ZH_HK_JAVA)) diff --git a/jdk/makefiles/GensrcSwing.gmk b/jdk/makefiles/GensrcSwing.gmk new file mode 100644 index 00000000000..3c0043e695d --- /dev/null +++ b/jdk/makefiles/GensrcSwing.gmk @@ -0,0 +1,91 @@ +# +# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# +# Generate java files for javax.swing.plaf package +# +NIMBUS_PACKAGE = javax.swing.plaf +NIMBUS_GENSRC_DIR = $(JDK_OUTPUTDIR)/gensrc_swing/javax/swing/plaf/nimbus +NIMBUS_SKIN_FILE = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/skin.laf + +$(JDK_OUTPUTDIR)/gensrc_swing/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS) + $(MKDIR) -p $(@D) + $(ECHO) "Generating Nimbus source files:" + $(TOOL_GENERATENIMBUS) \ + -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(JDK_OUTPUTDIR)/gensrc_swing \ + -packagePrefix $(NIMBUS_PACKAGE).nimbus -lafName Nimbus + $(ECHO) "Finished generating Nimbus source files" + $(TOUCH) $@ + +GENSRC_SWING_NIMBUS := $(JDK_OUTPUTDIR)/gensrc_swing/_the.generated_nimbus + +# +# Generate beaninfo java files +# + +BEAN_GENSRC_DIR = $(JDK_OUTPUTDIR)/gensrc_swing/javax/swing/beaninfo +DOCLETSRC_DIR = $(JDK_TOPDIR)/make/tools/swing-beans + +# javax.swing package +BEANS = AbstractButton Box JComponent JApplet JButton \ + JCheckBox JCheckBoxMenuItem JComboBox JColorChooser \ + JDesktopPane JDialog JEditorPane JFileChooser JFrame \ + JFormattedTextField JInternalFrame JLabel JLayeredPane \ + JList JMenu JMenuBar JMenuItem JOptionPane JPanel \ + JPasswordField JPopupMenu JProgressBar JRadioButton \ + JRadioButtonMenuItem JScrollBar JScrollPane JSeparator \ + JSlider JSplitPane JSpinner JTabbedPane JTable \ + JTextArea JTextField JTextPane JToggleButton JToolBar \ + JTree JWindow + +# javax.swing.text package +BEANS_TEXT = JTextComponent + +BEANS_SRC = $(BEANS:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/%.java) \ + $(BEANS_TEXT:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/text/%.java) + +# Dummy variable so far, in the old build system it was false by default +SWINGBEAN_DEBUG_FLAG = false +# GenDocletBeanInfo is compiled in Tools.gmk and picks up from $(JDK_OUTPUTDIR)/btclasses +$(JDK_OUTPUTDIR)/gensrc_swing/_the.generated_beaninfo: $(BEANS_SRC) $(BEAN_GENSRC_DIR)/SwingBeanInfoBase.java $(BEAN_GENSRC_DIR)/BeanInfoUtils.java $(BUILD_TOOLS) + $(JAVA) -Djava.awt.headless=true -jar $(JAVADOC_JARS) -doclet GenDocletBeanInfo -x $(SWINGBEAN_DEBUG_FLAG) -d $(BEAN_GENSRC_DIR) -t $(DOCLETSRC_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \ + -classpath $(JDK_OUTPUTDIR)/btclasses $(BEANS_SRC) + $(TOUCH) $@ + +# This file is the part of dt.jar +# For some reason it is under $(JDK_TOPDIR)/make/tools/swing-beans/beaninfo +# Should it be moved under $(JDK_TOPDIR)/src/share/classes/javax/swing instead? +$(BEAN_GENSRC_DIR)/SwingBeanInfoBase.java: $(DOCLETSRC_DIR)/beaninfo/SwingBeanInfoBase.java + $(MKDIR) -p $(@D) + $(CP) $< $@ + +# This file is the part of dt.jar +# For some reason it is under $(JDK_TOPDIR)/make/tools/swing-beans/beaninfo +# Should it be moved under $(JDK_TOPDIR)/src/share/classes/sun/swing instead? +$(BEAN_GENSRC_DIR)/BeanInfoUtils.java: $(DOCLETSRC_DIR)/beaninfo/BeanInfoUtils.java + $(MKDIR) -p $(@D) + $(CP) $< $@ + +GENSRC_SWING_BEANINFO = $(JDK_OUTPUTDIR)/gensrc_swing/_the.generated_beaninfo diff --git a/jdk/makefiles/GensrcX11Wrappers.gmk b/jdk/makefiles/GensrcX11Wrappers.gmk new file mode 100644 index 00000000000..03938bbfc1b --- /dev/null +++ b/jdk/makefiles/GensrcX11Wrappers.gmk @@ -0,0 +1,97 @@ +# +# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +GENSRC_X11WRAPPERS := +GENSRC_X11WRAPPERS_TMP := $(JDK_OUTPUTDIR)/gensrc_x11wrappers + +GENSRC_SIZER_SRC := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator + +GENSRC_SIZES := + +ifeq ($(PLATFORM)-$(LIBARCH), solaris-i386) +GENSRC_SIZES := sizes.32 sizes.64 +else ifeq ($(PLATFORM), solaris) +isalist:=$(shell $(ISAINFO)) +ifneq (,$(findstring sparcv9, $(isalist))) +# On sparcv9 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL. +GENSRC_SIZES := sizes.32 sizes.64 +else +ifneq (,$(findstring amd64, $(isalist))) +# On amd64 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL. +GENSRC_SIZES := sizes.32 sizes.64 +else # !sparcv9 : includes (32-bit) sparc, i586 +GENSRC_SIZES := sizes.32 +endif # amd64 +endif # sparcv9 +else # !solaris +ifeq ($(PLATFORM), macosx) +GENSRC_SIZES := sizes.32 sizes.64 +else # !macosx +GENSRC_SIZES := sizes.$(ARCH_DATA_MODEL) +endif # !macosx +endif # solaris + + +########################################################################################## + +$(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c : $(GENSRC_SIZER_SRC)/xlibtypes.txt + $(MKDIR) -p $(@D) + $(RM) $@ + $(TOOL_WRAPPERGENERATOR) $(@D) $< "sizer" $* + +$(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.c + (cd $(@D) && $(CC) -m$* -o $@ $< $(CFLAGS_JDKLIB) \ + -I$(JDK_TOPDIR)/src/solaris/native/sun/awt \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ + -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils -lc) + +ifeq ($(PLATFORM)-$(LIBARCH), solaris-i386) + +$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.32 : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.32.exe + $< > $@.tmp + $(MV) $@.tmp $@ + +$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.64 : $(JDK_TOPDIR)/src/$(LEGACY_HOST_OS_API)/classes/sun/awt/X11/generator/sizes.64-$(PLATFORM)-$(LIBARCH) + $(MKDIR) -p $(@D) + $(CP) $< $@ +else + +$(GENSRC_X11WRAPPERS_TMP)/sizer/sizes.% : $(GENSRC_X11WRAPPERS_TMP)/sizer/sizer.%.exe + $< > $@.tmp + $(MV) $@.tmp $@ + +endif + +$(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes : $(foreach S,$(GENSRC_SIZES),$(GENSRC_X11WRAPPERS_TMP)/sizer/$(S)) + $(MKDIR) -p $(@D)/sun/awt/X11 + $(RM) $(@D)/sun/awt/X11/* + $(TOOL_WRAPPERGENERATOR) $(@D)/sun/awt/X11 $(GENSRC_SIZER_SRC)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizer/sizes +ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64) + $(ECHO) COMPARING $@ and $(GENSRC_SIZER_SRC)/sizes.64-$(PLATFORM)-i386 + $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.64 $(GENSRC_SIZER_SRC)/sizes.64-$(PLATFORM)-i386 +endif + $(TOUCH) $@ + +GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/classes/_the.classes diff --git a/jdk/makefiles/Images.gmk b/jdk/makefiles/Images.gmk index 4d5c3be71ef..9315955117e 100644 --- a/jdk/makefiles/Images.gmk +++ b/jdk/makefiles/Images.gmk @@ -28,47 +28,518 @@ include MakeBase.gmk include JavaCompilation.gmk include Setup.gmk -default: $(IMAGES_OUTPUTDIR)/_the.images +default: images include Tools.gmk -JARS:= +images: jre-image jdk-image -########################################################################################## - -JCONSOLE_JAR_DEPS := \ - $(shell $(FIND) $(JDK_OUTPUTDIR)/newclasses/sun/tools/jconsole/ -name "_the.package") \ - $(shell $(FIND) $(JDK_OUTPUTDIR)/newclasses/com/sun/tools/jconsole/ -name "_the.package") - -$(eval $(call SetupArchive,BUILD_JCONSOLE_JAR,$(JCONSOLE_JAR_DEPS),\ - SRCS:=$(JDK_OUTPUTDIR)/newclasses,\ - SUFFIXES:=.class .gif .png,\ - INCLUDES:=sun/tools/jconsole com/sun/tools/jconsole,\ - JARMAIN:=sun.tools.jconsole.JConsole,\ - JAR:=$(JDK_OUTPUTDIR)/lib/jconsole.jar,\ - SKIP_METAINF:=true)) - -JARS+=$(JDK_OUTPUTDIR)/lib/jconsole.jar - -########################################################################################## - -# Need to define BUILDDIR for Release.gmk to work -BUILDDIR=$(JDK_TOPDIR)/makefiles -include common/Defs.gmk -include common/Release.gmk - -# A rudimentary attempt at band-aiding the dependency tracking. -DEPS:= $(shell $(FIND) $(JDK_OUTPUTDIR)/newclasses -name "*.class" -type f) \ - $(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f) \ - $(shell $(FIND) $(JDK_OUTPUTDIR)/lib -type f) - -$(IMAGES_OUTPUTDIR)/_the.images : $(DEPS) $(JARS) +ifeq ($(HOST_OS),solaris) +define install-file + $(MKDIR) -p $(@D) + $(CP) -r -P '$<' '$(@D)' +endef +else +define install-file + $(MKDIR) -p $(@D) + $(CP) -P '$<' '$@' +endef +endif + +################################################################################ +# +# JRE and JDK build rules +# +################################################################################ + +################################################################################ +# /bin dir + +$(JRE_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +$(JDK_IMAGE_DIR)/bin/%: $(JDK_OUTPUTDIR)/bin/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +$(JDK_IMAGE_DIR)/jre/bin/%: $(JDK_OUTPUTDIR)/bin/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +NOT_JRE_BIN_FILES = \ + appletviewer$(EXE_SUFFIX) \ + extcheck$(EXE_SUFFIX) \ + idlj$(EXE_SUFFIX) \ + jar$(EXE_SUFFIX) \ + jarsigner$(EXE_SUFFIX) \ + java-rmi.cgi \ + javac$(EXE_SUFFIX) \ + javadoc$(EXE_SUFFIX) \ + javah$(EXE_SUFFIX) \ + javap$(EXE_SUFFIX) \ + jcmd$(EXE_SUFFIX) \ + jdb$(EXE_SUFFIX) \ + jps$(EXE_SUFFIX) \ + jrunscript$(EXE_SUFFIX) \ + jstat$(EXE_SUFFIX) \ + jstatd$(EXE_SUFFIX) \ + jstack$(EXE_SUFFIX) \ + packagebean$(SCRIPT_SUFFIX) \ + rmic$(EXE_SUFFIX) \ + serialver$(EXE_SUFFIX) \ + unregbean$(EXE_SUFFIX) \ + jconsole$(EXE_SUFFIX) \ + jinfo$(EXE_SUFFIX) \ + jmap$(EXE_SUFFIX) \ + native2ascii$(EXE_SUFFIX) \ + xjc$(EXE_SUFFIX) \ + wsgen$(EXE_SUFFIX) \ + wsimport$(EXE_SUFFIX) \ + schemagen$(EXE_SUFFIX) \ + jsadebugd$(EXE_SUFFIX) \ + jhat$(EXE_SUFFIX) + +WINDOWS_JDK_BIN_FILES = \ + $(EXE_SUFFIX) \ + $(LIB_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \ + $(MSVCRNN_DLL) + +# Find all files in bin dir +ALL_BIN_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f) +ifeq ($(HOST_OS),windows) + JDK_BIN_LIST := $(filter $(addprefix %,$(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST)) +else + JDK_BIN_LIST := $(ALL_BIN_LIST) +endif +JRE_BIN_LIST := $(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST)) + +JRE_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_IMAGE_DIR)/%, $(JRE_BIN_LIST)) +JDK_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/%, $(JDK_BIN_LIST)) +JDKJRE_BIN_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/jre/%, $(JRE_BIN_LIST)) + +################################################################################ +# /lib dir + +$(JRE_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +$(JDK_IMAGE_DIR)/lib/%: $(JDK_OUTPUTDIR)/lib/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +$(JDK_IMAGE_DIR)/jre/lib/%: $(JDK_OUTPUTDIR)/lib/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +JDKJRE_LIB_FILES := \ + $(LIB_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \ + $(SALIB_NAME) + +NOT_JRE_LIB_FILES := \ + tools.jar \ + jconsole.jar \ + sa-jdi.jar \ + dt.jar \ + orb.idl \ + ir.idl \ + ct.sym + +JDK_LIB_FILES := $(NOT_JRE_LIB_FILES) +ifeq ($(HOST_OS), linux) + JDK_LIB_FILES += jexec +endif + +ALL_LIB_LIST := $(shell $(FIND) $(JDK_OUTPUTDIR)/lib \( -type f -o -type l \) ! -name "_the*") +JRE_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),$(ALL_LIB_LIST)) +JDKJRE_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_LIB_LIST)) +JDK_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_LIB_LIST)) + +JRE_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JRE_IMAGE_DIR)/%,$(JRE_LIB_LIST)) +JDK_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/%,$(JDK_LIB_LIST)) +JDKJRE_LIB_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/%,$(JDK_IMAGE_DIR)/jre/%,$(JDKJRE_LIB_LIST)) + +# CTE plugin security change require new empty directory lib/applet +$(JRE_IMAGE_DIR)/lib/applet: + $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(MKDIR) -p $@ + +$(JDK_IMAGE_DIR)/jre/lib/applet: + $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(MKDIR) -p $@ + +$(JRE_IMAGE_DIR)/lib/meta-index: $(JRE_LIB_TARGETS) + $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar + +$(JDK_IMAGE_DIR)/jre/lib/meta-index: $(JDKJRE_LIB_TARGETS) + $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar + +$(JRE_IMAGE_DIR)/lib/ext/meta-index: $(JRE_LIB_TARGETS) + $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar + +$(JDK_IMAGE_DIR)/jre/lib/ext/meta-index: $(JRE_LIB_TARGETS) + $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(CD) $(@D) && $(TOOL_BUILDMETAINDEX) -o meta-index *.jar + +################################################################################ +# /man dir + +JRE_MAN_PAGES := \ + java.1 \ + keytool.1 \ + orbd.1 \ + pack200.1 \ + policytool.1 \ + rmid.1 \ + rmiregistry.1 \ + servertool.1 \ + tnameserv.1 \ + unpack200.1 + +ifndef OPENJDK + JRE_MAN_PAGES += javaws.1 +endif + +JDK_MAN_PAGES = \ + $(JRE_MAN_PAGES) \ + appletviewer.1 \ + extcheck.1 \ + idlj.1 \ + jar.1 \ + jarsigner.1 \ + javac.1 \ + javadoc.1 \ + javah.1 \ + javap.1 \ + jconsole.1 \ + jcmd.1 \ + jdb.1 \ + jhat.1 \ + jinfo.1 \ + jmap.1 \ + jps.1 \ + jrunscript.1 \ + jsadebugd.1 \ + jstack.1 \ + jstat.1 \ + jstatd.1 \ + jvisualvm.1 \ + native2ascii.1 \ + rmic.1 \ + schemagen.1 \ + serialver.1 \ + wsgen.1 \ + wsimport.1 \ + xjc.1 + +ifeq ($(HOST_OS), linux) + MAN_SRC_DIR:=$(JDK_TOPDIR)/src/linux/doc + MAN1_SUBDIR:=man +endif +ifeq ($(HOST_OS), solaris) + MAN_SRC_DIR:=$(JDK_TOPDIR)/src/solaris/doc + MAN1_SUBDIR:=sun/man/man1 +endif + +$(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +$(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +$(JRE_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +$(JDK_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +define install-ja-manpage + $(MKDIR) -p $(@D) + $(CAT) $< \ + | $(NATIVE2ASCII) -encoding eucJP \ + | $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \ + | $(NATIVE2ASCII) -reverse -encoding $1 \ + > $@ +endef + +$(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% + $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(call install-ja-manpage,UTF-8) + +$(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% + $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(call install-ja-manpage,UTF-8) + +$(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% + $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(call install-ja-manpage,PCK) + +$(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% + $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(call install-ja-manpage,PCK) + +ifeq ($(HOST_OS), solaris) + $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% + $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + + $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% + $(ECHO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) +endif + +# Old build creates empty man page for this, mimicing behaviour. +$(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/jcmd.1 $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/jcmd.1 $(JDK_IMAGE_DIR)/man/ja/man1/jcmd.1: + $(ECHO) Creating dummy $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(MKDIR) -p $(@D) -# Restart this makefile, ugly, but since double colon (::) rules -# have been used in Release.gmk, it is impossible to craft on -# dependencies on these. I.e. -do-not-use- :: rules!!!!! -# Repeat after me: -do-not-use- :: rules!!!!! - $(MAKE) -j1 -f Images.gmk $(IMAGES_MAKE_ARGS) images $(TOUCH) $@ -.PHONY: default +ifeq ($(HOST_OS), linux) + $(JRE_IMAGE_DIR)/man/ja: + $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja + + $(JDK_IMAGE_DIR)/man/ja: + $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja +endif + +ifeq ($(HOST_OS), linux) + JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \ + $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \ + $(JRE_IMAGE_DIR)/man/ja + + JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \ + $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \ + $(JDK_IMAGE_DIR)/man/ja +endif + +ifeq ($(HOST_OS), solaris) + JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \ + $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/,$(JRE_MAN_PAGES)) \ + $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \ + $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JRE_MAN_PAGES)) + + JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \ + $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/,$(JDK_MAN_PAGES)) \ + $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \ + $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JDK_MAN_PAGES)) +endif + +################################################################################ +# /demo dir + +ifndef NO_DEMOS +# FIXME: newdemo/applets/GraphLayout/GraphPanel$2.class is sometimes not copied. + +# The db demo contains an empty dir that needs to be copied. The other +# directories will always trigger the rule for recompile since +# _the.list_of_packages files are touched. + $(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/newdemo/% + if [ ! -d "$@" ]; then \ + $(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \ + $(MKDIR) -p $(@D); \ + if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) '$<' '$@'; fi \ + fi + +# Find all files including directories + JDK_DEMO_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/newdemo/%,$(JDK_IMAGE_DIR)/demo/%,\ + $(shell $(FIND) $(JDK_OUTPUTDIR)/newdemo ! -name "_the.*")) + +endif + +################################################################################ +# /sample dir + +ifndef NO_SAMPLES + $(JDK_IMAGE_DIR)/sample/%: $(JDK_OUTPUTDIR)/sample/% + $(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)' + $(install-file) + + JDK_SAMPLE_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/sample/%,$(JDK_IMAGE_DIR)/sample/%,\ + $(shell $(FIND) $(JDK_OUTPUTDIR)/sample -type f)) + +endif + +################################################################################ +# /db dir + +ifndef OPENJDK + $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped: $(JDK_TOPDIR)/src/closed/share/db/% + $(ECHO) Unzipping $(patsubst $(SRC_ROOT)/%,%,$<) + $(MKDIR) -p $(JDK_IMAGE_DIR)/db + cd $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $< -x index.html 2> /dev/null + $(MKDIR) -p $(@D) + $(TOUCH) $@ + + $(JDK_IMAGE_DIR)/db/README-JDK.html: $(JDK_TOPDIR)/src/closed/share/db/README-JDK.html + $(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)' + $(install-file) + + JDK_DB_TARGETS := $(patsubst $(JDK_TOPDIR)/src/closed/share/db/%,$(IMAGES_OUTPUTDIR)/_unzip/%.unzipped,\ + $(shell $(FIND) $(JDK_TOPDIR)/src/closed/share/db -name "*.zip" ! -name "*demo*")) \ + $(JDK_IMAGE_DIR)/db/README-JDK.html + +endif + +################################################################################ +# /include dir + +$(JDK_IMAGE_DIR)/include/%: $(JDK_OUTPUTDIR)/include/% + $(ECHO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)' + $(install-file) + + JDK_INCLUDE_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/include/%,$(JDK_IMAGE_DIR)/include/%,\ + $(shell $(FIND) $(JDK_OUTPUTDIR)/include -type f)) + +################################################################################ +# doc files + +ifdef OPENJDK + JRE_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README + JDK_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README + JRE_DOC_LOCATION := $(JDK_TOPDIR) + JDK_DOC_LOCATION := $(JDK_TOPDIR) +else + JRE_DOC_FILES := COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt + JDK_DOC_FILES := COPYRIGHT README.html LICENSE THIRDPARTYLICENSEREADME.txt + ifeq ($(HOST_OS), windows) + JRE_DOC_FILES += README.txt + else + JRE_DOC_FILES += README + endif + ifndef NO_DEMOS + JDK_DOC_FILES += demo/DEMOS_LICENSE + endif + ifndef NO_SAMPLES + JDK_DOC_FILES += sample/SAMPLES_LICENSE + endif + JRE_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jre + JDK_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jdk +endif +JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/,$(JRE_DOC_FILES)) +JDKJRE_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/jre/,$(JRE_DOC_FILES)) +JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/,$(JDK_DOC_FILES)) + +$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +$(JDK_IMAGE_DIR)/jre/%: $(JRE_DOC_LOCATION)/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +$(JRE_IMAGE_DIR)/README.txt: $(JRE_DOC_LOCATION)/README + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(MKDIR) -p $(@D) + $(CP) $< $@ + +$(JDK_IMAGE_DIR)/jre/README.txt: $(JRE_DOC_LOCATION)/README + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(MKDIR) -p $(@D) + $(CP) $< $@ + +$(JDK_IMAGE_DIR)/%: $(JDK_DOC_LOCATION)/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +$(JDK_IMAGE_DIR)/demo/%: $(JDK_DOC_LOCATION)/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +$(JDK_IMAGE_DIR)/sample/%: $(JDK_DOC_LOCATION)/% + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +JRE_INFO_FILE := $(JRE_IMAGE_DIR)/release +JDK_INFO_FILE := $(JDK_IMAGE_DIR)/release + +# Common way to emit a line into the release or info file +define info-file-item # name value +$(PRINTF) '%s="%s"\n' $1 $2 >> $@ +endef + +ALL_SOURCE_TIPS = $(shell \ + if [ -f $(OUTPUT_ROOT)/source_tips ] ; then \ + $(CAT) $(OUTPUT_ROOT)/source_tips ; \ + fi) + +$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips + $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(MKDIR) -p $(@D) + $(RM) $@ + $(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)") + $(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)") + $(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)") + $(call info-file-item, "OS_ARCH", "$(ARCH)") + $(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)") + +$(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips + $(ECHO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(MKDIR) -p $(@D) + $(RM) $@ + $(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)") + $(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)") + $(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)") + $(call info-file-item, "OS_ARCH", "$(ARCH)") + $(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)") + +$(JDK_IMAGE_DIR)/src.zip: $(IMAGES_OUTPUTDIR)/src.zip + $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) + $(install-file) + +################################################################################ +# Post processing (strip etc) + +ifneq ($(POST_STRIP_CMD),) + ifeq ($(HOST_OS), windows) + EXEC_LIST:=$(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*.exe \ + -o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)") + else + # Find all executables in JDK_OUTPUTDIR since they exist when this makefile is parsed + EXEC_LIST:=$(shell $(FIND) $(JDK_OUTPUTDIR)/lib -type f -name \*$(SHARED_LIBRARY_SUFFIX) && \ + $(FILE) `$(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*$(EXE_SUFFIX)` \ + | $(EGREP) 'ELF' | $(CUT) -d':' -f1) + endif + # Filter out non JRE files and convert to unique touch files to depend on + JRE_EXEC_TOUCH_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip/%.stripped,\ + $(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST))) + + # Setup a rule for stripping files based on touch files + $(IMAGES_OUTPUTDIR)/_strip/%.stripped: $(JRE_IMAGE_DIR)/% + $(ECHO) Stripping $(patsubst $(OUTPUT_ROOT)/%,%,$<) + $(CHMOD) u+w $< + $(POST_STRIP_CMD) $< + $(CHMOD) go-w $< + $(MKDIR) -p $(@D) + $(TOUCH) $@ +endif + +################################################################################ +# Main targets + +jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \ + $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \ + $(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_EXEC_TOUCH_LIST) + +jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \ + $(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \ + $(JDK_IMAGE_DIR)/jre/lib/applet \ + $(JDK_DEMO_TARGETS) \ + $(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \ + $(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \ + $(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \ + $(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \ + $(JDK_INFO_FILE) $(JDK_IMAGE_DIR)/src.zip + +################################################################################ + +.PHONY: default images jre-image jdk-image diff --git a/jdk/makefiles/LegacyMakefiles.gmk b/jdk/makefiles/LegacyMakefiles.gmk index 96e4badcd89..e2fe44a4c02 100644 --- a/jdk/makefiles/LegacyMakefiles.gmk +++ b/jdk/makefiles/LegacyMakefiles.gmk @@ -31,26 +31,11 @@ all: $(JDK_OUTPUTDIR)/_the.legacy_make DEPS:= $(shell $(FIND) $(JDK_TOPDIR)/makefiles/java -type f) \ $(shell $(FIND) $(JDK_TOPDIR)/makefiles/javax -type f) \ $(shell $(FIND) $(JDK_TOPDIR)/makefiles/sun -type f) \ - $(shell $(FIND) $(JDK_TOPDIR)/makefiles/com -type f) \ - $(shell $(FIND) $(JDK_TOPDIR)/makefiles/apple -type f) + $(shell $(FIND) $(JDK_TOPDIR)/makefiles/com -type f) $(JDK_OUTPUTDIR)/_the.legacy_make: $(DEPS) (echo Building single threaded Java subdir && \ $(MAKE) -j1 -C java all && \ - (if test "$(PLATFORM)" = macosx; then \ - echo Building single threaded Apple subdir && \ - $(MAKE) -j1 -C apple all; \ - fi) && \ - echo Building single threaded javax subdir && \ - $(MAKE) -j1 -C javax all && \ - echo Building single threaded sun subdir && \ - $(MAKE) -j1 -C sun all && \ - echo Building single threaded com subdir && \ - $(MAKE) -j1 -C com all && \ - if [ -z "$(OPENJDK)" ]; then \ - echo Building single threaded altclasses subdir && \ - $(MAKE) -j1 -C altclasses all; \ - fi && \ touch $@) .PHONY: all diff --git a/jdk/makefiles/Makefile b/jdk/makefiles/Makefile index 67b8d276349..6feba0efe4a 100644 --- a/jdk/makefiles/Makefile +++ b/jdk/makefiles/Makefile @@ -23,6 +23,7 @@ # questions. # +# This must be the first rule default: all include $(SPEC) @@ -36,38 +37,43 @@ include Setup.gmk # Setup the build tools. include Tools.gmk - all: $(BUILD_TOOLS) - +make -f GenerateJavaSources.gmk + +$(MAKE) -f GenerateJavaSources.gmk # Drop back to the old makefiles for # packages/libs that have not yet been converted. - +make -f LegacyMakefiles.gmk + +$(MAKE) -f LegacyMakefiles.gmk # Ok, now gensrc is fully populated. - +make -f GenerateData.gmk - +make -f CompileJavaClasses.gmk + +$(MAKE) -f GenerateData.gmk + +$(MAKE) -f CompileJavaClasses.gmk # The classes have been built, now generate # classes that have other sources. - +make -f GenerateClasses.gmk + +$(MAKE) -f GenerateClasses.gmk # The classes are now built and # any javah files have now been generated. - +make -f CompileNativeLibraries.gmk + +$(MAKE) -f CompileNativeLibraries.gmk # Finally compile the launchers. - +make -f CompileLaunchers.gmk + +$(MAKE) -f CompileLaunchers.gmk # Now we have a complete jdk, which you can run. # It is not yet wrapped up as an installed image. # The demos are compiled against this jdk. ifndef NO_DEMOS - +make -f CompileDemos.gmk + +$(MAKE) -f CompileDemos.gmk endif # Now copy the sample sources into the jdk. ifndef NO_SAMPLES - +make -f CopySamples.gmk + +$(MAKE) -f CopySamples.gmk endif +# Create the final jdk and jre images in the old way. Kept for reference +# until conversion is fully done. +old-images: + +$(MAKE) $(IMAGES_MAKE_ARGS) -f OldImages.gmk + # Create the final jdk and jre images, to be wrapped up -# into packages, or instealled. -images: all - +make $(IMAGES_MAKE_ARGS) -f Images.gmk +# into packages, or installed. +images: + +$(MAKE) -f CreateJars.gmk + +$(MAKE) $(IMAGES_MAKE_ARGS) -f Images.gmk BINARIES:=$(shell if test -d $(IMAGES_OUTPUTDIR)/j2sdk-image/bin; then cd $(IMAGES_OUTPUTDIR)/j2sdk-image/bin && $(LS) ; fi) @@ -89,4 +95,4 @@ packages: images echo Creating packages...well, in the future. $(MKDIR) -p $(OUTPUT_ROOT)/packages -.PHONY: all install +.PHONY: all install images diff --git a/jdk/makefiles/OldImages.gmk b/jdk/makefiles/OldImages.gmk new file mode 100644 index 00000000000..1db1c174db8 --- /dev/null +++ b/jdk/makefiles/OldImages.gmk @@ -0,0 +1,175 @@ +# +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +include $(SPEC) +include MakeBase.gmk +include JavaCompilation.gmk +include Setup.gmk + +default: $(IMAGES_OUTPUTDIR)/_the.images + +include Tools.gmk + +JARS:= + +########################################################################################## + +JCONSOLE_JAR_DEPS := \ + $(shell $(FIND) $(JDK_OUTPUTDIR)/newclasses/sun/tools/jconsole/ -name "_the.package") \ + $(shell $(FIND) $(JDK_OUTPUTDIR)/newclasses/com/sun/tools/jconsole/ -name "_the.package") + +$(eval $(call SetupArchive,BUILD_JCONSOLE_JAR,$(JCONSOLE_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/newclasses,\ + SUFFIXES:=.class .gif .png,\ + INCLUDES:=sun/tools/jconsole com/sun/tools/jconsole,\ + JARMAIN:=sun.tools.jconsole.JConsole,\ + JAR:=$(JDK_OUTPUTDIR)/lib/jconsole.jar,\ + SKIP_METAINF:=true)) + +JARS+=$(JDK_OUTPUTDIR)/lib/jconsole.jar + +########################################################################################## + +CHARSETS_JAR_DEPS := + +$(eval $(call SetupArchive,BUILD_CHARSETS_JAR,$(CHARSETS_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/newclasses, \ + SUFFIXES:=.class .dat,\ + INCLUDES:=sun/nio/cs/ext,\ + EXTRA_FILES := sun/awt/HKSCS.class \ + sun/awt/motif/X11GBK.class \ + 'sun/awt/motif/X11GB2312$$$$Decoder.class' \ + sun/awt/motif/X11GB2312.class \ + 'sun/awt/motif/X11KSC5601$$$$Decoder.class' \ + 'sun/awt/motif/X11KSC5601$$$$Encoder.class' \ + 'sun/awt/motif/X11GB2312$$$$Encoder.class' \ + 'sun/awt/motif/X11GBK$$$$Encoder.class' \ + sun/awt/motif/X11KSC5601.class \ + META-INF/services/java.nio.charset.spi.CharsetProvider, \ + JAR:=$(JDK_OUTPUTDIR)/lib/charsets.jar, \ + JARMAIN := NONE, \ + SKIP_METAINF := true)) + +JARS+=$(JDK_OUTPUTDIR)/lib/charsets.jar + +########################################################################################## + +SUNPKCS11_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunpkcs11.jar + +ifndef OPENJDK + +SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar + +$(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_SRC) + @$(ECHO) "\n>>>Installing prebuilt SunPKCS11 provider..." + $(RM) $@ + $(CP) $< $@ + +else + +$(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR,$(SUNPKCS11_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/newclasses, \ + SUFFIXES:=.class,\ + INCLUDES:=sun/security/pkcs11,\ + JAR:=$(SUNPKCS11_JAR_DST), \ + JARMAIN := NONE, \ + SKIP_METAINF := true)) + +endif + +JARS += $(SUNPKCS11_JAR_DST) + +########################################################################################## + +SUNEC_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/sunec.jar + +ifndef OPENJDK + +SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar + +$(SUNEC_JAR_DST) : $(SUNEC_JAR_SRC) + @$(ECHO) "\n>>>Installing prebuilt SunEC provider..." + $(RM) $@ + $(CP) $< $@ + +else + +$(eval $(call SetupArchive,BUILD_SUNEC_JAR,$(SUNEC_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/newclasses, \ + SUFFIXES:=.class,\ + INCLUDES:=sun/security/ec,\ + EXCLUDE_FILES := \ + sun/security/ec/ECKeyFactory.class \ + sun/security/ec/ECParameters.class \ + sun/security/ec/ECPrivateKeyImpl.class \ + sun/security/ec/ECPublicKeyImpl.class \ + sun/security/ec/NamedCurve.class \ + 'sun/security/ec/ECKeyFactory$$$$1.class' \ + 'sun/security/ec/ECKeyFactory$$$$2.class' ,\ + JAR:=$(SUNEC_JAR_DST), \ + JARMAIN := NONE, \ + SKIP_METAINF := true)) + +endif + +JARS += $(SUNEC_JAR_DST) + +########################################################################################## + +# TODO: deps? +$(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR,$(SWINGBEANS_JAR_DEPS),\ + SRCS:=$(JDK_OUTPUTDIR)/newclasses,\ + SUFFIXES:=BeanInfo.class .gif,\ + INCLUDES:=javax/swing sun/swing,\ + EXCLUDES:=javax/swing/plaf,\ + EXTRA_FILES:=javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class,\ + JAR:=$(JDK_OUTPUTDIR)/lib/dt.jar,\ + JARMAIN:=NONE,\ + SKIP_METAINF:=true)) + +JARS+=$(JDK_OUTPUTDIR)/lib/dt.jar + +########################################################################################## + +# Need to define BUILDDIR for Release.gmk to work +BUILDDIR=$(JDK_TOPDIR)/makefiles +include common/Defs.gmk +include common/Release.gmk + +# A rudimentary attempt at band-aiding the dependency tracking. +DEPS:= $(shell $(FIND) $(JDK_OUTPUTDIR)/newclasses -name "*.class" -type f) \ + $(shell $(FIND) $(JDK_OUTPUTDIR)/bin -type f) \ + $(shell $(FIND) $(JDK_OUTPUTDIR)/lib -type f) + +$(IMAGES_OUTPUTDIR)/_the.images : $(DEPS) $(JARS) + $(MKDIR) -p $(@D) +# Restart this makefile, ugly, but since double colon (::) rules +# have been used in Release.gmk, it is impossible to craft on +# dependencies on these. I.e. -do-not-use- :: rules!!!!! +# Repeat after me: -do-not-use- :: rules!!!!! + $(MAKE) -j1 -f OldImages.gmk $(IMAGES_MAKE_ARGS) images + $(TOUCH) $@ + +.PHONY: default diff --git a/jdk/makefiles/Setup.gmk b/jdk/makefiles/Setup.gmk index ac9cee98f24..1936bc607c6 100644 --- a/jdk/makefiles/Setup.gmk +++ b/jdk/makefiles/Setup.gmk @@ -25,12 +25,13 @@ JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar JAVAH_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar +JAVADOC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar DISABLE_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally # The generate old bytecode javac setup uses the new compiler to compile for the # boot jdk to generate tools that need to be run with the boot jdk. -# Thus we force the target bytecode to 6. +# Thus we force the target bytecode to 7. $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ JVM:=$(JAVA),\ JAVAC:=$(JAVAC_JARS),\ @@ -46,7 +47,7 @@ $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\ JVM:=$(JAVA),\ JAVAC:=$(JAVAC_JARS),\ JAVAH:=$(JAVAH_JARS),\ - FLAGS:=-bootclasspath "$(JDK_OUTPUTDIR)/newclasses$(PATH_SEP)$(JDK_OUTPUTDIR)/classes" -Xprefer:source -XDignore.symbol.file=true $(DISABLE_WARNINGS),\ + FLAGS:=-bootclasspath "$(JDK_OUTPUTDIR)/classes" -Xprefer:source -XDignore.symbol.file=true $(DISABLE_WARNINGS),\ SERVER_DIR:=$(JAVAC_SERVERS),\ SERVER_JVM:=$(SERVER_JAVA),\ MODE:=$(JAVAC_USE_MODE),\ diff --git a/jdk/makefiles/Tools.gmk b/jdk/makefiles/Tools.gmk index 2663ffbcd8a..71ffde7e397 100644 --- a/jdk/makefiles/Tools.gmk +++ b/jdk/makefiles/Tools.gmk @@ -23,19 +23,24 @@ # questions. # +# The exception handling of swing beaninfo which have the own tool directory ifeq (,$(BUILD_TOOLS)) $(eval $(call SetupJavaCompilation,BUILD_TOOLS,\ SETUP:=GENERATE_OLDBYTECODE,\ - SRC:=$(JDK_TOPDIR)/make/tools/src,\ + SRC:=$(JDK_TOPDIR)/make/tools/src \ + $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator \ + $(JDK_TOPDIR)/makefiles/sun/xawt \ + $(JDK_TOPDIR)/make/tools/swing-beans,\ BIN:=$(JDK_OUTPUTDIR)/btclasses)) + endif ifndef DISABLE_NIMBUS $(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template : \ $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/%.template - mkdir -p $(@D) - cp $< $@ + $(MKDIR) -p $(@D) + $(CP) $< $@ BUILD_TOOLS += $(foreach i,$(wildcard $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/*.template),$(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/$(notdir $i)) @@ -112,3 +117,9 @@ TOOL_MAKECLASSLIST=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ # Nimbus is used somewhere in the swing build. TOOL_GENERATENIMBUS=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ build.tools.generatenimbus.Generator + +TOOL_WRAPPERGENERATOR=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ + WrapperGenerator + +TOOL_TOBIN=$(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \ + sun.awt.X11.ToBin diff --git a/jdk/makefiles/altclasses/Makefile b/jdk/makefiles/altclasses/Makefile deleted file mode 100644 index 201752071d4..00000000000 --- a/jdk/makefiles/altclasses/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building alternate runtime classes (not used by default) -# - -BUILDDIR = .. - -PRODUCT = altclasses - -include $(BUILDDIR)/common/Defs.gmk - -# Root of alternate class sources - -ALTCLASSES_SRCDIR = $(CLOSED_SRC)/share/altclasses - -# Alternate runtime classes - -ALTRT_JAR_FILE = $(LIBDIR)/alt-rt.jar -ALTRT_JAR_SOURCE_FILE = $(TEMPDIR)/alt-rt.jarsrclist -ALTRT_JAR_SOURCES = $(wildcard $(ALTCLASSES_SRCDIR)/java/*/*.java) - -# Use a special file suffix for the file that holds the source list - -.SUFFIXES: .jarsrclist - -# Build rules - -all build: - @if [ -d $(ALTCLASSES_SRCDIR) ] ; then \ - $(MAKE) $(ALTRT_JAR_FILE); \ - fi - -# Source list file creation - -$(ALTRT_JAR_SOURCE_FILE): $(ALTRT_JAR_SOURCES) FRC - $(prep-target) - $(ECHO) $(ALTRT_JAR_SOURCES) > $@ - -clean clobber:: - $(RM) $(ALTRT_JAR_FILE) $(ALTRT_JAR_SOURCE_FILE) - $(RM) -r $(ALTRT_JAR_SOURCE_FILE).classes - -include $(BUILDDIR)/common/Classes.gmk - -# Pattern rule to turn a source list file into a jar file -$(LIBDIR)/%.jar : $(TEMPDIR)/%.jarsrclist - $(prep-target) - $(RM) -r $(<).classes - $(MKDIR) -p $(<).classes - $(JAVAC_CMD) -implicit:none -d $(<).classes @$< - $(BOOT_JAR_CMD) cf $@ -C $(<).classes . $(BOOT_JAR_JFLAGS) - -# Force target - -FRC: - -# Non file targets - -.PHONY: all build clean clobber - diff --git a/jdk/makefiles/apple/Makefile b/jdk/makefiles/apple/Makefile deleted file mode 100644 index 4dd03dd50eb..00000000000 --- a/jdk/makefiles/apple/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building com/apple -# - -BUILDDIR = .. -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -SUBDIRS = applescript - -include $(BUILDDIR)/common/Subdirs.gmk - -all build clean clobber:: - $(SUBDIRS-loop) diff --git a/jdk/makefiles/apple/applescript/Makefile b/jdk/makefiles/apple/applescript/Makefile deleted file mode 100644 index 6d0bc798c38..00000000000 --- a/jdk/makefiles/apple/applescript/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PACKAGE = apple.applescript -LIBRARY = AppleScriptEngine -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - - -# -# Files -# -AUTO_FILES_JAVA_DIRS = apple/applescript - -FILES_objc = \ - $(TARGDIR)AppleScriptEngine.m \ - $(TARGDIR)AppleScriptExecutionContext.m \ - $(TARGDIR)AS_NS_ConversionUtils.m \ - $(TARGDIR)NS_Java_ConversionUtils.m - - -FILES_export = \ - apple/applescript/AppleScriptEngine.java \ - apple/applescript/AppleScriptEngineFactory.java - -# -# Rules -# -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - - -# -# Extra rules -# - -# -# Add to ambient vpath to get files in a subdirectory -# -vpath %.m $(call NativeSrcDirList,,native/apple/applescript) - -CPPFLAGS += \ - -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders - -OTHER_LDLIBS = \ - -framework Cocoa \ - -framework Carbon \ - -framework JavaNativeFoundation diff --git a/jdk/makefiles/com/Makefile b/jdk/makefiles/com/Makefile deleted file mode 100644 index 6f45213d2c7..00000000000 --- a/jdk/makefiles/com/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building all of java -# - -BUILDDIR = .. -PRODUCT = com -include $(BUILDDIR)/common/Defs.gmk - -SUBDIRS = sun oracle - -ifeq ($(PLATFORM), macosx) - SUBDIRS += apple -endif - -include $(BUILDDIR)/common/Subdirs.gmk - -all build clean clobber:: - $(SUBDIRS-loop) - diff --git a/jdk/makefiles/com/apple/osx/Makefile b/jdk/makefiles/com/apple/osx/Makefile deleted file mode 100644 index bf0ef9c99dc..00000000000 --- a/jdk/makefiles/com/apple/osx/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -# -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = com.apple.osx -LIBRARY = osx -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - - -# -# Files -# -AUTO_FILES_JAVA_DIRS = apple/launcher apple/security com/apple/concurrent com/apple/eio java/util/prefs - -FILES_objc += \ - $(TARGDIR)Dispatch.m \ - $(TARGDIR)CFileManager.m \ - $(TARGDIR)KeystoreImpl.m \ - $(TARGDIR)JavaAppLauncher.m \ - $(TARGDIR)MacOSXPreferencesFile.m \ - $(TARGDIR)SCDynamicStoreConfig.m - -FILES_export += \ - com/apple/concurrent/LibDispatchNative.java \ - com/apple/eio/FileManager.java \ - apple/security/KeychainStore.java \ - apple/launcher/JavaAppLauncher.java \ - java/util/prefs/MacOSXPreferencesFile.java - -# TODO: couldn't figure out how to get resources working -#LOCALE_SET_DEFINITION = jre -#RESOURCE_BUNDLES_UNCOMPILED_PROPERTIES = apple/launcher/appLauncherErrors.properties - - -# -# Rules -# -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - - -# -# Extra rules -# - -# -# Add to ambient vpath to get files in a subdirectory -# -vpath %.m $(call NativeSrcDirList,,native/com/apple/concurrent) -vpath %.m $(call NativeSrcDirList,,native/com/apple/eio) -vpath %.m $(call NativeSrcDirList,,native/apple/launcher) -vpath %.m $(call NativeSrcDirList,,native/apple/security) -vpath %.m $(call NativeSrcDirList,,native/java/util) - -CPPFLAGS += \ - $(call NativeSrcDirList,-I,native/com/apple/laf) \ - $(call NativeSrcDirList,-I,native/apple/awt) \ - $(call NativeSrcDirList,-I,native/sun/awt) \ - $(call NativeSrcDirList,-I,native/sun/osxapp) - -OTHER_LDLIBS = \ - -losxapp \ - -framework Cocoa \ - -framework ApplicationServices \ - -framework JavaNativeFoundation \ - -framework JavaRuntimeSupport \ - -framework Security \ - -framework SystemConfiguration diff --git a/jdk/makefiles/com/apple/osxui/Makefile b/jdk/makefiles/com/apple/osxui/Makefile deleted file mode 100644 index 63d78d2872e..00000000000 --- a/jdk/makefiles/com/apple/osxui/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -# -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = com.apple.osxui -LIBRARY = osxui -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - - -# -# Files -# -AUTO_FILES_JAVA_DIRS = apple/laf com/apple/laf com/apple/eawt - -FILES_objc = \ - $(TARGDIR)AquaFileView.m \ - $(TARGDIR)AquaLookAndFeel.m \ - $(TARGDIR)AquaNativeResources.m \ - $(TARGDIR)JRSUIConstantSync.m \ - $(TARGDIR)JRSUIController.m \ - $(TARGDIR)JRSUIFocus.m \ - $(TARGDIR)ScreenPopupFactory.m \ - $(TARGDIR)ScreenMenu.m - -FILES_export = \ - apple/laf/AquaLookAndFeel.java \ - apple/laf/JRSUIConstants.java \ - apple/laf/JRSUIControl.java \ - apple/laf/JRSUIFocus.java \ - apple/laf/JRSUIState.java \ - apple/laf/JRSUIStateFactory.java \ - apple/laf/JRSUIUtils.java \ - com/apple/laf/AquaFileView.java \ - com/apple/laf/AquaNativeResources.java \ - com/apple/laf/ScreenPopupFactory.java \ - com/apple/laf/ScreenMenu.java \ - com/apple/laf/ScreenMenuBar.java \ - com/apple/laf/ScreenMenuBarProvider.java \ - com/apple/laf/ScreenMenuItem.java \ - com/apple/laf/ScreenMenuItemCheckbox.java \ - com/apple/laf/ScreenMenuItemUI.java \ - com/apple/laf/ScreenMenuPropertyHandler.java \ - com/apple/laf/ScreenMenuPropertyListener.java - -#RESOURCE_BUNDLES_COMPILED_PROPERTIES += \ -# com/apple/laf/resources/aqua.properties \ -# com/apple/laf/resources/aqua_de.properties \ -# com/apple/laf/resources/aqua_fr.properties \ -# com/apple/laf/resources/aqua_ja.properties - - -# -# Rules -# -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - - -# -# Extra rules -# - -# -# Add to ambient vpath to get files in a subdirectory -# -vpath %.m $(call NativeSrcDirList,,native/com/apple/laf) -vpath %.m $(call NativeSrcDirList,,native/com/apple/eawt) - -CPPFLAGS += \ - $(call NativeSrcDirList,-I,native/com/apple/laf) \ - $(call NativeSrcDirList,-I,native/apple/awt) \ - $(call NativeSrcDirList,-I,native/sun/awt) \ - $(call NativeSrcDirList,-I,native/sun/osxapp) \ - -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders - -OTHER_LDLIBS = \ - -lawt -losxapp \ - -lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \ - -framework Cocoa \ - -framework Carbon \ - -framework ApplicationServices \ - -framework JavaNativeFoundation \ - -framework JavaRuntimeSupport diff --git a/jdk/makefiles/com/oracle/jfr/Makefile b/jdk/makefiles/com/oracle/jfr/Makefile deleted file mode 100644 index 5fd5e53039f..00000000000 --- a/jdk/makefiles/com/oracle/jfr/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = oracle.jrockit.jfr -LIBRARY = jfr -PRODUCT = oracle -include $(BUILDDIR)/common/Defs.gmk - -# -# Use mapfile -# -FILES_m = $(CLOSED_SHARE_SRC)/native/oracle/jfr/mapfile-vers -include $(BUILDDIR)/common/Mapfile-vers.gmk - -# -# Files to compile -# -FILES_c = VMJFR.c - -AUTO_FILES_JAVA_DIRS = com/oracle/jrockit/jfr oracle/jrockit/jfr - -# Find C source files -# -vpath %.c $(CLOSED_SHARE_SRC)/native/oracle/jfr - -# -# Library to compile. -# -include $(BUILDDIR)/common/Library.gmk - -JVMLIB = -JAVALIB = -OTHER_LDLIBS = - -clean clobber:: - $(RM) -r $(CLASSDESTDIR)/com/oracle/jrockit/jfr - $(RM) -r $(CLASSDESTDIR)/oracle/jrockit/jfr - - -# Copy pre-shipped .jfs files -JFR_LIBDIR = $(LIBDIR)/jfr -JFR_SRCDIR = $(CLOSED_SHARE_SRC)/lib/jfr - -$(JFR_LIBDIR)/%.jfs: $(JFR_SRCDIR)/%.jfs - $(install-file) - -JFS_FILES := $(subst $(JFR_SRCDIR),$(JFR_LIBDIR),$(wildcard $(JFR_SRCDIR)/*.jfs)) - -all build : $(JFS_FILES) - diff --git a/jdk/makefiles/com/oracle/security/ucrypto/Makefile b/jdk/makefiles/com/oracle/security/ucrypto/Makefile deleted file mode 100644 index f6545e89828..00000000000 --- a/jdk/makefiles/com/oracle/security/ucrypto/Makefile +++ /dev/null @@ -1,270 +0,0 @@ -# -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building ucrypto.jar and its native libraries. -# -# This file was modified from make/sun/security/pkcs11/Makefile. -# -# -# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Oracle -# JDK builds respectively.) -# -# This Makefile does the "real" build of the Ucrypto provider files. -# Since the sources are unavailable for OpenJDK, this Makefile is only -# useful for JDK. -# -# -# Main Targets (JDK on Solaris): -# -# all The usual, ucrypto.jar plus the native libraries. -# builds and installs the prebuilt/signed jar. -# -# clobber/clean Cleans up the temp directory, ucrypto.jar, the -# native libraries, and the config file from the -# build area -# -# jar Builds, signs and installs ucrypto.jar -# (Can only be done on machines with access to -# the signing keystore) -# -# Other lesser-used Targets (JDK on Solaris): -# -# build-jar Builds ucrypto.jar (no sign/install) -# -# sign Builds/signs ucrypto.jar (no install) -# -# release Builds all targets in preparation -# for workspace integration. -# (Can only be done on machines with access to -# the signing keystore) -# -# install-prebuilt Installs the pre-built jar files -# -# NOTE: None of the above target will update the prebuilt provider binary -# under the closed workspace. To update it, you must explicitly copy the -# binary from either the tmp/signed or lib/ext directory. -# -# This makefile was written to support parallel target execution. -# - -BUILDDIR = ../../../.. - -include $(BUILDDIR)/common/Defs.gmk - -ifndef OPENJDK - ifneq ($(PLATFORM), solaris) - all: - else - PACKAGE = com.oracle.security.ucrypto - LIBRARY = j2ucrypto - PRODUCT = oracle - - # - # The following is for when we need to do postprocessing - # (signing/obfuscation) against a read-only build. If the OUTPUTDIR - # isn't writable, the build currently crashes out. - # - ifdef ALT_JCE_BUILD_DIR - # ===================================================== - # Where to place the output, in case we're building from a read-only - # build area. (e.g. a release engineering build.) - JCE_BUILD_DIR=${ALT_JCE_BUILD_DIR} - IGNORE_WRITABLE_OUTPUTDIR_TEST=true - else - JCE_BUILD_DIR=${TEMPDIR} - endif - - JAVAC_MAX_WARNINGS=false - JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation - JAVAC_WARNINGS_FATAL=true - - # - # C and Java Files - # - include FILES_c.gmk - - # - # Subdirectories of these are automatically included. - # - AUTO_FILES_JAVA_DIRS = com/oracle/security/ucrypto - - # - # Java files that define native methods - # - FILES_export = \ - com/oracle/security/ucrypto/UcryptoProvider.java \ - com/oracle/security/ucrypto/NativeCipher.java \ - com/oracle/security/ucrypto/NativeDigest.java \ - com/oracle/security/ucrypto/NativeKey.java \ - com/oracle/security/ucrypto/NativeRSASignature.java \ - com/oracle/security/ucrypto/NativeRSACipher.java - - # - # Find native code - # - vpath %.c \ - $(CLOSED_PLATFORM_SRC)/native/com/oracle/security/ucrypto - - # - # Find include files - # - OTHER_INCLUDES += \ - -I$(CLOSED_PLATFORM_SRC)/native/com/oracle/security/ucrypto - - # - # Rules - # - CLASSDESTDIR = $(TEMPDIR)/classes - JAVAHFLAGS = -bootclasspath \ - "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)" - - include $(BUILDDIR)/common/Mapfile-vers.gmk - include $(BUILDDIR)/common/Library.gmk - - # - # Libraries to link - # - OTHER_LDLIBS = -ldl - - # Default config file - UCRYPTO_CFG_SRC = $(CLOSED_SRC)/share/lib/security/ucrypto-solaris.cfg - UCRYPTO_CFG_BUILD = $(LIBDIR)/security/ucrypto-solaris.cfg - - # - # We use a variety of subdirectories in the $(TEMPDIR) depending on what - # part of the build we're doing. Build is initially done in the unsigned - # area and when files are signed, they will be placed in the appropriate area. - # - UNSIGNED_DIR = $(TEMPDIR)/unsigned - - # - # Rules - # - all: ucrypto-cfg build-jar install-prebuilt - $(build-warning) - - ucrypto-cfg: $(UCRYPTO_CFG_BUILD) - - $(UCRYPTO_CFG_BUILD): $(UCRYPTO_CFG_SRC) - $(install-file) - - include $(BUILDDIR)/javax/crypto/Defs-jce.gmk - - - # ===================================================== - # Build the unsigned ucrypto.jar file. - # - - JAR_DESTFILE = $(EXTDIR)/ucrypto.jar - - # - # The ucrypto.jar needs to be in the extension class directory, - # therefore none of its classes can appear in $(CLASSBINDIR). - # Currently no one is using any of the internals, so these files - # should not have been built. - # - - # - # Since the -C option to jar is used below, each directory entry must be - # preceded with the appropriate directory to "cd" into. - # - JAR_DIRS = $(patsubst %, -C $(CLASSDESTDIR) %, $(AUTO_FILES_JAVA_DIRS)) - - build-jar: $(UNSIGNED_DIR)/ucrypto.jar - - # - # Build ucrypto.jar. - # - $(UNSIGNED_DIR)/ucrypto.jar: build - $(prep-target) - $(BOOT_JAR_CMD) cf $@ $(JAR_DIRS) \ - $(BOOT_JAR_JFLAGS) - @$(java-vm-cleanup) - - # - # Sign ucrypto.jar - # - SIGNED_DIR = $(JCE_BUILD_DIR)/signed - - sign: $(SIGNED_DIR)/ucrypto.jar - - ifndef ALT_JCE_BUILD_DIR - $(SIGNED_DIR)/ucrypto.jar: $(UNSIGNED_DIR)/ucrypto.jar - else - # - # We have to remove the build dependency, otherwise, we'll try to rebuild it - # which we can't do on a read-only filesystem. - # - $(SIGNED_DIR)/ucrypto.jar: - @if [ ! -r $(UNSIGNED_DIR)/ucrypto.jar ] ; then \ - $(ECHO) "Couldn't find $(UNSIGNED_DIR)/ucrypto.jar"; \ - exit 1; \ - fi - endif - $(call sign-file, $(UNSIGNED_DIR)/ucrypto.jar) - - - # ===================================================== - # Create the Release Engineering files. Signed builds, etc. - # - - release: $(SIGNED_DIR)/ucrypto.jar - $(RM) $(JCE_BUILD_DIR)/release/ucrypto.jar - $(MKDIR) -p $(JCE_BUILD_DIR)/release - $(CP) $(SIGNED_DIR)/ucrypto.jar $(JCE_BUILD_DIR)/release - $(release-warning) - - - # ===================================================== - # Install routines. - # - - # - # Install ucrypto.jar, depending on which type is requested. - # - jar: $(JAR_DESTFILE) - $(release-warning) - - $(JAR_DESTFILE): $(SIGNED_DIR)/ucrypto.jar - $(install-file) - - install-prebuilt: - @$(ECHO) "\n>>>Installing prebuilt OracleUcrypto provider..." - $(RM) $(JAR_DESTFILE) - $(CP) $(PREBUILT_DIR)/ucrypto/ucrypto.jar $(JAR_DESTFILE) - - - # ===================================================== - # Support routines. - # - clobber clean:: - $(RM) -r $(JAR_DESTFILE) $(TEMPDIR) $(JCE_BUILD_DIR) - $(RM) -r $(UCRYPTO_CFG_BUILD) - - .PHONY: build-jar jar sign release install-prebuilt - - endif #ifneq ($(PLATFORM), solaris) -endif #ifndef OPENJDK diff --git a/jdk/makefiles/com/sun/Makefile b/jdk/makefiles/com/sun/Makefile deleted file mode 100644 index 9049d0033c6..00000000000 --- a/jdk/makefiles/com/sun/Makefile +++ /dev/null @@ -1,54 +0,0 @@ - -# -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building com/sun -# - -BUILDDIR = ../.. -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -ifndef OPENJDK - ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,) - ifneq ("$(ORG_EXISTS)", "") - SCRIPT_SUBDIR = script - endif -endif - -# jarsigner is part of JRE -SUBDIRS = - -SUBDIRS_management = -SUBDIRS_enterprise = crypto/provider -SUBDIRS_misc = - -# Omit mirror since it's built with the apt tool. - -include $(BUILDDIR)/common/Subdirs.gmk - -all build clean clobber:: - $(SUBDIRS-loop) diff --git a/jdk/makefiles/common/Defs-macosx.gmk b/jdk/makefiles/common/Defs-macosx.gmk index 1d3753ed353..e1e8e252e7c 100644 --- a/jdk/makefiles/common/Defs-macosx.gmk +++ b/jdk/makefiles/common/Defs-macosx.gmk @@ -106,10 +106,10 @@ CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) # For all platforms, do not omit the frame pointer register usage. # We need this frame pointer to make it easy to walk the stacks. -# This should be the default on X86, but ia64 and amd64 may not have this -# as the default. -CFLAGS_REQUIRED_amd64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN -LDFLAGS_COMMON_amd64 += -m64 +# This should be the default on X86, but ia64, and x86_64 +# may not have this as the default. +CFLAGS_REQUIRED_x86_64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN +LDFLAGS_COMMON_x86_64 += -m64 CFLAGS_REQUIRED_i586 += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN LDFLAGS_COMMON_i586 += -m32 CFLAGS_REQUIRED_ia64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN @@ -163,7 +163,7 @@ PIC_CODE_LARGE = -fPIC PIC_CODE_SMALL = -fpic GLOBAL_KPIC = $(PIC_CODE_LARGE) CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS) -ifeq ($(ARCH), amd64) +ifeq ($(ARCH), x86_64) CFLAGS_COMMON += -pipe endif diff --git a/jdk/makefiles/common/Release-macosx.gmk b/jdk/makefiles/common/Release-macosx.gmk index 9235afa0eb8..f56370f3ca1 100644 --- a/jdk/makefiles/common/Release-macosx.gmk +++ b/jdk/makefiles/common/Release-macosx.gmk @@ -29,14 +29,14 @@ JA_DIRNAME=ja_JP.UTF-8 # Defines the release targets for Mac OS X build products -JDK_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-bundle/$(THIS_JDK_VERSION).jdk/Contents -JRE_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2re-bundle/$(THIS_JDK_VERSION).jre/Contents +JDK_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents +JRE_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2re-bundle/jre$(JDK_VERSION).jre/Contents MACOSX_SRC = $(JDK_TOPDIR)/src/macosx BUNDLE_ID ?= net.java.openjdk -BUNLDE_ID_JRE ?= $(BUNDLE_ID).jre -BUNLDE_ID_JDK ?= $(BUNDLE_ID).jdk +BUNDLE_ID_JRE ?= $(BUNDLE_ID).jre +BUNDLE_ID_JDK ?= $(BUNDLE_ID).jdk BUNDLE_NAME ?= OpenJDK $(JDK_MINOR_VERSION) BUNDLE_NAME_JRE ?= $(BUNDLE_NAME) diff --git a/jdk/makefiles/common/Release.gmk b/jdk/makefiles/common/Release.gmk index 381a1ddb9aa..74c84cb4712 100644 --- a/jdk/makefiles/common/Release.gmk +++ b/jdk/makefiles/common/Release.gmk @@ -509,7 +509,8 @@ NOTJRETOOLS = \ # The following get removed from the JRE after the bulk-copy of LIBDIR... NOTJRELIBS = tools.jar \ - jconsole.jar + jconsole.jar \ + dt.jar ifeq ($(INCLUDE_SA), true) NOTJRELIBS += sa-jdi.jar @@ -584,6 +585,7 @@ $(NOT_RT_JAR_LIST): FRC $(ECHO) "sun/awt/motif/X11KSC5601\$$Decoder.class" >> $@ $(ECHO) "sun/awt/motif/X11KSC5601\$$Encoder.class" >> $@ $(ECHO) "sun/awt/motif/X11KSC5601.class" >> $@ + $(ECHO) "META-INF/services/java.nio.charset.spi.CharsetProvider" >> $@ $(ECHO) "sun/rmi/rmic/" >> $@ $(ECHO) "sun/tools/asm/" >> $@ $(ECHO) "sun/tools/java/" >> $@ @@ -611,6 +613,18 @@ $(NOT_RT_JAR_LIST): FRC $(ECHO) "sun/security/provider/Sun.class" >> $@ $(ECHO) "sun/security/rsa/SunRsaSign.class" >> $@ $(ECHO) "sun/security/ssl/" >> $@ + $(ECHO) "sun/security/pkcs11/" >> $@ + $(ECHO) "sun/security/ec/ECDHKeyAgreement.class" >> $@ + $(ECHO) "sun/security/ec/ECDSASignature.class" >> $@ + $(ECHO) "sun/security/ec/ECKeyPairGenerator.class" >> $@ + $(ECHO) "sun/security/ec/SunEC\$$1.class" >> $@ + $(ECHO) "sun/security/ec/SunEC.class" >> $@ + $(ECHO) "sun/security/ec/SunECEntries.class" >> $@ + $(ECHO) "sun/security/ec/ECDSASignature\$$Raw.class" >> $@ + $(ECHO) "sun/security/ec/ECDSASignature\$$SHA1.class" >> $@ + $(ECHO) "sun/security/ec/ECDSASignature\$$SHA256.class" >> $@ + $(ECHO) "sun/security/ec/ECDSASignature\$$SHA384.class" >> $@ + $(ECHO) "sun/security/ec/ECDSASignature\$$SHA512.class" >> $@ $(ECHO) "com/sun/net/ssl/internal/ssl/" >> $@ $(ECHO) "javax/crypto/" >> $@ $(ECHO) "sun/security/internal/" >> $@ @@ -629,7 +643,54 @@ $(NOT_RT_JAR_LIST): FRC $(ECHO) "sun/tools/jmap/" >> $@ $(ECHO) "sun/net/spi/nameservice/dns/" >> $@ $(ECHO) "META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor" >> $@ - $(ECHO) $(patsubst $(CLASSBINDIR)/%,%,$(LOCALEDATA_JAR_FILES)) | sed 's/ /\n/g' >> $@ + $(ECHO) "javax/swing/AbstractButtonBeanInfo.class" >> $@ + $(ECHO) "javax/swing/BoxBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JAppletBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JButtonBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JCheckBoxBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JCheckBoxMenuItemBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JColorChooserBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JComboBoxBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JComponentBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JDesktopPaneBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JDialogBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JEditorPaneBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JFileChooserBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JFormattedTextFieldBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JFrameBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JInternalFrameBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JLabelBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JLayeredPaneBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JListBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JMenuBarBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JMenuBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JMenuItemBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JOptionPaneBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JPanelBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JPasswordFieldBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JPopupMenuBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JProgressBarBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JRadioButtonBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JRadioButtonMenuItemBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JScrollBarBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JScrollPaneBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JSeparatorBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JSliderBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JSpinnerBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JSplitPaneBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JTabbedPaneBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JTableBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JTextAreaBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JTextFieldBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JTextPaneBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JToggleButtonBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JToolBarBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JTreeBeanInfo.class" >> $@ + $(ECHO) "javax/swing/JWindowBeanInfo.class" >> $@ + $(ECHO) "javax/swing/SwingBeanInfoBase.class" >> $@ + $(ECHO) "javax/swing/text/JTextComponentBeanInfo.class" >> $@ + $(ECHO) "sun/swing/BeanInfoUtils.class" >> $@ + $(ECHO) $(patsubst $(CLASSBINDIR)/%,%,$(LOCALEDATA_JAR_FILES)) | $(TR) " " "\n" >> $@ ifndef OPENJDK ifndef JAVASE_EMBEDDED $(ECHO) "com/oracle/jrockit/jfr/" >> $@ @@ -646,8 +707,47 @@ ifndef JAVASE_EMBEDDED $(ECHO) "oracle/jrockit/jfr/util/os/" >> $@ $(ECHO) "oracle/jrockit/jfr/util/text/" >> $@ endif +endif + (cd $(JDK_OUTPUTDIR)/classes && $(FIND) . -name "_the.*") >> $@ +ifeq ($(PLATFORM), macosx) + $(ECHO) "com/sun/nio/sctp/" >> $@ + $(ECHO) "sun/nio/ch/sctp/" >> $@ + $(ECHO) "sun/jdbc/" >> $@ + $(ECHO) "sun/nio/ch/DevPollArrayWrapper\$$Updator.class" >> $@ + $(ECHO) "sun/nio/ch/DevPollArrayWrapper.class" >> $@ + $(ECHO) "sun/nio/ch/DevPollSelectorImpl.class" >> $@ + $(ECHO) "sun/nio/ch/DevPollSelectorProvider.class" >> $@ + $(ECHO) "sun/nio/ch/EPollArrayWrapper\$$Updator.class" >> $@ + $(ECHO) "sun/nio/ch/EPollArrayWrapper.class" >> $@ + $(ECHO) "sun/nio/ch/EPollSelectorImpl.class" >> $@ + $(ECHO) "sun/nio/ch/EPollSelectorProvider.class" >> $@ endif +###################################################### +# List of directories in classes directory that should NOT be in resources.jar +###################################################### + +NOT_RESOURCES_JAR_LIST = $(IMAGES_OUTPUTDIR)/tmp/not_resources_jar.list + +$(NOT_RESOURCES_JAR_LIST): FRC + $(prep-target) + $(ECHO) "#\n" >> $@ + $(ECHO) "# List of subdirectories not in include in resources.jar" >> $@ + $(ECHO) "# Directories must contain trailing '/'." >> $@ + $(ECHO) "javax/swing/beaninfo/" >> $@ + +TOTAL_JAR_EXCLUDE_LIST = $(IMAGES_OUTPUTDIR)/tmp/total_jar_exclude.list + +###################################################### +# Total exclude list +###################################################### + +$(TOTAL_JAR_EXCLUDE_LIST): $(NOT_RT_JAR_LIST) $(NOT_RESOURCES_JAR_LIST) + $(prep-target) + $(ECHO) "#\n" >> $@ + $(ECHO) "# List of subdirectories not in include in resources.jar" >> $@ + $(CAT) $(NOT_RT_JAR_LIST) >>$@ + $(CAT) $(NOT_RESOURCES_JAR_LIST) >>$@ # File order list for rt.jar # - sun.applet is included, till hotjava stops relying on it. @@ -660,12 +760,12 @@ JARFILELISTS_TEMPDIR=$(IMAGES_OUTPUTDIR)/tmp/jarfilelists RT_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/rt_jar_list RES_JAR_FILELIST=$(JARFILELISTS_TEMPDIR)/resources_jar_list -$(TOTAL_JAR_FILELIST): $(BUILD_TOOLS) $(NOT_RT_JAR_LIST) +$(TOTAL_JAR_FILELIST): $(BUILD_TOOLS) $(TOTAL_JAR_EXCLUDE_LIST) $(prep-target) $(RM) $@.temp ($(CD) $(CLASSBINDIR) && \ $(TOOL_JARREORDER) \ - -o $@.temp $(ABS_LIBDIR)/classlist $(NOT_RT_JAR_LIST) . ) + -o $@.temp $(ABS_LIBDIR)/classlist $(TOTAL_JAR_EXCLUDE_LIST) . ) $(MV) $@.temp $@ ($(CD) $(CLASSBINDIR) && $(java-vm-cleanup)) @@ -1181,7 +1281,7 @@ endif @# @# Swing BeanInfo generation @# - $(CD) javax/swing/beaninfo && $(MAKE) TEMPDIR=$(IMAGES_OUTPUTDIR)/tmp ABS_TEMPDIR=$(IMAGES_OUTPUTDIR)/tmp swing-1.2-beans + $(CP) $(JDK_OUTPUTDIR)/lib/dt.jar $(JDK_IMAGE_DIR)/lib/dt.jar ifneq ($(PLATFORM), windows) $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES)) endif # !windows diff --git a/jdk/makefiles/common/shared/Defs-utils.gmk b/jdk/makefiles/common/shared/Defs-utils.gmk deleted file mode 100644 index 4c38e4b3aa9..00000000000 --- a/jdk/makefiles/common/shared/Defs-utils.gmk +++ /dev/null @@ -1,2 +0,0 @@ -# Purposely empty for now, should be removed eventually. - diff --git a/jdk/makefiles/common/shared/Defs.gmk b/jdk/makefiles/common/shared/Defs.gmk index 9a8236c495a..89af038a7cb 100644 --- a/jdk/makefiles/common/shared/Defs.gmk +++ b/jdk/makefiles/common/shared/Defs.gmk @@ -51,9 +51,6 @@ -include $(SPEC) -include $(VARS) -# Get shared system utilities macros defined -include $(JDK_MAKE_SHARED_DIR)/Defs-utils.gmk - # Assumes ARCH, PLATFORM, ARCH_VM_SUBDIR, JDK_TOPDIR, etc. have been defined. # Simple pwd path @@ -663,4 +660,3 @@ endef # Up until we include this file, we don't know what specific compiler # version is actually being used (i.e. what is in PATH or COMPILER_PATH). include $(JDK_MAKE_SHARED_DIR)/Compiler-$(CC_VERSION).gmk - diff --git a/jdk/makefiles/docs/CORE_PKGS.gmk b/jdk/makefiles/docs/CORE_PKGS.gmk index 84c8986370c..6b5f4af797a 100644 --- a/jdk/makefiles/docs/CORE_PKGS.gmk +++ b/jdk/makefiles/docs/CORE_PKGS.gmk @@ -64,7 +64,7 @@ ACTIVE_JSR_PKGS= \ javax.management.* \ javax.script \ javax.sql.* \ - javax.tools \ + javax.tools.* \ javax.xml.* \ org.w3c.* \ org.xml.sax @@ -218,6 +218,7 @@ CORE_PKGS = \ javax.swing.plaf.nimbus \ javax.swing.plaf.synth \ javax.tools \ + javax.tools.annotation \ javax.transaction \ javax.transaction.xa \ javax.xml.parsers \ diff --git a/jdk/makefiles/java/Makefile b/jdk/makefiles/java/Makefile index 6d9f5dadbe3..57399f5ac83 100644 --- a/jdk/makefiles/java/Makefile +++ b/jdk/makefiles/java/Makefile @@ -34,30 +34,19 @@ include $(BUILDDIR)/common/Defs.gmk # # The order of subdirs here is important # -SUBDIRS += jvm redist verify fdlibm java sun_nio jli main +SUBDIRS += redist # Others # Note: java_crw_demo java_hprof_demo are demos but must be delivered built in sdk -SUBDIRS += security util net nio +SUBDIRS += + +SUBDIRS_management = +SUBDIRS_misc = -SUBDIRS_management = management -SUBDIRS_misc = npt java_crw_demo java_hprof_demo \ - instrument #TODO Check invoke # logging instrument invoke sql rmi - -ifeq ($(PLATFORM), solaris) - ifeq ($(ARCH_DATA_MODEL), 32) - SUBDIRS += jexec - endif -endif # PLATFORM - -ifeq ($(PLATFORM), linux) - SUBDIRS += jexec -endif # PLATFORM - ifeq ($(PLATFORM), macosx) SUBDIRS += jobjc endif # PLATFORM diff --git a/jdk/makefiles/java/fdlibm/FILES_c.gmk b/jdk/makefiles/java/fdlibm/FILES_c.gmk deleted file mode 100644 index cc7a1ad06d1..00000000000 --- a/jdk/makefiles/java/fdlibm/FILES_c.gmk +++ /dev/null @@ -1,88 +0,0 @@ -# -# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - k_standard.c \ - k_rem_pio2.c \ - k_cos.c \ - k_sin.c \ - k_tan.c \ - e_acos.c \ - e_asin.c \ - e_atan2.c \ - e_atanh.c \ - e_cosh.c \ - e_exp.c \ - e_fmod.c \ - e_hypot.c \ - e_log.c \ - e_log10.c \ - e_pow.c \ - e_rem_pio2.c \ - e_remainder.c \ - e_scalb.c \ - e_sinh.c \ - e_sqrt.c \ - w_acos.c \ - w_asin.c \ - w_atan2.c \ - w_atanh.c \ - w_cosh.c \ - w_exp.c \ - w_fmod.c \ - w_hypot.c \ - w_log.c \ - w_log10.c \ - w_pow.c \ - w_remainder.c \ - w_scalb.c \ - w_sinh.c \ - w_sqrt.c \ - s_atan.c \ - s_cbrt.c \ - s_ceil.c \ - s_copysign.c \ - s_cos.c \ - s_expm1.c \ - s_fabs.c \ - s_finite.c \ - s_floor.c \ - s_frexp.c \ - s_ilogb.c \ - s_isnan.c \ - s_ldexp.c \ - s_lib_version.c \ - s_log1p.c \ - s_logb.c \ - s_matherr.c \ - s_modf.c \ - s_nextafter.c \ - s_rint.c \ - s_scalbn.c \ - s_signgam.c \ - s_significand.c \ - s_sin.c \ - s_tan.c \ - s_tanh.c diff --git a/jdk/makefiles/java/fdlibm/Makefile b/jdk/makefiles/java/fdlibm/Makefile deleted file mode 100644 index 36a9611e69b..00000000000 --- a/jdk/makefiles/java/fdlibm/Makefile +++ /dev/null @@ -1,93 +0,0 @@ -# -# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for fdlibm -# -# Note: -# The fdlibm libraries are built using special rules in Library.gmk. -# - -BUILDDIR = ../.. -LIBRARY = fdlibm -PRODUCT = java - -include $(BUILDDIR)/common/Defs.gmk - -# -# Where is fdlibm in the source tree? -# -FDLIBM_SRC = $(SHARE_SRC)/native/java/lang/fdlibm - -# Windows: compiler flags -ifeq ($(PLATFORM),windows) - # Turn all optimizations off - OPTIMIZATION_LEVEL = NONE - FASTDEBUG_OPTIMIZATION_LEVEL = NONE - OTHER_CFLAGS = - CPPFLAGS_DBG += -DLOGGING -endif - -# -# Linux: Disable optimization to get correctly reproducible -# floating-point results. -# -ifeq ($(PLATFORM),linux) - # Turn all optimizations off - OPTIMIZATION_LEVEL = NONE - FASTDEBUG_OPTIMIZATION_LEVEL = NONE -endif - -ifeq ($(PLATFORM),macosx) - # Turn all optimizations off - OPTIMIZATION_LEVEL = NONE - FASTDEBUG_OPTIMIZATION_LEVEL = NONE -endif - -# -# Include path. -# -OTHER_INCLUDES = -I$(FDLIBM_SRC)/include - -# -# Things that must be linked in. -# -OTHER_LDLIBS = - -# -# Files to compile. -# -include FILES_c.gmk - -# -# Rules for the .a file. -# -include $(BUILDDIR)/common/Library.gmk - -# -# Find fdlibm source files. -# -vpath %.c -vpath %.c $(FDLIBM_SRC)/src diff --git a/jdk/makefiles/java/instrument/Makefile b/jdk/makefiles/java/instrument/Makefile deleted file mode 100644 index 76a05537290..00000000000 --- a/jdk/makefiles/java/instrument/Makefile +++ /dev/null @@ -1,149 +0,0 @@ -# -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# Makefile for building the Java Programming Language Instrumentation Services -# agent, supporting java.lang.instrument - -BUILDDIR = ../.. -PACKAGE = sun.instrument -LIBRARY = instrument -PRODUCT = sun - -# Configure the CFLAGS for this library. Use static binding so that there -# are not dependencies on modules not on the search patch when invoked from -# the Windows system directory (or elsewhere). -MS_RUNTIME_STATIC=true - -FILES_m = mapfile-vers - -JAVAC_MAX_WARNINGS = true -JAVAC_WARNINGS_FATAL = true - -include $(BUILDDIR)/common/Defs.gmk - -# Use the mapfile-vers (See the mapfile located with this Makefile) -ifdef FILES_m -include $(BUILDDIR)/common/Mapfile-vers.gmk -endif - -# -# Files to compile. -# -FILES_c = \ - EncodingSupport.c \ - EncodingSupport_md.c \ - FileSystemSupport_md.c \ - InstrumentationImplNativeMethods.c \ - InvocationAdapter.c \ - JarFacade.c \ - JPLISAgent.c \ - JPLISAssert.c \ - JavaExceptions.c \ - PathCharsValidator.c \ - Reentrancy.c \ - Utilities.c - -# -# -jaragent support requires zip and jar manfiest parser to be compiled -# into the instrument library. -# -IO_PLATFORM_SRC = $(PLATFORM_SRC)/native/java/io -LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin -LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin - -FILES_c += \ - canonicalize_md.c - -FILES_export = \ - sun/instrument/InstrumentationImpl.java - -# -# This controls the ability to do logging in the library. -# -CPPFLAGS_DBG += -DJPLIS_LOGGING -CPPFLAGS_OPT += -DNO_JPLIS_LOGGING - -OTHER_INCLUDES = -I$(SHARE_SRC)/instrument -OTHER_INCLUDES += -I$(PLATFORM_SRC)/instrument -OTHER_INCLUDES += -I$(IO_PLATFORM_SRC) -OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) -I$(LAUNCHER_PLATFORM_SRC) - -# -# Create a dependency on libjli (Java Launcher Infrastructure) -# -# On UNIX, this is a relative dependency using $ORIGIN. Unfortunately, to -# do this reliably on Linux takes a different syntax than Solaris. -# -# On Windows, this is done by using the same directory as the executable -# itself, as with all the Windows libraries. -# -ifeq ($(PLATFORM), windows) - OTHER_LDLIBS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/jli.lib - OTHER_LCF += -export:Agent_OnAttach - # equivalent of strcasecmp is stricmp on Windows - CPPFLAGS_COMMON += -Dstrcasecmp=stricmp -else -ifneq (,$(findstring $(PLATFORM), macosx)) - ifneq ($(ARCH), universal) - LDFLAGS += -Wl,-all_load - endif - LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a - OTHER_LDLIBS += -liconv - ifeq ($(SYSTEM_ZLIB), true) - OTHER_LDLIBS += -lz - endif -else - LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli - OTHER_LDLIBS += -ljli - OTHER_LDLIBS += -ldl - ifeq ($(PLATFORM), solaris) - LDFLAGS += -R \$$ORIGIN/jli - endif - ifeq ($(PLATFORM), linux) - LDFLAGS += $(LDFLAG_Z_ORIGIN) - LDFLAGS += -Wl,--allow-shlib-undefined - LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli - endif -endif -endif - -ifeq ($(PLATFORM), macosx) - LDFLAGS += -framework Cocoa -framework Security -framework ApplicationServices -endif - -# -# Library to compile. -# -include $(BUILDDIR)/common/Library.gmk - -# We don't want to link against -ljava -JAVALIB= - -# -# Add to ambient vpath so we pick up the library files -# -vpath %.c $(SHARE_SRC)/instrument $(PLATFORM_SRC)/instrument -vpath %.c $(IO_PLATFORM_SRC) - diff --git a/jdk/makefiles/java/java/Exportedfiles.gmk b/jdk/makefiles/java/java/Exportedfiles.gmk deleted file mode 100644 index 3eac7db2d39..00000000000 --- a/jdk/makefiles/java/java/Exportedfiles.gmk +++ /dev/null @@ -1,178 +0,0 @@ -# -# Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# These are the names of JAVA classes for which we will make .h files. -# -ifneq ($(PLATFORM), windows) -FILES_export = \ - java/lang/Object.java \ - java/lang/Class.java \ - java/lang/Compiler.java \ - java/lang/String.java \ - java/lang/Thread.java \ - java/lang/ThreadGroup.java \ - java/lang/StrictMath.java \ - java/lang/Number.java \ - java/lang/Byte.java \ - java/lang/Short.java \ - java/lang/Integer.java \ - java/lang/Long.java \ - java/lang/Float.java \ - java/lang/Double.java \ - java/lang/Boolean.java \ - java/lang/Character.java \ - java/lang/System.java \ - java/lang/ClassLoader.java \ - java/lang/Runtime.java \ - java/lang/SecurityManager.java \ - java/lang/Shutdown.java \ - java/lang/Package.java \ - java/lang/ref/Finalizer.java \ - java/lang/reflect/AccessibleObject.java \ - java/lang/reflect/Field.java \ - java/lang/reflect/Method.java \ - java/lang/reflect/Constructor.java \ - java/lang/reflect/InvocationTargetException.java \ - java/lang/reflect/Array.java \ - java/lang/reflect/Proxy.java \ - java/security/AccessController.java \ - java/util/Date.java \ - java/util/TimeZone.java \ - java/util/ResourceBundle.java \ - java/util/concurrent/atomic/AtomicLong.java \ - java/util/prefs/FileSystemPreferences.java \ - java/io/Console.java \ - java/io/FileDescriptor.java \ - java/io/InputStream.java \ - java/io/FileInputStream.java \ - java/io/FileOutputStream.java \ - java/io/PrintStream.java \ - java/io/RandomAccessFile.java \ - java/io/DataInputStream.java \ - java/io/DataOutputStream.java \ - java/io/File.java \ - java/io/FileSystem.java \ - java/io/UnixFileSystem.java \ - java/io/ObjectInputStream.java \ - java/io/ObjectOutputStream.java \ - java/io/ObjectStreamClass.java \ - java/lang/Throwable.java \ - java/lang/NoClassDefFoundError.java \ - java/lang/StringIndexOutOfBoundsException.java \ - java/lang/OutOfMemoryError.java \ - sun/misc/Version.java \ - sun/misc/VM.java \ - sun/misc/VMSupport.java \ - sun/misc/Signal.java \ - sun/misc/MessageUtils.java \ - sun/misc/NativeSignalHandler.java \ - sun/misc/GC.java \ - sun/reflect/ConstantPool.java \ - sun/reflect/NativeConstructorAccessorImpl.java \ - sun/reflect/NativeMethodAccessorImpl.java \ - sun/reflect/Reflection.java - -EXPORTED_inner = \ - java.lang.ClassLoader$$NativeLibrary - -else # PLATFORM -FILES_export = \ - java/lang/Object.java \ - java/lang/Class.java \ - java/lang/Compiler.java \ - java/lang/String.java \ - java/lang/Thread.java \ - java/lang/ThreadGroup.java \ - java/lang/StrictMath.java \ - java/lang/Number.java \ - java/lang/Byte.java \ - java/lang/Short.java \ - java/lang/Integer.java \ - java/lang/Long.java \ - java/lang/Float.java \ - java/lang/Double.java \ - java/lang/Boolean.java \ - java/lang/System.java \ - java/lang/Package.java \ - java/lang/ClassLoader.java \ - java/lang/Runtime.java \ - java/lang/SecurityManager.java \ - java/lang/Shutdown.java \ - java/lang/reflect/AccessibleObject.java \ - java/lang/reflect/Field.java \ - java/lang/reflect/Method.java \ - java/lang/reflect/Constructor.java \ - java/lang/reflect/InvocationTargetException.java \ - java/lang/reflect/Array.java \ - java/lang/reflect/Proxy.java \ - java/lang/ref/Reference.java \ - java/lang/ref/Finalizer.java \ - java/util/Date.java \ - java/util/Properties.java \ - java/util/ResourceBundle.java \ - java/util/TimeZone.java \ - java/util/concurrent/atomic/AtomicLong.java \ - java/util/prefs/WindowsPreferences.java \ - java/util/prefs/WindowsPreferencesFactory.java \ - java/util/logging/FileHandler.java \ - java/io/Console.java \ - java/io/FileSystem.java \ - java/io/FileDescriptor.java \ - java/io/InputStream.java \ - java/io/FileInputStream.java \ - java/io/FileOutputStream.java \ - java/io/PrintStream.java \ - java/io/RandomAccessFile.java \ - java/io/DataInputStream.java \ - java/io/DataOutputStream.java \ - java/io/File.java \ - java/io/ObjectOutputStream.java \ - java/io/ObjectInputStream.java \ - java/io/ObjectStreamClass.java \ - java/lang/Throwable.java \ - java/lang/NoClassDefFoundError.java \ - java/lang/StringIndexOutOfBoundsException.java \ - java/lang/OutOfMemoryError.java \ - java/lang/ProcessImpl.java \ - sun/misc/Version.java \ - sun/misc/VM.java \ - sun/misc/VMSupport.java \ - sun/misc/GC.java \ - sun/misc/Signal.java \ - sun/misc/NativeSignalHandler.java \ - sun/misc/MessageUtils.java \ - java/security/AccessController.java \ - sun/reflect/ConstantPool.java \ - sun/reflect/NativeConstructorAccessorImpl.java \ - sun/reflect/NativeMethodAccessorImpl.java \ - sun/reflect/Reflection.java \ - sun/security/provider/NativeSeedGenerator.java \ - sun/io/Win32ErrorMode.java - -EXPORTED_inner = \ - java.lang.ClassLoader$$NativeLibrary - -endif # PLATFORM diff --git a/jdk/makefiles/java/java/FILES_c.gmk b/jdk/makefiles/java/java/FILES_c.gmk deleted file mode 100644 index a8256b78e16..00000000000 --- a/jdk/makefiles/java/java/FILES_c.gmk +++ /dev/null @@ -1,82 +0,0 @@ -# -# Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - AccessController.c \ - Array.c \ - String.c \ - Class.c \ - ClassLoader.c \ - Compiler.c \ - Console_md.c \ - Double.c \ - FileSystem_md.c \ - FileDescriptor_md.c \ - FileInputStream.c \ - FileInputStream_md.c \ - FileOutputStream_md.c \ - Finalizer.c \ - Float.c \ - Object.c \ - ObjectOutputStream.c \ - ObjectInputStream.c \ - ObjectStreamClass.c \ - Package.c \ - ProcessEnvironment_md.c \ - Proxy.c \ - RandomAccessFile.c \ - RandomAccessFile_md.c \ - ResourceBundle.c \ - Runtime.c \ - SecurityManager.c \ - Shutdown.c \ - StrictMath.c \ - System.c \ - Thread.c \ - Throwable.c \ - Signal.c \ - NativeSignalHandler.c \ - verify_stub.c \ - io_util.c \ - io_util_md.c \ - jio.c \ - logging.c \ - jni_util.c \ - jni_util_md.c \ - jdk_util.c \ - jdk_util_md.c \ - check_version.c \ - java_props_md.c \ - DriverManager.c \ - ConstantPool.c \ - MessageUtils.c \ - GC.c \ - NativeAccessors.c \ - Reflection.c \ - Bits.c \ - AtomicLong.c \ - Version.c \ - VM.c \ - VMSupport.c diff --git a/jdk/makefiles/java/java/FILES_java.gmk b/jdk/makefiles/java/java/FILES_java.gmk deleted file mode 100644 index 7a6d93a8f37..00000000000 --- a/jdk/makefiles/java/java/FILES_java.gmk +++ /dev/null @@ -1,489 +0,0 @@ -# -# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# This is the list of java classes that will be automatically built -# from sources. See Exportedfiles.gmk for the list of files which -# will generate header files -# -JAVA_JAVA_java = \ - java/lang/Object.java \ - java/lang/AutoCloseable.java \ - java/lang/Class.java \ - java/lang/Thread.java \ - java/lang/Character.java \ - java/lang/CharacterData.java \ - java/lang/CharacterName.java \ - sun/misc/ASCIICaseInsensitiveComparator.java \ - sun/misc/VM.java \ - sun/misc/Signal.java \ - sun/misc/NativeSignalHandler.java \ - java/lang/ThreadGroup.java \ - java/lang/ThreadLocal.java \ - java/lang/InheritableThreadLocal.java \ - java/lang/String.java \ - java/lang/ConditionalSpecialCasing.java \ - java/lang/StringCoding.java \ - java/lang/StringBuffer.java \ - java/lang/StringBuilder.java \ - java/lang/SuppressWarnings.java \ - java/lang/AbstractStringBuilder.java \ - java/lang/ClassLoader.java \ - java/lang/AssertionStatusDirectives.java \ - java/lang/Enum.java \ - java/lang/StrictMath.java \ - java/lang/Math.java \ - sun/misc/FloatingDecimal.java \ - sun/misc/FormattedFloatingDecimal.java \ - java/lang/Number.java \ - java/lang/Byte.java \ - java/lang/Short.java \ - java/lang/Integer.java \ - java/lang/Long.java \ - java/lang/Float.java \ - java/lang/Double.java \ - java/lang/Boolean.java \ - java/lang/Void.java \ - java/lang/Runnable.java \ - java/lang/Cloneable.java \ - java/lang/CharSequence.java \ - java/lang/SecurityManager.java \ - java/lang/Runtime.java \ - java/lang/RuntimePermission.java \ - java/lang/ApplicationShutdownHooks.java \ - java/lang/Shutdown.java \ - java/lang/Terminator.java \ - java/lang/System.java \ - java/lang/Compiler.java \ - java/lang/Throwable.java \ - java/lang/Exception.java \ - java/lang/ReflectiveOperationException.java \ - java/lang/IllegalAccessException.java \ - java/lang/InstantiationException.java \ - java/lang/ClassNotFoundException.java \ - java/lang/CloneNotSupportedException.java \ - java/lang/InterruptedException.java \ - java/lang/NoSuchFieldException.java \ - java/lang/NoSuchMethodException.java \ - java/lang/RuntimeException.java \ - java/lang/ArithmeticException.java \ - java/lang/ArrayStoreException.java \ - java/lang/ClassCastException.java \ - java/lang/IndexOutOfBoundsException.java \ - java/lang/ArrayIndexOutOfBoundsException.java \ - java/lang/StringIndexOutOfBoundsException.java \ - java/lang/NegativeArraySizeException.java \ - java/lang/NullPointerException.java \ - java/lang/IllegalStateException.java \ - java/lang/IllegalArgumentException.java \ - java/lang/NumberFormatException.java \ - java/lang/IllegalThreadStateException.java \ - java/lang/IllegalMonitorStateException.java \ - java/lang/SecurityException.java \ - java/lang/TypeNotPresentException.java \ - java/lang/EnumConstantNotPresentException.java \ - java/lang/UnsupportedOperationException.java \ - java/lang/Error.java \ - java/lang/AssertionError.java \ - java/lang/ThreadDeath.java \ - java/lang/LinkageError.java \ - java/lang/ClassCircularityError.java \ - java/lang/ClassFormatError.java \ - java/lang/UnsupportedClassVersionError.java \ - java/lang/ExceptionInInitializerError.java \ - java/lang/IncompatibleClassChangeError.java \ - java/lang/AbstractMethodError.java \ - java/lang/IllegalAccessError.java \ - java/lang/InstantiationError.java \ - java/lang/NoSuchFieldError.java \ - java/lang/NoSuchMethodError.java \ - java/lang/NoClassDefFoundError.java \ - java/lang/UnsatisfiedLinkError.java \ - java/lang/VerifyError.java \ - java/lang/VirtualMachineError.java \ - java/lang/InternalError.java \ - java/lang/OutOfMemoryError.java \ - java/lang/StackOverflowError.java \ - java/lang/UnknownError.java \ - java/lang/StackTraceElement.java \ - java/lang/Package.java \ - java/lang/Process.java \ - java/lang/ProcessBuilder.java \ - java/lang/ProcessEnvironment.java \ - java/lang/ProcessImpl.java \ - java/lang/Appendable.java \ - java/lang/Comparable.java \ - java/lang/Readable.java \ - java/lang/Override.java \ - java/lang/SafeVarargs.java \ - java/lang/SuppressWarnings.java \ - java/lang/ref/Reference.java \ - java/lang/ref/SoftReference.java \ - java/lang/ref/WeakReference.java \ - java/lang/ref/FinalReference.java \ - java/lang/ref/PhantomReference.java \ - java/lang/ref/ReferenceQueue.java \ - java/lang/ref/Finalizer.java \ - java/util/BitSet.java \ - java/util/Calendar.java \ - java/util/GregorianCalendar.java \ - sun/util/BuddhistCalendar.java \ - java/util/JapaneseImperialCalendar.java \ - sun/util/calendar/CalendarDate.java \ - sun/util/calendar/ImmutableGregorianDate.java \ - sun/util/calendar/CalendarSystem.java \ - sun/util/calendar/Era.java \ - sun/util/calendar/CalendarUtils.java \ - sun/util/calendar/AbstractCalendar.java \ - sun/util/calendar/BaseCalendar.java \ - sun/util/calendar/Gregorian.java \ - sun/util/calendar/JulianCalendar.java \ - sun/util/calendar/LocalGregorianCalendar.java \ - java/util/Currency.java \ - java/util/Date.java \ - java/util/Dictionary.java \ - java/util/EmptyStackException.java \ - java/util/Enumeration.java \ - java/util/EventListener.java \ - java/util/EventListenerProxy.java \ - java/util/EventObject.java \ - java/util/Formatter.java \ - java/util/Formattable.java \ - java/util/FormattableFlags.java \ - java/util/IllegalFormatException.java \ - java/util/DuplicateFormatFlagsException.java \ - java/util/FormatFlagsConversionMismatchException.java \ - java/util/IllegalFormatCodePointException.java \ - java/util/IllegalFormatConversionException.java \ - java/util/IllegalFormatFlagsException.java \ - java/util/IllegalFormatPrecisionException.java \ - java/util/IllegalFormatWidthException.java \ - java/util/MissingFormatArgumentException.java \ - java/util/MissingFormatWidthException.java \ - java/util/UnknownFormatConversionException.java \ - java/util/UnknownFormatFlagsException.java \ - java/util/IllformedLocaleException.java \ - java/util/FormatterClosedException.java \ - java/util/ListResourceBundle.java \ - sun/util/EmptyListResourceBundle.java \ - java/util/Locale.java \ - sun/util/locale/BaseLocale.java \ - sun/util/locale/Extension.java \ - sun/util/locale/InternalLocaleBuilder.java \ - sun/util/locale/LanguageTag.java \ - sun/util/locale/LocaleExtensions.java \ - sun/util/locale/LocaleObjectCache.java \ - sun/util/locale/LocaleSyntaxException.java \ - sun/util/locale/LocaleUtils.java \ - sun/util/locale/ParseStatus.java \ - sun/util/locale/StringTokenIterator.java \ - sun/util/locale/UnicodeLocaleExtension.java \ - java/util/LocaleISOData.java \ - sun/util/LocaleServiceProviderPool.java \ - sun/util/LocaleDataMetaInfo.java \ - java/util/MissingResourceException.java \ - java/util/NoSuchElementException.java \ - java/util/Observable.java \ - java/util/Observer.java \ - java/util/Properties.java \ - java/util/InvalidPropertiesFormatException.java \ - java/util/PropertyPermission.java \ - java/util/PropertyResourceBundle.java \ - java/util/Random.java \ - java/util/ResourceBundle.java \ - sun/util/ResourceBundleEnumeration.java \ - sun/util/CoreResourceBundleControl.java \ - java/util/Scanner.java \ - java/util/InputMismatchException.java \ - java/util/Stack.java \ - java/util/StringTokenizer.java \ - java/util/TimeZone.java \ - java/util/SimpleTimeZone.java \ - sun/util/TimeZoneNameUtility.java \ - sun/util/calendar/ZoneInfo.java \ - sun/util/calendar/ZoneInfoFile.java \ - sun/util/calendar/TzIDOldMapping.java \ - java/util/TooManyListenersException.java \ - java/util/Comparator.java \ - java/util/Collections.java \ - java/util/Iterator.java \ - java/util/ListIterator.java \ - java/util/Collection.java \ - java/util/Set.java \ - java/util/SortedSet.java \ - java/util/NavigableSet.java \ - java/util/List.java \ - java/util/Queue.java \ - java/util/Deque.java \ - java/util/AbstractCollection.java \ - java/util/AbstractSet.java \ - java/util/HashSet.java \ - java/util/LinkedHashSet.java \ - java/util/TreeSet.java \ - java/util/EnumSet.java \ - java/util/RegularEnumSet.java \ - java/util/JumboEnumSet.java \ - java/util/AbstractList.java \ - java/util/ArrayList.java \ - java/util/Vector.java \ - java/util/AbstractSequentialList.java \ - java/util/LinkedList.java \ - java/util/AbstractQueue.java \ - java/util/PriorityQueue.java \ - java/util/ArrayDeque.java \ - java/util/Map.java \ - java/util/SortedMap.java \ - java/util/NavigableMap.java \ - java/util/AbstractMap.java \ - java/util/HashMap.java \ - java/util/LinkedHashMap.java \ - java/util/TreeMap.java \ - java/util/Hashtable.java \ - java/util/WeakHashMap.java \ - java/util/IdentityHashMap.java \ - java/util/EnumMap.java \ - java/util/Arrays.java \ - java/util/DualPivotQuicksort.java \ - java/util/TimSort.java \ - java/util/ComparableTimSort.java \ - java/util/ConcurrentModificationException.java \ - java/util/ServiceLoader.java \ - java/util/ServiceConfigurationError.java \ - java/util/Timer.java \ - java/util/TimerTask.java \ - java/util/Objects.java \ - java/util/UUID.java \ - java/util/concurrent/AbstractExecutorService.java \ - java/util/concurrent/ArrayBlockingQueue.java \ - java/util/concurrent/BlockingDeque.java \ - java/util/concurrent/BlockingQueue.java \ - java/util/concurrent/BrokenBarrierException.java \ - java/util/concurrent/Callable.java \ - java/util/concurrent/CancellationException.java \ - java/util/concurrent/CompletionService.java \ - java/util/concurrent/ConcurrentHashMap.java \ - java/util/concurrent/ConcurrentLinkedDeque.java \ - java/util/concurrent/ConcurrentLinkedQueue.java \ - java/util/concurrent/ConcurrentMap.java \ - java/util/concurrent/ConcurrentNavigableMap.java \ - java/util/concurrent/ConcurrentSkipListMap.java \ - java/util/concurrent/ConcurrentSkipListSet.java \ - java/util/concurrent/CopyOnWriteArrayList.java \ - java/util/concurrent/CopyOnWriteArraySet.java \ - java/util/concurrent/CountDownLatch.java \ - java/util/concurrent/CyclicBarrier.java \ - java/util/concurrent/DelayQueue.java \ - java/util/concurrent/Delayed.java \ - java/util/concurrent/Exchanger.java \ - java/util/concurrent/ExecutionException.java \ - java/util/concurrent/Executor.java \ - java/util/concurrent/ExecutorService.java \ - java/util/concurrent/ExecutorCompletionService.java \ - java/util/concurrent/Executors.java \ - java/util/concurrent/ForkJoinPool.java \ - java/util/concurrent/ForkJoinTask.java \ - java/util/concurrent/ForkJoinWorkerThread.java \ - java/util/concurrent/Future.java \ - java/util/concurrent/FutureTask.java \ - java/util/concurrent/LinkedBlockingDeque.java \ - java/util/concurrent/LinkedBlockingQueue.java \ - java/util/concurrent/LinkedTransferQueue.java \ - java/util/concurrent/Phaser.java \ - java/util/concurrent/PriorityBlockingQueue.java \ - java/util/concurrent/RecursiveAction.java \ - java/util/concurrent/RecursiveTask.java \ - java/util/concurrent/RejectedExecutionException.java \ - java/util/concurrent/RejectedExecutionHandler.java \ - java/util/concurrent/RunnableFuture.java \ - java/util/concurrent/RunnableScheduledFuture.java \ - java/util/concurrent/ScheduledExecutorService.java \ - java/util/concurrent/ScheduledFuture.java \ - java/util/concurrent/ScheduledThreadPoolExecutor.java \ - java/util/concurrent/Semaphore.java \ - java/util/concurrent/SynchronousQueue.java \ - java/util/concurrent/ThreadFactory.java \ - java/util/concurrent/ThreadLocalRandom.java \ - java/util/concurrent/ThreadPoolExecutor.java \ - java/util/concurrent/TimeUnit.java \ - java/util/concurrent/TimeoutException.java \ - java/util/concurrent/TransferQueue.java \ - java/util/concurrent/atomic/AtomicBoolean.java \ - java/util/concurrent/atomic/AtomicInteger.java \ - java/util/concurrent/atomic/AtomicIntegerArray.java \ - java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java \ - java/util/concurrent/atomic/AtomicLong.java \ - java/util/concurrent/atomic/AtomicLongArray.java \ - java/util/concurrent/atomic/AtomicLongFieldUpdater.java \ - java/util/concurrent/atomic/AtomicMarkableReference.java \ - java/util/concurrent/atomic/AtomicReference.java \ - java/util/concurrent/atomic/AtomicReferenceArray.java \ - java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java \ - java/util/concurrent/atomic/AtomicStampedReference.java \ - java/util/concurrent/locks/AbstractOwnableSynchronizer.java \ - java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \ - java/util/concurrent/locks/AbstractQueuedSynchronizer.java \ - java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \ - java/util/concurrent/locks/Condition.java \ - java/util/concurrent/locks/Lock.java \ - java/util/concurrent/locks/LockSupport.java \ - java/util/concurrent/locks/ReadWriteLock.java \ - java/util/concurrent/locks/ReentrantLock.java \ - java/util/concurrent/locks/ReentrantReadWriteLock.java \ - java/util/regex/Pattern.java \ - java/util/regex/Matcher.java \ - java/util/regex/MatchResult.java \ - java/util/regex/ASCII.java \ - java/util/regex/UnicodeProp.java \ - java/util/regex/PatternSyntaxException.java \ - java/util/prefs/Preferences.java \ - java/util/prefs/AbstractPreferences.java \ - java/util/prefs/PreferenceChangeEvent.java \ - java/util/prefs/PreferenceChangeListener.java \ - java/util/prefs/NodeChangeEvent.java \ - java/util/prefs/NodeChangeListener.java \ - java/util/prefs/BackingStoreException.java \ - java/util/prefs/InvalidPreferencesFormatException.java \ - java/util/prefs/PreferencesFactory.java \ - java/util/prefs/Base64.java \ - java/util/prefs/XmlSupport.java \ - java/util/spi/CurrencyNameProvider.java \ - java/util/spi/LocaleNameProvider.java \ - java/util/spi/LocaleServiceProvider.java \ - java/util/spi/TimeZoneNameProvider.java \ - java/io/Closeable.java \ - java/io/Flushable.java \ - java/io/PipedInputStream.java \ - java/io/PipedOutputStream.java \ - java/io/IOException.java \ - java/io/CharConversionException.java \ - java/io/FileNotFoundException.java \ - java/io/EOFException.java \ - java/io/SyncFailedException.java \ - java/io/UTFDataFormatException.java \ - java/io/InterruptedIOException.java \ - java/io/UnsupportedEncodingException.java \ - java/io/DataInput.java \ - java/io/DataOutput.java \ - java/io/InputStream.java \ - java/io/FileInputStream.java \ - java/io/FilterInputStream.java \ - java/io/BufferedInputStream.java \ - java/io/DataInputStream.java \ - java/io/ByteArrayInputStream.java \ - java/io/PushbackInputStream.java \ - java/io/SequenceInputStream.java \ - java/io/StringBufferInputStream.java \ - java/io/LineNumberInputStream.java \ - java/io/OutputStream.java \ - java/io/FileOutputStream.java \ - java/io/FilterOutputStream.java \ - java/io/BufferedOutputStream.java \ - java/io/DataOutputStream.java \ - java/io/ByteArrayOutputStream.java \ - java/io/PrintStream.java \ - java/io/RandomAccessFile.java \ - java/io/StreamTokenizer.java \ - java/io/DeleteOnExitHook.java \ - java/io/File.java \ - java/io/FileSystem.java \ - java/io/FileDescriptor.java \ - java/io/FilenameFilter.java \ - java/io/FileFilter.java \ - java/io/FilePermission.java \ - java/io/Serializable.java \ - java/io/Externalizable.java \ - java/io/SerialCallbackContext.java \ - java/io/Bits.java \ - java/io/ObjectInput.java \ - java/io/ObjectInputStream.java \ - java/io/ObjectInputValidation.java \ - java/io/ObjectOutput.java \ - java/io/ObjectOutputStream.java \ - java/io/ObjectStreamClass.java \ - java/io/ObjectStreamConstants.java \ - java/io/ObjectStreamField.java \ - java/io/SerializablePermission.java \ - java/io/InvalidClassException.java \ - java/io/InvalidObjectException.java \ - java/io/NotActiveException.java \ - java/io/NotSerializableException.java \ - java/io/ObjectStreamException.java \ - java/io/OptionalDataException.java \ - java/io/StreamCorruptedException.java \ - java/io/WriteAbortedException.java \ - java/io/Reader.java \ - java/io/BufferedReader.java \ - java/io/LineNumberReader.java \ - java/io/CharArrayReader.java \ - java/io/FilterReader.java \ - java/io/PushbackReader.java \ - java/io/InputStreamReader.java \ - java/io/FileReader.java \ - java/io/PipedReader.java \ - java/io/StringReader.java \ - java/io/Writer.java \ - java/io/BufferedWriter.java \ - java/io/PrintWriter.java \ - java/io/CharArrayWriter.java \ - java/io/FilterWriter.java \ - java/io/OutputStreamWriter.java \ - java/io/FileWriter.java \ - java/io/PipedWriter.java \ - java/io/StringWriter.java \ - java/io/Console.java \ - java/io/ExpiringCache.java \ - java/nio/charset/Charset.java \ - java/nio/charset/CharsetDecoder.java \ - java/nio/charset/CharsetEncoder.java \ - java/nio/charset/UnmappableCharacterException.java \ - java/nio/Bits.java \ - java/nio/DirectByteBuffer.java \ - java/nio/HeapByteBuffer.java \ - java/nio/HeapCharBuffer.java \ - java/security/AccessController.java \ - java/security/ProtectionDomain.java \ - java/net/URLClassLoader.java \ - java/net/URLConnection.java \ - sun/misc/Launcher.java \ - sun/misc/MetaIndex.java \ - sun/misc/URLClassPath.java \ - sun/misc/Version.java \ - sun/misc/FileURLMapper.java \ - sun/misc/MessageUtils.java \ - sun/misc/GC.java \ - sun/misc/Service.java \ - sun/misc/JavaAWTAccess.java \ - sun/misc/JavaLangAccess.java \ - sun/misc/JavaIOAccess.java \ - sun/misc/JavaIOFileDescriptorAccess.java \ - sun/misc/JavaNioAccess.java \ - sun/misc/Perf.java \ - sun/misc/PerfCounter.java \ - sun/net/www/protocol/jar/Handler.java \ - sun/net/www/protocol/jar/JarURLConnection.java \ - sun/net/www/protocol/file/Handler.java \ - sun/net/www/protocol/file/FileURLConnection.java - -FILES_java = $(JAVA_JAVA_java) diff --git a/jdk/makefiles/java/java/Makefile b/jdk/makefiles/java/java/Makefile deleted file mode 100644 index 451fbeaa3a0..00000000000 --- a/jdk/makefiles/java/java/Makefile +++ /dev/null @@ -1,375 +0,0 @@ -# -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for core Java libraries -# (java.lang, java.lang.ref, java.lang.reflect, java.io, java.util) -# - -BUILDDIR = ../.. -PACKAGE = java.lang -LIBRARY = java -PRODUCT = java -SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true -SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true -JAVAC_MAX_WARNINGS=true -include $(BUILDDIR)/common/Defs.gmk - -$(info ENTERING java) - -# windows compiler flags -ifeq ($(PLATFORM),windows) - OTHER_CFLAGS = - # build directly into BINDIR... - LIB_LOCATION = $(BINDIR) - # Exported functions - OTHER_LCF = -export:winFileHandleOpen -export:handleLseek -endif - -OTHER_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ - -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \ - -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \ - -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"' - -ifdef JDK_UPDATE_VERSION -OTHER_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"' -endif - - -# -# Files to compile. -# -include FILES_c.gmk -include FILES_java.gmk -include Exportedfiles.gmk - -ifeq ($(PLATFORM),windows) -FILES_java += java/io/Win32FileSystem.java \ - java/io/WinNTFileSystem.java \ - java/util/prefs/WindowsPreferences.java \ - java/util/prefs/WindowsPreferencesFactory.java - -FILES_c += ProcessImpl_md.c \ - Win32FileSystem_md.c \ - WinNTFileSystem_md.c \ - canonicalize_md.c \ - dirent_md.c \ - TimeZone.c \ - TimeZone_md.c \ - WindowsPreferences.c \ - sun/security/provider/WinCAPISeedGenerator.c \ - sun/io/Win32ErrorMode.c - -else # PLATFORM -FILES_java += java/lang/UNIXProcess.java \ - java/io/UnixFileSystem.java \ - java/util/prefs/FileSystemPreferences.java \ - java/util/prefs/FileSystemPreferencesFactory.java \ - -FILES_c += UNIXProcess_md.c \ - UnixFileSystem_md.c \ - canonicalize_md.c \ - TimeZone.c \ - TimeZone_md.c \ - FileSystemPreferences.c - -INIT += $(GENSRCDIR)/java/lang/UNIXProcess.java - -endif # PLATFORM - -ifeq ($(PLATFORM), macosx) -FILES_c += java_props_macosx.c -FILES_java += java/util/prefs/MacOSXPreferences.java \ - java/util/prefs/MacOSXPreferencesFile.java \ - java/util/prefs/MacOSXPreferencesFactory.java - -CFLAGS_$(VARIANT)/java_props_md.o = -Os -x objective-c -endif - -# -# Make sure first rule does 'all' -# -default_rule: all - -# -# Source files to generate before we try to compile anything -# - -CLASSES_INIT = niosrc rbcontrolsrc - -niosrc: ; ($(CD) ../nio; $(MAKE) sources) - -rbcontrolsrc: $(GENSRCDIR)/sun/util/CoreResourceBundleControl.java - -# -# Add to the default C file search paths -# -vpath %.c $(PLATFORM_SRC)/native/java/lang:$(SHARE_SRC)/native/java/lang -vpath %.c $(SHARE_SRC)/native/java/lang/ref -vpath %.c $(SHARE_SRC)/native/java/lang/reflect -vpath %.c $(SHARE_SRC)/native/java/io -vpath %.c $(PLATFORM_SRC)/native/java/io -vpath %.c $(SHARE_SRC)/native/java/nio -vpath %.c $(SHARE_SRC)/native/java/security -vpath %.c $(SHARE_SRC)/native/common -vpath %.c $(SHARE_SRC)/native/sun/misc -vpath %.c $(SHARE_SRC)/native/sun/reflect -vpath %.c $(SHARE_SRC)/native/java/sql -vpath %.c $(SHARE_SRC)/native/java/util -vpath %.c $(SHARE_SRC)/native/java/util/concurrent/atomic -vpath %.c $(PLATFORM_SRC)/native/common -vpath %.c $(PLATFORM_SRC)/native/java/util -vpath %.c $(PLATFORM_SRC)/native/sun/security/provider -vpath %.c $(PLATFORM_SRC)/native/sun/io - -# -# Includes the fdlibm header file. -# -OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/lang/fdlibm/include - -# -# Also include the io_util.h header file. -# -OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/io -OTHER_INCLUDES += -I$(PLATFORM_SRC)/native/java/io - -# -# Also include the TimeZone_md.h header file. -# -OTHER_INCLUDES += -I$(PLATFORM_SRC)/native/java/util - -# -# Is the altzone extern documented in ctime(3C) available? -# -ifneq ($(PLATFORM), windows) -ifneq ($(PLATFORM), macosx) -HAVE_ALTZONE=true -endif -endif - -ifeq ($(HAVE_ALTZONE),true) -OTHER_CPPFLAGS += -DHAVE_ALTZONE -endif - -# -# System.c needs RELEASE. -# java_props_md.c needs ARCH on non-Solaris platforms. -# -OTHER_CPPFLAGS += $(VERSION_DEFINES) - -# -# Include name of LIBARCH -# -OTHER_CPPFLAGS += -DARCHPROPNAME='"$(ARCHPROP)"' - -# -# Is the key in the call nl_langinfo(CODESET) called something other than -# CODESET? -# -ifdef ALT_CODESET_KEY -OTHER_CPPFLAGS += -DALT_CODESET_KEY=$(ALT_CODESET_KEY) -endif - -# -# Install .lib file. -# -INSTALL_DOT_LIB = true - -# -# What to link? -# On Windows, shell32 is not normally required and so it is delay loaded. -# -ifeq ($(PLATFORM),windows) -OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \ - -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib \ - shell32.lib delayimp.lib /DELAYLOAD:shell32.dll -else -OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) $(LIBSCF) $(LIBDL) \ - -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH) -ifeq ($(PLATFORM), macosx) -OTHER_LDLIBS += \ - -framework CoreFoundation \ - -framework Security \ - -framework SystemConfiguration -endif -endif - -# -# Rules. -# -ifeq ($(PLATFORM), solaris) - ifneq ($(ARCH), amd64) - FILES_reorder += reorder-$(ARCH) - endif -endif - -SUBDIRS = reflect -include $(BUILDDIR)/common/Subdirs.gmk - -all build: - $(SUBDIRS-loop) -clean clobber:: - $(SUBDIRS-loop) - -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -ifeq ($(PLATFORM), solaris) - ifeq ($(CC_VER), 5.8) - ifndef REMOVE_ALL_WORKAROUNDS - CFLAGS_OPT/ObjectInputStream.o = -xO3 \ - $(warning "WARNING: Using workaround for SS11 bug 6346242, on $@") - endif - endif -endif - -ifneq ($(PLATFORM),windows) - -# UNIXProcess.java is different for solaris and linux. We need to copy -# the correct UNIXProcess.java over to $(GENSRCDIR)/java/lang/. - -ifeq ($(PLATFORM), macosx) -PLATFORM_UNIX_PROCESS = \ - $(PLATFORM_SRC)/classes/java/lang/UNIXProcess.java.bsd -else -PLATFORM_UNIX_PROCESS = \ - $(PLATFORM_SRC)/classes/java/lang/UNIXProcess.java.$(PLATFORM) -endif - -$(GENSRCDIR)/java/lang/UNIXProcess.java: $(PLATFORM_UNIX_PROCESS) - $(install-file) - -clean:: - $(RM) $(GENSRCDIR)/java/lang/UNIXProcess.java - -endif - - -# -# Because we can't link against ourselves! -# -JAVALIB = - -# -# Special rules. -# -clean:: - $(RM) -r $(CLASSHDRDIR) - -clobber:: - $(RM) -r $(CLASSBINDIR)/java/io $(CLASSBINDIR)/java/lang \ - $(CLASSBINDIR)/java/security $(CLASSBINDIR)/java/util \ - $(CLASSBINDIR)/sun/misc - -# -# Additional rule from sun/net/GNUmakefile to copy content-type.properties -# file so that the MimeTable class won't complain while bootstrapping... -# -PROPS = content-types.properties - -# -# Rule to copy calendars.properties file. -# -CAL_PROPS = calendars.properties - -# -# Rule to copy tzmappings file on Windows -# -ifeq ($(PLATFORM), windows) -TZMAP = $(LIBDIR)/tzmappings -TZMAPFILE = $(PLATFORM_SRC)/lib/tzmappings - -$(TZMAP): $(TZMAPFILE) - $(install-file) - $(call chmod-file, 444) -endif - -build: $(LIBDIR)/$(PROPS) $(LIBDIR)/$(CAL_PROPS) $(TZMAP) - -$(LIBDIR)/$(PROPS): $(PLATFORM_SRC)/lib/$(PROPS) - $(install-file) - -$(LIBDIR)/$(CAL_PROPS): $(SHARE_SRC)/lib/$(CAL_PROPS) - $(install-file) - -clean:: - $(RM) -r $(LIBDIR)/$(PROPS) $(TZMAP) - -# -# Rules to create lib/currency.data -# - -CURDATA = $(LIBDIR)/currency.data - -build: $(CURDATA) - -$(CURDATA): \ - $(BUILD_TOOLS) \ - $(SHARE_SRC)/classes/java/util/CurrencyData.properties - $(RM) $(CURDATA) - $(TOOL_GENERATECURRENCYDATA) -o $@.temp \ - < $(SHARE_SRC)/classes/java/util/CurrencyData.properties - $(MV) $@.temp $@ - $(call chmod-file, 444) - -clean:: - $(RM) $(CURDATA) - - -# -# Rules to generate classes/java/lang/uniName.dat -# - - - -UNINAME = $(CLASSBINDIR)/java/lang/uniName.dat - -build: $(UNINAME) -$(UNINAME): $(JDK_TOPDIR)/make/tools/UnicodeData/UnicodeData.txt \ - $(BUILD_TOOLS) - @$(prep-target) - $(TOOL_CHARACTERNAME) \ - $(JDK_TOPDIR)/make/tools/UnicodeData/UnicodeData.txt $(UNINAME) - -clean:: - $(RM) $(UNINAME) - -# -# End of rules to create $(GENSRCDIR)/java/lang/CharacterDataXX.java -# - -# -# Rule to precompile CoreResourceBundleControl.java -# -LOCALES_GEN_SH = localelist.sh - -$(GENSRCDIR)/sun/util/CoreResourceBundleControl.java: \ - $(SHARE_SRC)/classes/sun/util/CoreResourceBundleControl-XLocales.java.template $(LOCALES_GEN_SH) - @$(prep-target) - NAWK="$(NAWK)" SED="$(SED)" $(SH) $(LOCALES_GEN_SH) "$(JRE_NONEXIST_LOCALES)" \ - $< $@ -clean:: - $(RM) $(GENSRCDIR)/sun/util/CoreResourceBundleControl.java - diff --git a/jdk/makefiles/java/java/reflect/Makefile b/jdk/makefiles/java/java/reflect/Makefile deleted file mode 100644 index 40bd886c081..00000000000 --- a/jdk/makefiles/java/java/reflect/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for reflection and annotations -# - -BUILDDIR = ../../.. -PACKAGE = java.lang.reflect -PRODUCT = java - -include $(BUILDDIR)/common/Defs.gmk - -# -# Files to compile. -# -AUTO_FILES_JAVA_DIRS = java/lang/reflect sun/reflect - -# -# Install .lib file. -# -INSTALL_DOT_LIB = true - -include $(BUILDDIR)/common/Classes.gmk - -# -# Special rules. -# - -subdirs: classes - -clean:: - $(RM) -r $(CLASSHDRDIR) - -clobber:: - $(RM) -r $(CLASSBINDIR)/java/lang/reflect \ - $(CLASSBINDIR)/java/lang/annotatation - -.PHONY: clean clobber diff --git a/jdk/makefiles/java/java_hprof_demo/Makefile b/jdk/makefiles/java/java_hprof_demo/Makefile deleted file mode 100644 index 9880547be71..00000000000 --- a/jdk/makefiles/java/java_hprof_demo/Makefile +++ /dev/null @@ -1,120 +0,0 @@ -# -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -LIBRARY = hprof -PRODUCT = sun -LIBRARY_OUTPUT = hprof_jvmti - -# Use highest optimization -OPTIMIZATION_LEVEL = HIGHEST - -# Configure the CFLAGS for this library. -FILES_m = mapfile-vers - -include $(BUILDDIR)/common/Defs.gmk - -SRCDIR=$(SHARE_SRC)/demo/jvmti/hprof -PSRCDIR=$(PLATFORM_SRC)/demo/jvmti/hprof - -# Use the mapfile-vers (See the mapfile located with this Makefile) -ifdef FILES_m -include $(BUILDDIR)/common/Mapfile-vers.gmk -endif - -# -# Files to compile. -# -FILES_c = \ - debug_malloc.c \ - hprof_blocks.c \ - hprof_check.c \ - hprof_class.c \ - hprof_cpu.c \ - hprof_error.c \ - hprof_event.c \ - hprof_frame.c \ - hprof_init.c \ - hprof_io.c \ - hprof_ioname.c \ - hprof_listener.c \ - hprof_loader.c \ - hprof_md.c \ - hprof_monitor.c \ - hprof_object.c \ - hprof_reference.c \ - hprof_site.c \ - hprof_stack.c \ - hprof_string.c \ - hprof_table.c \ - hprof_tag.c \ - hprof_tls.c \ - hprof_trace.c \ - hprof_tracker.c \ - hprof_util.c - -OTHER_INCLUDES = -I$(SRCDIR) \ - -I$(SHARE_SRC)/npt \ - -I$(PLATFORM_SRC)/npt \ - -I$(SHARE_SRC)/demo/jvmti/java_crw_demo - -ifeq ($(PLATFORM), windows) - OTHER_LDLIBS += wsock32.lib winmm.lib -else - OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBDL) -endif - -# -# Tell library.gmk to copy the txt file first -# -INIT += $(LIBDIR)/jvm.hprof.txt - -# -# This puts logging code in -# -CPPFLAGS_DBG += -DHPROF_LOGGING - -# -# Library to compile. -# -include $(BUILDDIR)/common/Library.gmk - -# We don't want to link against -ljava -JAVALIB= - -# -# Add to ambient vpath so we pick up the library files -# -vpath %.c $(SRCDIR):$(PSRCDIR) - -# -# Install the hprof prelude -# -$(LIBDIR)/jvm.hprof.txt: $(SRCDIR)/jvm.hprof.txt - $(install-file) - -clean clobber:: - $(RM) $(LIBDIR)/jvm.hprof.txt - diff --git a/jdk/makefiles/java/jexec/Makefile b/jdk/makefiles/java/jexec/Makefile deleted file mode 100644 index aa379048f05..00000000000 --- a/jdk/makefiles/java/jexec/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# -# Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building jexec, a wrapper for direct execution of JAR files -# on UNIX systems. -# - -BUILDDIR = ../.. - -PACKAGE = java.jexec -PRODUCT = sun -PROGRAM = jexec - -include $(BUILDDIR)/common/Defs.gmk - -ifeq ($(COMPILE_APPROACH),batch) - override COMPILE_APPROACH = normal -endif - -include $(BUILDDIR)/common/Rules.gmk - -JEXE_SRC = $(PLATFORM_SRC)/bin - -FILES_c = jexec.c -FILES_o = $(patsubst %.c,$(OBJDIR)/%.o,$(FILES_c)) - -vpath %.c $(JEXE_SRC) - -ifeq ($(PLATFORM), linux) - # - # On Linux jexec goes in lib, not lib/ - # - LIB_LOCATION = $(LIBDIR) - - # - # Also include the manifest_info.h header file. - # - OTHER_INCLUDES += -I$(SHARE_SRC)/bin -endif # PLATFORM - -build: $(LIB_LOCATION)/$(PROGRAM) - -$(LIB_LOCATION)/$(PROGRAM):: $(FILES_o) - $(prep-target) - $(LINK_PRE_CMD) $(CC) $(LDFLAGS) $(FILES_o) $(CC_OBJECT_OUTPUT_FLAG)$@ - -clean clobber:: - $(RM) $(FILES_o) $(LIB_LOCATION)/$(PROGRAM) - diff --git a/jdk/makefiles/java/jli/Makefile b/jdk/makefiles/java/jli/Makefile deleted file mode 100644 index 8aec159e4d1..00000000000 --- a/jdk/makefiles/java/jli/Makefile +++ /dev/null @@ -1,231 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Java Launcher Infrastructure Library (libjli) -# -# This library provides shared support for the Java launcher in all of -# its manifestations (java, javaw, javac, ...). -# -BUILDDIR = ../.. -LIBRARY = jli -PRODUCT = java - -# -# Must be included before Defs.gmk to be functional. -# -# Note that for Windows, both a dynamic and static version are built. -# Doing the compiles with the static library specified can be overridden -# by the link step, but not the reverse. -# -MS_RUNTIME_STATIC = true - -include $(BUILDDIR)/common/Defs.gmk - -ifneq ($(SYSTEM_ZLIB),true) - ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) -endif #SYSTEM_ZLIB -LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin - -# set the platform specific directory for macosx, also this platform shares -# substantial family ties with its siblings (solaris and linux), thus we add -# solaris src path to its compilation dependencies. -ifeq ($(PLATFORM), macosx) - LAUNCHER_PLATFORM_SRC = $(BUILDDIR)/../src/macosx/bin - LAUNCHER_SOLARIS_PLATFORM_SRC = $(BUILDDIR)/../src/solaris/bin -else # !MACOSX - LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin -endif #PLATFORM - -ifeq ($(ZERO_BUILD), true) - ERGO_FAMILY=zero -else # !ZERO_BUILD - ifneq (,$(findstring $(ARCH_FAMILY), amd64 x86_64)) - ERGO_FAMILY=i586 - else # !X86 FAMILY - ERGO_FAMILY=$(ARCH_FAMILY) - endif #ARCH_FAMILY -endif # ZERO_BUILD - -# -# Files to compile. -# -FILES_c = java.c \ - splashscreen_stubs.c \ - parse_manifest.c \ - version_comp.c \ - wildcard.c \ - jli_util.c - -ifneq ($(SYSTEM_ZLIB),true) - FILES_c += inflate.c \ - inftrees.c \ - inffast.c \ - zadler32.c \ - zcrc32.c \ - zutil.c -endif # SYSTEM_ZLIB - -# add platform specific files -ifeq ($(PLATFORM), windows) - FILES_c += java_md.c -else # NIXES - FILES_c += java_md_common.c - ifeq ($(PLATFORM), macosx) - FILES_c += java_md_macosx.c - else # SOLARIS/LINUX - FILES_c += java_md_solinux.c - FILES_c += ergo.c - ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c - # if the architecture specific ergo file exists then - # use it, else use the generic definitions from ergo.c - ifneq ($(wildcard $(LAUNCHER_PLATFORM_SRC)/$(ERGO_ARCH_FILE)),) - FILES_c += $(ERGO_ARCH_FILE) - else # !ERGO_ARCH_FILE - OTHER_CPPFLAGS += -DUSE_GENERIC_ERGO - endif # ERGO_ARCH_FILE - endif #MACOSX -endif #WINDOWS - -# Names of arch directories -LIBARCH_DEFINES = -DLIBARCHNAME='"$(LIBARCH)"' -ifeq ($(PLATFORM), solaris) - LIBARCH_DEFINES += -DLIBARCH32NAME='"$(LIBARCH32)"' - LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"' -endif # PLATFORM - -ifeq ($(PLATFORM), macosx) - OTHER_CPPFLAGS += $(LIBARCH_DEFINES) -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" -else # ! MACOSX - OTHER_CPPFLAGS += $(LIBARCH_DEFINES) -endif #PLATFORM - -ifneq ($(PLATFORM), windows) # UNIX systems - ifeq ($(PLATFORM), macosx) - LIB_LOCATION = $(LIBDIR)/jli - else # SOLARIS/LINUX - LD_RUNPATH_EXTRAS += .. - LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli - # Note: it is important to keep this order, meaning -lc as the - # last library, otherwise it could cause compatibility issues - # by pulling in SUNW_private symbols from libc - LDLIBS = -ldl -lc - ifeq ($(USE_PTHREADS),true) - LDLIBS += -lpthread - endif # USE_PTHREADS - endif # PLATFORM -endif # PLATFORM - -ifeq ($(PLATFORM), windows) - EXTRA_LIBS = advapi32.lib \ - comctl32.lib \ - user32.lib - JAVALIB = - OTHER_LCF = -export:JLI_Launch \ - -export:JLI_ManifestIterate \ - -export:JLI_SetTraceLauncher \ - -export:JLI_ReportErrorMessage \ - -export:JLI_ReportErrorMessageSys \ - -export:JLI_ReportMessage \ - -export:JLI_ReportExceptionDescription -endif # PLATFORM - -OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) -OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC) -ifneq ($(SYSTEM_ZLIB),true) - OTHER_INCLUDES += -I$(ZIP_SRC) -else # !SYSTEM_ZLIB - LDLIBS += -lz -endif # SYSTEM_ZLIB - -# -# Library to compile. -# -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -# -# On Windows, some executable objects need to be statically linked against -# the jli library. Hence, we need both a standard library (archive) and -# an import library (associated with a dll). These both usually have the -# extension .LIB, so they need to be placed in different directories. The -# import library is build (as usual) in the $(OBJDIR) directory while the -# standard library is built in a "static" subdirectory. The standard library -# is not delivered as part of the product, but is only needed as part of -# the build process. The import library is built by the standard rules -# in Library.gmk. The additional rules which follow build the standard -# library. -# -ifeq ($(PLATFORM), windows) - STATIC_LIBRARY = $(OBJDIR)/static/$(LIBPREFIX)$(LIBRARY).lib - - $(STATIC_LIBRARY): $(FILES_o) - @$(prep-target) - $(AR) -nologo -out:$@ $(FILES_o) - - library:: $(STATIC_LIBRARY) -else - -ifeq ($(PLATFORM), macosx) - # Some Obj-C code is embedded in java_md_macosx.c, we stipulate so, using - # "-x" option. Not doing so will cause the compiler to choose the language - # based on the filename suffix, also "-Os" optimizes the file for size. - CFLAGS_$(VARIANT)/java_md_macosx.o = -Os -x objective-c - # Needed for linking the various launchers - LDFLAGS += -framework Cocoa -framework Security \ - -framework ApplicationServices - # Add solaris sources containing common logic to the header path - OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC) -endif # PLATFORM macosx - -STATIC_LIBRARY_DIR = $(OBJDIR)/static -STATIC_LIBRARY_NAME = lib$(LIBRARY).a -STATIC_LIBRARY = $(STATIC_LIBRARY_DIR)/$(STATIC_LIBRARY_NAME) - -$(STATIC_LIBRARY_DIR): | $(OBJDIR) - @$(MKDIR) $(STATIC_LIBRARY_DIR) - -$(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR) - @$(prep-target) - $(AR) $(ARFLAGS) $@ $(FILES_o) - -library:: $(STATIC_LIBRARY) -endif # NOT WINDOWS - -vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC) -ifneq ($(SYSTEM_ZLIB),true) - vpath %.c $(ZIP_SRC) -else # !SYSTEM_ZLIB - # - # Add to ambient vpath so we pick up the library files, for macos we add - # solaris sources which contains the common logic for all nixes - # - ifeq ($(PLATFORM), macosx) - vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC) \ - $(LAUNCHER_SOLARIS_PLATFORM_SRC) - else # !MACOSX - vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC) - endif # MACOSX -endif # SYSTEM_LIB diff --git a/jdk/makefiles/java/jobjc/Makefile b/jdk/makefiles/java/jobjc/Makefile deleted file mode 100644 index 6996cbfabeb..00000000000 --- a/jdk/makefiles/java/jobjc/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building jobjc - -BUILDDIR = ../.. -include $(BUILDDIR)/common/Defs.gmk -SRCDIR = $(JDK_TOPDIR)/src/macosx/native/jobjc - -ifeq ($(PLATFORM),macosx) - -# FRAMEWORKS for which we want to build bridge support -FRAMEWORKS = Foundation CoreFoundation AppKit - -# metadata stuff -GEN_DIR = $(OUTPUTDIR)/bridge_metadata -STABLE_GEN_DIR = $(OUTPUTDIR)/stable_bridge_metadata -STABLE_METADATA_FILES = $(addsuffix Full.bridgesupport,$(addprefix $(STABLE_GEN_DIR)/,$(FRAMEWORKS))) - -# source files -CORE_SRC = $(shell $(FIND) $(SRCDIR) -type f -name "*.hs" -or -name "*.java" -or -name "*.m" -or -name "*.h" -print) -GENERATOR_SRC = $(shell $(FIND) $(SRCDIR) -type f -name "*.java" -print) -ADDITIONS_SRC = $(shell $(FIND) $(SRCDIR) -type f -name "*.java" -or -name "*.m" -or -name "*.h" -print) -BUILD_SRC = $(SRCDIR)/JObjC.xcodeproj/project.pbxproj $(SRCDIR)/bridgesupport.gmk $(SRCDIR)/build.xml $(SRCDIR)/extract_classes.pl $(SRCDIR)/run-and-write-if-okay $(SRCDIR)/rungen $(SRCDIR)/runjava - -# jobjc products for jdk -BUILT_DYLIB = $(OUTPUTDIR)/JObjC.dst/Debug/libJObjC.dylib -BUILT_JAR = $(OUTPUTDIR)/JObjC.build/JObjC.jar - -$(GEN_DIR): - mkdir -p $(GEN_DIR) - -stabilize: $(GEN_DIR) - @echo Updating bridge support in $(GEN_DIR) - ($(CD) $(GEN_DIR); $(MAKE) STABLE_GEN_DIR="$(STABLE_GEN_DIR)" FRAMEWORKS="$(FRAMEWORKS)" -f $(SRCDIR)/bridgesupport.gmk all) - -$(STABLE_METADATA_FILES): stabilize - -ABS_OUTPUTDIR=$(realpath $(OUTPUTDIR)) -ABS_STABLE_GEN_DIR=$(realpath $(STABLE_GEN_DIR)) - -$(BUILT_DYLIB) $(BUILT_JAR): $(STABLE_METADATA_FILES) $(CORE_SRC) $(GENERATOR_SRC) $(ADDITIONS_SRC) $(BUILD_SRC) - @echo JObjC dylib or jar out of data wrt FRAMEWORKS '(' $(FRAMEWORKS) ')' or JObjC source '(' core, generator, additions, build ')' - @echo Running ant with java_home set to ${ALT_BOOTDIR} - (cd $(SRCDIR); OBJROOT="$(ABS_OUTPUTDIR)/JObjC.build" DSTROOT="$(ABS_OUTPUTDIR)/JObjC.dst" JAVA_HOME=${ALT_BOOTDIR} STABLE_GEN_DIR="$(ABS_STABLE_GEN_DIR)" /usr/bin/ant -verbose all) - -all: $(BUILD_DYLIB) $(BUILT_JAR) - $(CP) $(BUILT_DYLIB) $(LIB_LOCATION)/libJObjC.dylib - -clean clobber:: - (cd $(SRCDIR); export OBJROOT=$(OUTPUTDIR)/JObjC.build; export DSTROOT=$(OUTPUTDIR)/JObjC.dst; /usr/bin/ant clean) - -endif diff --git a/jdk/makefiles/java/jvm/Makefile b/jdk/makefiles/java/jvm/Makefile deleted file mode 100644 index 26f95ff4a99..00000000000 --- a/jdk/makefiles/java/jvm/Makefile +++ /dev/null @@ -1,95 +0,0 @@ -# -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. - -include $(BUILDDIR)/common/Defs.gmk - -JVMCFG = $(JVMCFG_DIR)/jvm.cfg - -# -# How to install jvm.cfg. -# -ifeq ($(ZERO_BUILD), true) -JVMCFG_ARCH = zero -else -JVMCFG_ARCH = $(ARCH) -endif - -ifeq ($(PLATFORM),macosx) - JVMCFG_SRC=$(PLATFORM_SRC_MACOS)/bin/$(JVMCFG_ARCH)/jvm.cfg - JVMCFG_DIR = $(LIBDIR) -else - JVMCFG_SRC=$(PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg - JVMCFG_DIR = $(LIBDIR)/$(LIBARCH) -endif - -ifeq ($(ARCH_DATA_MODEL),32) - # On 32 bit machines, we can have client and/or server libjvms installed. - # Since the currently committed jvm.cfg expects clientANDserver, we need - # to patch the jvm.cfg when we have built only a client or only a server. - # This should also support -kernel, -zero and -zeroshark. - ifeq ($(JVM_VARIANTS),$(COMMA)client$(COMMA)) - # Create a patched jvm.cfg to use -client by default and alias -server to -client. - $(JVMCFG):: - $(MKDIR) -p $(JVMCFG_DIR) - $(RM) -f $(JVMCFG) - $(PRINTF) "-client KNOWN\n">$(JVMCFG) - $(PRINTF) "-server IGNORE\n">>$(JVMCFG) - $(PRINTF) "-hotspot ALIASED_TO -client\n">>$(JVMCFG) - $(PRINTF) "-classic WARN\n">>$(JVMCFG) - $(PRINTF) "-native ERROR\n">>$(JVMCFG) - $(PRINTF) "-green ERROR\n">>$(JVMCFG) - else - ifeq ($(JVM_VARIANTS),$(COMMA)server$(COMMA)) - # Create a patched jvm.cfg to use -server by default and alias -client to -server. - $(JVMCFG):: - $(MKDIR) -p $(JVMCFG_DIR) - $(RM) -f $(JVMCFG) - $(PRINTF) "-server KNOWN\n">$(JVMCFG) - $(PRINTF) "-client IGNORE\n">>$(JVMCFG) - $(PRINTF) "-hotspot IGNORE\n">>$(JVMCFG) - $(PRINTF) "-classic WARN\n">>$(JVMCFG) - $(PRINTF) "-native ERROR\n">>$(JVMCFG) - $(PRINTF) "-green ERROR\n">>$(JVMCFG) - else - # Use the default jvm.cfg for this 32 bit setup. - $(JVMCFG): $(JVMCFG_SRC) - $(install-file) - endif - endif -else - # Use the default jvm.cfg for this 64 bit setup. - $(JVMCFG): $(JVMCFG_SRC) - $(install-file) -endif - -all: build - -build: $(JVMCFG) - -clean clobber:: - $(RM) $(JVMCFG) - diff --git a/jdk/makefiles/java/main/Makefile b/jdk/makefiles/java/main/Makefile deleted file mode 100644 index 9eb14ab24d8..00000000000 --- a/jdk/makefiles/java/main/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building java command line tools -# - -BUILDDIR = ../.. -PRODUCT = java -include $(BUILDDIR)/common/Defs.gmk - -ifeq ($(PLATFORM), windows) -SUBDIRS = java javaw -else -SUBDIRS = java -endif -include $(BUILDDIR)/common/Subdirs.gmk - -all build clean clobber:: - $(SUBDIRS-loop) - diff --git a/jdk/makefiles/java/main/java/Makefile b/jdk/makefiles/java/main/java/Makefile deleted file mode 100644 index 1766880712c..00000000000 --- a/jdk/makefiles/java/main/java/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PROGRAM = java -PRODUCT = java - -# -# Statically link java to avoid the dependency on msvcrNN.dll. This -# must be set before Defs.gmk is included. -# -MS_RUNTIME_STATIC = true -# -# Statically link java to avoid the dependency on jli.dll. This -# must be set before Program.gmk is included. -# -STATIC_JLI = true - -include $(BUILDDIR)/common/Defs.gmk - -# Override the default version info with our own resource file (see 5106536) -ifeq ($(PLATFORM), windows) -LDLIBS_COMMON += user32.lib comctl32.lib - -ifdef OPENJDK - RC_FLAGS += -i "$(PLATFORM_SRC)/resource/icons" -else - RC_FLAGS += -i "$(CLOSED_SRC)/windows/native/sun/windows" -endif - VERSIONINFO_RESOURCE = $(PLATFORM_SRC)/resource/java.rc -endif - -# -# Rules. -# -include $(BUILDDIR)/common/Program.gmk -OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS -OTHER_CPPFLAGS += -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' - -ifeq ($(PLATFORM), solaris) -LDFLAGS += -R$(OPENWIN_LIB) -endif diff --git a/jdk/makefiles/java/main/java/mapfile-amd64 b/jdk/makefiles/java/main/java/mapfile-amd64 deleted file mode 100644 index 760fcc1a90a..00000000000 --- a/jdk/makefiles/java/main/java/mapfile-amd64 +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# -# -# Specify what global symbols we export. Note that we're not really -# interested in declaring a version, simply scoping the file is sufficient. -# - -SUNWprivate_1.1 { - global: - main; # Provides basic adb symbol offsets - environ; # Public symbols and required by Java run time - _environ; - __environ_lock; - - local: - *; -}; diff --git a/jdk/makefiles/java/main/java/mapfile-i586 b/jdk/makefiles/java/main/java/mapfile-i586 deleted file mode 100644 index 48061dd8e90..00000000000 --- a/jdk/makefiles/java/main/java/mapfile-i586 +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# -# -# Specify what global symbols we export. Note that we're not really -# interested in declaring a version, simply scoping the file is sufficient. -# - -SUNWprivate_1.1 { - global: - main; # Provides basic adb symbol offsets - environ; # Public symbols and required by Java run time - _environ; - __environ_lock; - ___Argv; # The following are private, but as they are - _start; # exported from ctr1/crtn, the clever hacker - _init; # might know about them. However note, that - _fini; # their use is strictly not supported. - _lib_version; -# _mcount; - __fsr; - __fsr_init_value; - __longdouble_used; - - local: - *; -}; diff --git a/jdk/makefiles/java/main/java/mapfile-sparc b/jdk/makefiles/java/main/java/mapfile-sparc deleted file mode 100644 index ef7eaf9b7b2..00000000000 --- a/jdk/makefiles/java/main/java/mapfile-sparc +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# -# Specify what global symbols we export. Note that we're not really -# interested in declaring a version, simply scoping the file is sufficient. -# - -SUNWprivate_1.1 { - global: - main; # Provides basic adb symbol offsets - environ; # Public symbols and required by Java run time - _environ; - __environ_lock; - ___Argv; # The following are private, but as they are - _start; # exported from ctr1/crtn, the clever hacker - _init; # might know about them. However note, that - _fini; # their use is strictly not supported. - _lib_version; - __cg92_used; - __xargc; - __xargv; - __fsr_init_value; - - local: - *; -}; diff --git a/jdk/makefiles/java/main/java/mapfile-sparcv9 b/jdk/makefiles/java/main/java/mapfile-sparcv9 deleted file mode 100644 index 5ecdf6fbcf3..00000000000 --- a/jdk/makefiles/java/main/java/mapfile-sparcv9 +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Specify what global symbols we export. Note that we're not really -# interested in declaring a version, simply scoping the file is sufficient. -# - -SUNWprivate_1.1 { - global: - main; # Provides basic adb symbol offsets - environ; # Public symbols and required by Java run time - _environ; - __environ_lock; - ___Argv; # The following are private, but as they are - _start; # exported from ctr1/crtn, the clever hacker - _init; # might know about them. However note, that - _fini; # their use is strictly not supported. - _lib_version; - __xargc; - __xargv; - __fsr_init_value; - - local: - *; -}; diff --git a/jdk/makefiles/java/main/javaw/Makefile b/jdk/makefiles/java/main/javaw/Makefile deleted file mode 100644 index 93a536e9edd..00000000000 --- a/jdk/makefiles/java/main/javaw/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building javaw.exe (for windows) -# - -BUILDDIR = ../../.. -PROGRAM = javaw -PRODUCT = java - -# -# Statically link javaw to avoid the dependency on msvcrNN.dll. This -# must be set before Defs.gmk is included. -# -MS_RUNTIME_STATIC = true -# -# Statically link javaw to avoid the dependency on jli.dll. This -# must be set before Program.gmk is included. -# -STATIC_JLI = true - -include $(BUILDDIR)/common/Defs.gmk - -OTHER_CPPFLAGS += -DJAVAW -LDLIBS_COMMON += user32.lib comctl32.lib - -# Override the default version info with our own resource file (see 5106536) -ifeq ($(PLATFORM), windows) -ifdef OPENJDK - RC_FLAGS += -i "$(PLATFORM_SRC)/resource/icons" -else - RC_FLAGS += -i "$(CLOSED_SRC)/windows/native/sun/windows" -endif - VERSIONINFO_RESOURCE = $(PLATFORM_SRC)/resource/java.rc -endif - -# -# Rules. -# -include $(BUILDDIR)/common/Program.gmk -OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS -OTHER_CPPFLAGS += -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' - diff --git a/jdk/makefiles/java/management/Exportedfiles.gmk b/jdk/makefiles/java/management/Exportedfiles.gmk deleted file mode 100644 index 0654fb57526..00000000000 --- a/jdk/makefiles/java/management/Exportedfiles.gmk +++ /dev/null @@ -1,42 +0,0 @@ -# -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# These are the names of Java classes for which we will make .h files. -# - -FILES_export = \ - sun/management/ClassLoadingImpl.java \ - sun/management/FileSystemImpl.java \ - sun/management/Flag.java \ - sun/management/GarbageCollectorImpl.java \ - sun/management/GcInfoBuilder.java \ - sun/management/HotSpotDiagnostic.java \ - sun/management/HotspotThread.java \ - sun/management/MemoryImpl.java \ - sun/management/MemoryManagerImpl.java \ - sun/management/MemoryPoolImpl.java \ - sun/management/ThreadImpl.java \ - sun/management/VMManagementImpl.java diff --git a/jdk/makefiles/java/management/FILES_c.gmk b/jdk/makefiles/java/management/FILES_c.gmk deleted file mode 100644 index 8c5ddce29b5..00000000000 --- a/jdk/makefiles/java/management/FILES_c.gmk +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - ClassLoadingImpl.c \ - FileSystemImpl.c \ - Flag.c \ - GarbageCollectorImpl.c \ - GcInfoBuilder.c \ - HotSpotDiagnostic.c \ - HotspotThread.c \ - MemoryImpl.c \ - MemoryManagerImpl.c \ - MemoryPoolImpl.c \ - ThreadImpl.c \ - VMManagementImpl.c \ - management.c - diff --git a/jdk/makefiles/java/management/Makefile b/jdk/makefiles/java/management/Makefile deleted file mode 100644 index bffb5ed7bdd..00000000000 --- a/jdk/makefiles/java/management/Makefile +++ /dev/null @@ -1,131 +0,0 @@ -# -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PACKAGE = java.lang.management -LIBRARY = management -PRODUCT = java -include $(BUILDDIR)/common/Defs.gmk - -MGMT_SRC = $(SHARE_SRC)/classes/java/lang/management -SMGMT_SRC = $(SHARE_SRC)/classes/sun/management - -AGENTJAR = $(LIBDIR)/management-agent.jar -MANIFEST = $(SMGMT_SRC)/manifest - -# -# Use mapfile -# -FILES_m = mapfile-vers -include $(BUILDDIR)/common/Mapfile-vers.gmk - -# -# Files to compile -# -include FILES_c.gmk - -# We don't need snmp here. -AUTO_JAVA_PRUNE = snmp -AUTO_FILES_JAVA_DIRS = java/lang/management com/sun/management sun/management - -include Exportedfiles.gmk - -ifeq ($(PLATFORM),windows) - -FILES_c += OperatingSystem_md.c - -FILES_export += com/sun/management/OperatingSystem.java - -else # PLATFORM (i.e. solaris & linux) - -FILES_c += UnixOperatingSystem_md.c - -FILES_export += com/sun/management/UnixOperatingSystem.java - -ifeq ($(PLATFORM),solaris) - -FILES_c += SolarisOperatingSystem.c -OTHER_LDLIBS += -lkstat - -endif # PLATFORM solaris - -ifeq ($(PLATFORM),linux) - -FILES_c += LinuxOperatingSystem.c - -endif # PLATFORM linux - -ifeq ($(PLATFORM),macosx) - -FILES_c += MacosxOperatingSystem.c - -endif # PLATFORM macosx - -endif # PLATFORM - -# -# Resources -# -LOCALE_SET_DEFINITION = jre -RESOURCE_BUNDLES_COMPILED_PROPERTIES = sun/management/resources/agent.properties - -# -# Find C source files -# -vpath %.c $(SHARE_SRC)/native/sun/management -vpath %.c $(PLATFORM_SRC)/native/sun/management -vpath %.c $(PLATFORM_SRC)/native/com/sun/management - -# -# Access to management.h -# - -OTHER_INCLUDES += \ - -I$(SHARE_SRC)/native/sun/management - -ifeq ($(PLATFORM),windows) - # Need process status helper API (psapi) on Windows - OTHER_LDLIBS += $(JVMLIB) psapi.lib -endif - -# -# Library to compile. -# -include $(BUILDDIR)/common/Library.gmk - -$(AGENTJAR): $(LIBDIR) $(TEMPDIR)/manifest - $(BOOT_JAR_CMD) -cfm $(AGENTJAR) $(TEMPDIR)/manifest $(BOOT_JAR_JFLAGS) - @$(java-vm-cleanup) - -$(TEMPDIR)/manifest: $(MANIFEST) - $(install-manifest-file) - -build: $(AGENTJAR) - -clean clobber:: - $(RM) -r $(CLASSDESTDIR)/java/management - $(RM) -r $(CLASSDESTDIR)/sun/management - $(RM) $(TEMPDIR)/manifest $(AGENTJAR) - diff --git a/jdk/makefiles/java/net/FILES_c.gmk b/jdk/makefiles/java/net/FILES_c.gmk deleted file mode 100644 index a4bbb409328..00000000000 --- a/jdk/makefiles/java/net/FILES_c.gmk +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - DatagramPacket.c \ - InetAddress.c \ - Inet4Address.c \ - Inet6Address.c \ - NetworkInterface.c \ - InetAddressImplFactory.c \ - Inet4AddressImpl.c \ - Inet6AddressImpl.c \ - SocketInputStream.c \ - SocketOutputStream.c \ - net_util.c \ - net_util_md.c \ - ResolverConfigurationImpl.c \ - DefaultProxySelector.c - -ifeq ($(PLATFORM), linux) - FILES_c += linux_close.c -endif - -ifeq ($(PLATFORM), macosx) - FILES_c += bsd_close.c -endif - -ifeq ($(PLATFORM), windows) - FILES_c += TwoStacksPlainSocketImpl.c - FILES_c += DualStackPlainSocketImpl.c - FILES_c += TwoStacksPlainDatagramSocketImpl.c - FILES_c += DualStackPlainDatagramSocketImpl.c -else - FILES_c += PlainSocketImpl.c - FILES_c += PlainDatagramSocketImpl.c -endif - diff --git a/jdk/makefiles/java/net/Makefile b/jdk/makefiles/java/net/Makefile deleted file mode 100644 index ba15900fc3f..00000000000 --- a/jdk/makefiles/java/net/Makefile +++ /dev/null @@ -1,141 +0,0 @@ -# -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PACKAGE = java.net -LIBRARY = net -PRODUCT = sun -JAVAC_MAX_WARNINGS = true -JAVAC_WARNINGS_FATAL = true -JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -include FILES_c.gmk - -AUTO_FILES_JAVA_DIRS = java/net - -ifeq ($(PLATFORM), windows) - FILES_c += NTLMAuthSequence.c - FILES_c += NetworkInterface_winXP.c -else - FILES_c += SdpSupport.c -endif - -FILES_export = \ - java/net/Socket.java \ - java/net/SocketOptions.java \ - java/net/SocketImpl.java \ - java/net/AbstractPlainSocketImpl.java \ - java/net/PlainSocketImpl.java \ - java/net/ServerSocket.java \ - java/net/InetAddress.java \ - java/net/Inet4Address.java \ - java/net/Inet6Address.java \ - java/net/InetAddressImpl.java \ - java/net/Inet4AddressImpl.java \ - java/net/Inet6AddressImpl.java \ - java/net/NetworkInterface.java \ - java/net/SocketInputStream.java \ - java/net/SocketOutputStream.java \ - java/net/DefaultDatagramSocketImplFactory.java \ - java/net/DatagramPacket.java \ - java/net/DatagramSocket.java \ - java/net/DatagramSocketImpl.java \ - java/net/AbstractPlainDatagramSocketImpl.java \ - java/net/MulticastSocket.java \ - java/net/UnknownHostException.java \ - java/net/ProtocolException.java \ - sun/net/spi/DefaultProxySelector.java - -ifeq ($(PLATFORM), windows) - FILES_export += java/net/TwoStacksPlainSocketImpl.java - FILES_export += java/net/DualStackPlainSocketImpl.java - FILES_export += java/net/TwoStacksPlainDatagramSocketImpl.java - FILES_export += java/net/DualStackPlainDatagramSocketImpl.java -else - FILES_export += java/net/PlainDatagramSocketImpl.java -endif - -# -# Find platform specific native code -# -vpath %.c $(PLATFORM_SRC)/native/sun/net/dns $(PLATFORM_SRC)/native/sun/net/www/protocol/http/ntlm \ - $(PLATFORM_SRC)/native/sun/net/sdp $(PLATFORM_SRC)/native/sun/net/spi - -# -# Include rules -# -include $(BUILDDIR)/common/Mapfile-vers.gmk - -include $(BUILDDIR)/common/Library.gmk - -ifeq ($(PLATFORM), macosx) -ifdef DONT_ENABLE_IPV6 - OTHER_CFLAGS += -DDONT_ENABLE_IPV6 -endif - OTHER_LDLIBS = $(JVMLIB) -pthread -else -ifeq ($(PLATFORM), windows) - OTHER_LDLIBS = ws2_32.lib $(JVMLIB) \ - secur32.lib iphlpapi.lib delayimp.lib \ - /DELAYLOAD:secur32.dll /DELAYLOAD:iphlpapi.dll -else - OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) $(LIBDL) $(JVMLIB) -endif -ifeq ($(PLATFORM), linux) - OTHER_LDLIBS += -lpthread -endif -endif # PLATFORM - -CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl - -# -# Resources -# -LOCALE_SET_DEFINITION = jre - -MISC_FILES = $(LIBDIR) $(LIBDIR)/net.properties - -$(LIBDIR)/net.properties: $(SHARE_SRC)/lib/net.properties - $(install-file) - -# -# SDP configuration template -# -ifeq ($(PLATFORM), solaris) -SDP_PATH = sdp/sdp.conf.template -SDP_CONF = $(LIBDIR)/$(SDP_PATH) -$(SDP_CONF): $(PLATFORM_SRC)/lib/$(SDP_PATH) - @$(RM) $* - $(install-file) - -MISC_FILES += $(SDP_CONF) -endif - -build: $(MISC_FILES) - diff --git a/jdk/makefiles/java/nio/Exportedfiles.gmk b/jdk/makefiles/java/nio/Exportedfiles.gmk deleted file mode 100644 index 75ee6beec4d..00000000000 --- a/jdk/makefiles/java/nio/Exportedfiles.gmk +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# These are the names of Java classes for which we will make .h files. -# - -FILES_export = \ - java/net/SocketOptions.java \ - java/nio/MappedByteBuffer.java \ - sun/nio/ch/DatagramChannelImpl.java \ - sun/nio/ch/DatagramDispatcher.java \ - sun/nio/ch/FileChannelImpl.java \ - sun/nio/ch/FileDispatcherImpl.java \ - sun/nio/ch/FileKey.java \ - sun/nio/ch/FileLockImpl.java \ - sun/nio/ch/IOStatus.java \ - sun/nio/ch/IOUtil.java \ - sun/nio/ch/Net.java \ - sun/nio/ch/PollArrayWrapper.java \ - sun/nio/ch/ServerSocketChannelImpl.java \ - sun/nio/ch/SocketChannelImpl.java \ - sun/nio/ch/SocketDispatcher.java \ - java/io/FileDescriptor.java \ diff --git a/jdk/makefiles/java/nio/FILES_c.gmk b/jdk/makefiles/java/nio/FILES_c.gmk deleted file mode 100644 index 1373bac7546..00000000000 --- a/jdk/makefiles/java/nio/FILES_c.gmk +++ /dev/null @@ -1,37 +0,0 @@ -# -# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - DatagramChannelImpl.c \ - DatagramDispatcher.c \ - FileChannelImpl.c \ - FileDispatcherImpl.c \ - FileKey.c \ - IOUtil.c \ - MappedByteBuffer.c \ - Net.c \ - ServerSocketChannelImpl.c \ - SocketChannelImpl.c \ - SocketDispatcher.c diff --git a/jdk/makefiles/java/nio/FILES_java.gmk b/jdk/makefiles/java/nio/FILES_java.gmk deleted file mode 100644 index b394b89e483..00000000000 --- a/jdk/makefiles/java/nio/FILES_java.gmk +++ /dev/null @@ -1,442 +0,0 @@ -# -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_src = \ - java/nio/Bits.java \ - java/nio/Buffer.java \ - java/nio/ByteOrder.java \ - java/nio/MappedByteBuffer.java \ - java/nio/StringCharBuffer.java \ - \ - java/nio/channels/AsynchronousByteChannel.java \ - java/nio/channels/AsynchronousChannel.java \ - java/nio/channels/AsynchronousChannelGroup.java \ - java/nio/channels/AsynchronousFileChannel.java \ - java/nio/channels/AsynchronousServerSocketChannel.java \ - java/nio/channels/AsynchronousSocketChannel.java \ - java/nio/channels/ByteChannel.java \ - java/nio/channels/Channel.java \ - java/nio/channels/Channels.java \ - java/nio/channels/CompletionHandler.java \ - java/nio/channels/DatagramChannel.java \ - java/nio/channels/FileChannel.java \ - java/nio/channels/FileLock.java \ - java/nio/channels/GatheringByteChannel.java \ - java/nio/channels/InterruptibleChannel.java \ - java/nio/channels/Pipe.java \ - java/nio/channels/MembershipKey.java \ - java/nio/channels/MulticastChannel.java \ - java/nio/channels/NetworkChannel.java \ - java/nio/channels/ReadableByteChannel.java \ - java/nio/channels/ScatteringByteChannel.java \ - java/nio/channels/SeekableByteChannel.java \ - java/nio/channels/SelectableChannel.java \ - java/nio/channels/Selector.java \ - java/nio/channels/SelectionKey.java \ - java/nio/channels/ServerSocketChannel.java \ - java/nio/channels/SocketChannel.java \ - java/nio/channels/WritableByteChannel.java \ - \ - java/nio/channels/spi/AbstractInterruptibleChannel.java \ - java/nio/channels/spi/AbstractSelectableChannel.java \ - java/nio/channels/spi/AbstractSelectionKey.java \ - java/nio/channels/spi/AbstractSelector.java \ - java/nio/channels/spi/AsynchronousChannelProvider.java \ - java/nio/channels/spi/SelectorProvider.java \ - \ - java/nio/charset/Charset.java \ - java/nio/charset/CoderResult.java \ - java/nio/charset/CoderMalfunctionError.java \ - java/nio/charset/CodingErrorAction.java \ - java/nio/charset/MalformedInputException.java \ - java/nio/charset/StandardCharsets.java \ - java/nio/charset/UnmappableCharacterException.java \ - \ - java/nio/charset/spi/CharsetProvider.java \ - \ - java/nio/file/AccessDeniedException.java \ - java/nio/file/AccessMode.java \ - java/nio/file/AtomicMoveNotSupportedException.java \ - java/nio/file/ClosedDirectoryStreamException.java \ - java/nio/file/ClosedFileSystemException.java \ - java/nio/file/ClosedWatchServiceException.java \ - java/nio/file/CopyMoveHelper.java \ - java/nio/file/CopyOption.java \ - java/nio/file/DirectoryIteratorException.java \ - java/nio/file/DirectoryNotEmptyException.java \ - java/nio/file/DirectoryStream.java \ - java/nio/file/FileAlreadyExistsException.java \ - java/nio/file/FileStore.java \ - java/nio/file/FileSystem.java \ - java/nio/file/FileSystemAlreadyExistsException.java \ - java/nio/file/FileSystemException.java \ - java/nio/file/FileSystemNotFoundException.java \ - java/nio/file/FileSystems.java \ - java/nio/file/FileTreeWalker.java \ - java/nio/file/FileVisitOption.java \ - java/nio/file/FileVisitResult.java \ - java/nio/file/FileVisitor.java \ - java/nio/file/Files.java \ - java/nio/file/InvalidPathException.java \ - java/nio/file/LinkOption.java \ - java/nio/file/LinkPermission.java \ - java/nio/file/NoSuchFileException.java \ - java/nio/file/NotDirectoryException.java \ - java/nio/file/NotLinkException.java \ - java/nio/file/OpenOption.java \ - java/nio/file/Path.java \ - java/nio/file/PathMatcher.java \ - java/nio/file/Paths.java \ - java/nio/file/ProviderMismatchException.java \ - java/nio/file/ProviderNotFoundException.java \ - java/nio/file/ReadOnlyFileSystemException.java \ - java/nio/file/SecureDirectoryStream.java \ - java/nio/file/SimpleFileVisitor.java \ - java/nio/file/StandardCopyOption.java \ - java/nio/file/StandardOpenOption.java \ - java/nio/file/StandardWatchEventKinds.java \ - java/nio/file/TempFileHelper.java \ - java/nio/file/WatchEvent.java \ - java/nio/file/WatchKey.java \ - java/nio/file/WatchService.java \ - java/nio/file/Watchable.java \ - \ - java/nio/file/attribute/AclEntry.java \ - java/nio/file/attribute/AclEntryFlag.java \ - java/nio/file/attribute/AclEntryPermission.java \ - java/nio/file/attribute/AclEntryType.java \ - java/nio/file/attribute/AclFileAttributeView.java \ - java/nio/file/attribute/AttributeView.java \ - java/nio/file/attribute/BasicFileAttributeView.java \ - java/nio/file/attribute/BasicFileAttributes.java \ - java/nio/file/attribute/DosFileAttributeView.java \ - java/nio/file/attribute/DosFileAttributes.java \ - java/nio/file/attribute/FileAttribute.java \ - java/nio/file/attribute/FileAttributeView.java \ - java/nio/file/attribute/FileOwnerAttributeView.java \ - java/nio/file/attribute/FileStoreAttributeView.java \ - java/nio/file/attribute/FileTime.java \ - java/nio/file/attribute/GroupPrincipal.java \ - java/nio/file/attribute/UserDefinedFileAttributeView.java \ - java/nio/file/attribute/PosixFileAttributeView.java \ - java/nio/file/attribute/PosixFileAttributes.java \ - java/nio/file/attribute/PosixFilePermission.java \ - java/nio/file/attribute/PosixFilePermissions.java \ - java/nio/file/attribute/UserPrincipal.java \ - java/nio/file/attribute/UserPrincipalLookupService.java \ - java/nio/file/attribute/UserPrincipalNotFoundException.java \ - \ - java/nio/file/spi/FileSystemProvider.java \ - java/nio/file/spi/FileTypeDetector.java \ - \ - com/sun/nio/file/ExtendedCopyOption.java \ - com/sun/nio/file/ExtendedOpenOption.java \ - com/sun/nio/file/ExtendedWatchEventModifier.java \ - com/sun/nio/file/SensitivityWatchEventModifier.java \ - \ - sun/nio/ByteBuffered.java \ - \ - sun/nio/ch/AbstractPollArrayWrapper.java \ - sun/nio/ch/AllocatedNativeObject.java \ - sun/nio/ch/AsynchronousChannelGroupImpl.java \ - sun/nio/ch/AsynchronousFileChannelImpl.java \ - sun/nio/ch/AsynchronousServerSocketChannelImpl.java \ - sun/nio/ch/AsynchronousSocketChannelImpl.java \ - sun/nio/ch/Cancellable.java \ - sun/nio/ch/ChannelInputStream.java \ - sun/nio/ch/CompletedFuture.java \ - sun/nio/ch/DatagramChannelImpl.java \ - sun/nio/ch/DatagramDispatcher.java \ - sun/nio/ch/DatagramSocketAdaptor.java \ - sun/nio/ch/DefaultAsynchronousChannelProvider.java \ - sun/nio/ch/DefaultSelectorProvider.java \ - sun/nio/ch/DirectBuffer.java \ - sun/nio/ch/ExtendedSocketOption.java \ - sun/nio/ch/FileChannelImpl.java \ - sun/nio/ch/FileDispatcher.java \ - sun/nio/ch/FileDispatcherImpl.java \ - sun/nio/ch/FileKey.java \ - sun/nio/ch/FileLockImpl.java \ - sun/nio/ch/FileLockTable.java \ - sun/nio/ch/Groupable.java \ - sun/nio/ch/Interruptible.java \ - sun/nio/ch/Invoker.java \ - sun/nio/ch/IOUtil.java \ - sun/nio/ch/IOStatus.java \ - sun/nio/ch/IOVecWrapper.java \ - sun/nio/ch/MembershipKeyImpl.java \ - sun/nio/ch/MembershipRegistry.java \ - sun/nio/ch/NativeDispatcher.java \ - sun/nio/ch/NativeObject.java \ - sun/nio/ch/NativeThread.java \ - sun/nio/ch/NativeThreadSet.java \ - sun/nio/ch/Net.java \ - sun/nio/ch/OptionKey.java \ - sun/nio/ch/PendingFuture.java \ - sun/nio/ch/PipeImpl.java \ - sun/nio/ch/PollArrayWrapper.java \ - sun/nio/ch/Reflect.java \ - sun/nio/ch/Secrets.java \ - sun/nio/ch/SelectionKeyImpl.java \ - sun/nio/ch/SelectorImpl.java \ - sun/nio/ch/SelectorProviderImpl.java \ - sun/nio/ch/SelChImpl.java \ - sun/nio/ch/ServerSocketAdaptor.java \ - sun/nio/ch/ServerSocketChannelImpl.java \ - sun/nio/ch/SinkChannelImpl.java \ - sun/nio/ch/SocketAdaptor.java \ - sun/nio/ch/SocketChannelImpl.java \ - sun/nio/ch/SocketDispatcher.java \ - sun/nio/ch/SocketOptionRegistry.java \ - sun/nio/ch/SourceChannelImpl.java \ - sun/nio/ch/ThreadPool.java \ - sun/nio/ch/Util.java \ - \ - sun/nio/cs/AbstractCharsetProvider.java \ - sun/nio/cs/ArrayDecoder.java \ - sun/nio/cs/ArrayEncoder.java \ - sun/nio/cs/FastCharsetProvider.java \ - sun/nio/cs/HistoricallyNamedCharset.java \ - sun/nio/cs/ISO_8859_1.java \ - sun/nio/cs/SingleByte.java \ - sun/nio/cs/SingleByteDecoder.java \ - sun/nio/cs/SingleByteEncoder.java \ - sun/nio/cs/StreamEncoder.java \ - sun/nio/cs/StreamDecoder.java \ - sun/nio/cs/Surrogate.java \ - sun/nio/cs/ThreadLocalCoders.java \ - sun/nio/cs/US_ASCII.java \ - sun/nio/cs/UTF_16.java \ - sun/nio/cs/UTF_16BE.java \ - sun/nio/cs/UTF_16LE.java \ - sun/nio/cs/UTF_8.java \ - sun/nio/cs/CESU_8.java \ - sun/nio/cs/Unicode.java \ - sun/nio/cs/UnicodeDecoder.java \ - sun/nio/cs/UnicodeEncoder.java \ - sun/nio/cs/UTF_32.java \ - sun/nio/cs/UTF_32BE.java \ - sun/nio/cs/UTF_32LE.java \ - sun/nio/cs/UTF_32BE_BOM.java \ - sun/nio/cs/UTF_32LE_BOM.java \ - sun/nio/cs/UTF_32Coder.java \ - \ - sun/nio/fs/AbstractAclFileAttributeView.java \ - sun/nio/fs/AbstractBasicFileAttributeView.java \ - sun/nio/fs/AbstractFileTypeDetector.java \ - sun/nio/fs/AbstractFileSystemProvider.java \ - sun/nio/fs/AbstractPath.java \ - sun/nio/fs/AbstractPoller.java \ - sun/nio/fs/AbstractUserDefinedFileAttributeView.java \ - sun/nio/fs/AbstractWatchKey.java \ - sun/nio/fs/AbstractWatchService.java \ - sun/nio/fs/BasicFileAttributesHolder.java \ - sun/nio/fs/Cancellable.java \ - sun/nio/fs/DefaultFileSystemProvider.java \ - sun/nio/fs/DefaultFileTypeDetector.java \ - sun/nio/fs/DynamicFileAttributeView.java \ - sun/nio/fs/FileOwnerAttributeViewImpl.java \ - sun/nio/fs/Globs.java \ - sun/nio/fs/NativeBuffer.java \ - sun/nio/fs/NativeBuffers.java \ - sun/nio/fs/Reflect.java \ - sun/nio/fs/Util.java \ - \ - java/net/DatagramSocket.java \ - java/net/DatagramSocketImpl.java \ - java/net/PlainSocketImpl.java \ - java/net/Socket.java \ - java/net/ServerSocket.java \ - java/net/SocketImpl.java \ - java/net/Socket.java \ - java/io/InputStreamReader.java \ - java/io/OutputStreamWriter.java \ - java/lang/String.java \ - java/lang/StringCoding.java \ - \ - sun/misc/Cleaner.java \ - sun/util/PreHashedMap.java - -# Generated coder classes -# -FILES_gen_coder = \ - java/nio/charset/CharsetDecoder.java \ - java/nio/charset/CharsetEncoder.java - -# Generated buffer classes -# -FILES_gen_buffer = \ - java/nio/ByteBuffer.java \ - java/nio/CharBuffer.java \ - java/nio/ShortBuffer.java \ - java/nio/IntBuffer.java \ - java/nio/LongBuffer.java \ - java/nio/FloatBuffer.java \ - java/nio/DoubleBuffer.java \ - \ - java/nio/HeapByteBuffer.java \ - java/nio/HeapByteBufferR.java \ - java/nio/HeapCharBuffer.java \ - java/nio/HeapCharBufferR.java \ - java/nio/HeapShortBuffer.java \ - java/nio/HeapShortBufferR.java \ - java/nio/HeapIntBuffer.java \ - java/nio/HeapIntBufferR.java \ - java/nio/HeapLongBuffer.java \ - java/nio/HeapLongBufferR.java \ - java/nio/HeapFloatBuffer.java \ - java/nio/HeapFloatBufferR.java \ - java/nio/HeapDoubleBuffer.java \ - java/nio/HeapDoubleBufferR.java \ - \ - java/nio/DirectByteBuffer.java \ - java/nio/DirectByteBufferR.java \ - \ - java/nio/DirectCharBufferU.java \ - java/nio/DirectCharBufferRU.java \ - java/nio/DirectShortBufferU.java \ - java/nio/DirectShortBufferRU.java \ - java/nio/DirectIntBufferU.java \ - java/nio/DirectIntBufferRU.java \ - java/nio/DirectLongBufferU.java \ - java/nio/DirectLongBufferRU.java \ - java/nio/DirectFloatBufferU.java \ - java/nio/DirectFloatBufferRU.java \ - java/nio/DirectDoubleBufferU.java \ - java/nio/DirectDoubleBufferRU.java \ - \ - java/nio/DirectCharBufferS.java \ - java/nio/DirectCharBufferRS.java \ - java/nio/DirectShortBufferS.java \ - java/nio/DirectShortBufferRS.java \ - java/nio/DirectIntBufferS.java \ - java/nio/DirectIntBufferRS.java \ - java/nio/DirectLongBufferS.java \ - java/nio/DirectLongBufferRS.java \ - java/nio/DirectFloatBufferS.java \ - java/nio/DirectFloatBufferRS.java \ - java/nio/DirectDoubleBufferS.java \ - java/nio/DirectDoubleBufferRS.java \ - \ - java/nio/ByteBufferAsCharBufferB.java \ - java/nio/ByteBufferAsCharBufferRB.java \ - java/nio/ByteBufferAsShortBufferB.java \ - java/nio/ByteBufferAsShortBufferRB.java \ - java/nio/ByteBufferAsIntBufferB.java \ - java/nio/ByteBufferAsIntBufferRB.java \ - java/nio/ByteBufferAsLongBufferB.java \ - java/nio/ByteBufferAsLongBufferRB.java \ - java/nio/ByteBufferAsFloatBufferB.java \ - java/nio/ByteBufferAsFloatBufferRB.java \ - java/nio/ByteBufferAsDoubleBufferB.java \ - java/nio/ByteBufferAsDoubleBufferRB.java \ - \ - java/nio/ByteBufferAsCharBufferL.java \ - java/nio/ByteBufferAsCharBufferRL.java \ - java/nio/ByteBufferAsShortBufferL.java \ - java/nio/ByteBufferAsShortBufferRL.java \ - java/nio/ByteBufferAsIntBufferL.java \ - java/nio/ByteBufferAsIntBufferRL.java \ - java/nio/ByteBufferAsLongBufferL.java \ - java/nio/ByteBufferAsLongBufferRL.java \ - java/nio/ByteBufferAsFloatBufferL.java \ - java/nio/ByteBufferAsFloatBufferRL.java \ - java/nio/ByteBufferAsDoubleBufferL.java \ - java/nio/ByteBufferAsDoubleBufferRL.java - -# Generated exception classes -# -FILES_gen_ex = \ - java/nio/BufferOverflowException.java \ - java/nio/BufferUnderflowException.java \ - java/nio/InvalidMarkException.java \ - java/nio/ReadOnlyBufferException.java \ - \ - java/nio/channels/AcceptPendingException.java \ - java/nio/channels/AlreadyBoundException.java \ - java/nio/channels/AlreadyConnectedException.java \ - java/nio/channels/AsynchronousCloseException.java \ - java/nio/channels/CancelledKeyException.java \ - java/nio/channels/ClosedByInterruptException.java \ - java/nio/channels/ClosedChannelException.java \ - java/nio/channels/ClosedSelectorException.java \ - java/nio/channels/ConnectionPendingException.java \ - java/nio/channels/FileLockInterruptionException.java \ - java/nio/channels/IllegalBlockingModeException.java \ - java/nio/channels/IllegalChannelGroupException.java \ - java/nio/channels/IllegalSelectorException.java \ - java/nio/channels/InterruptedByTimeoutException.java \ - java/nio/channels/NoConnectionPendingException.java \ - java/nio/channels/NonReadableChannelException.java \ - java/nio/channels/NonWritableChannelException.java \ - java/nio/channels/NotYetBoundException.java \ - java/nio/channels/NotYetConnectedException.java \ - java/nio/channels/OverlappingFileLockException.java \ - java/nio/channels/ReadPendingException.java \ - java/nio/channels/ShutdownChannelGroupException.java \ - java/nio/channels/UnresolvedAddressException.java \ - java/nio/channels/UnsupportedAddressTypeException.java \ - java/nio/channels/WritePendingException.java \ - \ - java/nio/charset/CharacterCodingException.java \ - java/nio/charset/IllegalCharsetNameException.java \ - java/nio/charset/UnsupportedCharsetException.java - -FILES_gen_sbcs = \ - sun/nio/cs/ISO_8859_2.java \ - sun/nio/cs/ISO_8859_4.java \ - sun/nio/cs/ISO_8859_5.java \ - sun/nio/cs/ISO_8859_7.java \ - sun/nio/cs/ISO_8859_9.java \ - sun/nio/cs/ISO_8859_13.java \ - sun/nio/cs/ISO_8859_15.java \ - sun/nio/cs/IBM437.java \ - sun/nio/cs/IBM737.java \ - sun/nio/cs/IBM775.java \ - sun/nio/cs/IBM850.java \ - sun/nio/cs/IBM852.java \ - sun/nio/cs/IBM855.java \ - sun/nio/cs/IBM857.java \ - sun/nio/cs/IBM858.java \ - sun/nio/cs/IBM862.java \ - sun/nio/cs/IBM866.java \ - sun/nio/cs/IBM874.java \ - sun/nio/cs/KOI8_R.java \ - sun/nio/cs/KOI8_U.java \ - sun/nio/cs/MS1250.java \ - sun/nio/cs/MS1251.java \ - sun/nio/cs/MS1252.java \ - sun/nio/cs/MS1253.java \ - sun/nio/cs/MS1254.java \ - sun/nio/cs/MS1257.java - -FILES_gen_csp = sun/nio/cs/StandardCharsets.java - -FILES_gen_sor = sun/nio/ch/SocketOptionRegistry.java - -FILES_gen = $(FILES_gen_coder) $(FILES_gen_buffer) $(FILES_gen_ex) \ - $(FILES_gen_csp) $(FILES_gen_sor) - -FILES_java = $(FILES_src) $(FILES_gen) $(FILES_gen_sbcs) diff --git a/jdk/makefiles/java/nio/Makefile b/jdk/makefiles/java/nio/Makefile deleted file mode 100644 index dee240f4cb2..00000000000 --- a/jdk/makefiles/java/nio/Makefile +++ /dev/null @@ -1,994 +0,0 @@ -# -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for java.nio -# - -BUILDDIR = ../.. -LEGACY_BUILDDIR = ../../../make -PACKAGE = java.nio -LIBRARY = nio -PRODUCT = java -JAVAC_MAX_WARNINGS = true -JAVAC_WARNINGS_FATAL = true -include $(BUILDDIR)/common/Defs.gmk - -NIO_SRC = $(SHARE_SRC)/classes/java/nio -NIO_GEN = $(GENSRCDIR)/java/nio - -SNIO_SRC = $(SHARE_SRC)/classes/sun/nio -SNIO_GEN = $(GENSRCDIR)/sun/nio - -# -# Files to compile -# - -include FILES_java.gmk -include FILES_c.gmk -include Exportedfiles.gmk - -ifeq ($(PLATFORM), solaris) -FILES_java += \ - sun/nio/ch/AbstractPollSelectorImpl.java \ - sun/nio/ch/DevPollArrayWrapper.java \ - sun/nio/ch/DevPollSelectorImpl.java \ - sun/nio/ch/DevPollSelectorProvider.java \ - sun/nio/ch/InheritedChannel.java \ - sun/nio/ch/PollSelectorProvider.java \ - sun/nio/ch/PollSelectorImpl.java \ - sun/nio/ch/Port.java \ - sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \ - sun/nio/ch/SolarisAsynchronousChannelProvider.java \ - sun/nio/ch/SolarisEventPort.java \ - sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \ - sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \ - \ - sun/nio/fs/GnomeFileTypeDetector.java \ - sun/nio/fs/PollingWatchService.java \ - sun/nio/fs/SolarisAclFileAttributeView.java \ - sun/nio/fs/SolarisFileStore.java \ - sun/nio/fs/SolarisFileSystem.java \ - sun/nio/fs/SolarisFileSystemProvider.java \ - sun/nio/fs/SolarisUserDefinedFileAttributeView.java \ - sun/nio/fs/SolarisNativeDispatcher.java \ - sun/nio/fs/SolarisWatchService.java \ - sun/nio/fs/UnixChannelFactory.java \ - sun/nio/fs/UnixCopyFile.java \ - sun/nio/fs/UnixDirectoryStream.java \ - sun/nio/fs/UnixException.java \ - sun/nio/fs/UnixFileAttributeViews.java \ - sun/nio/fs/UnixFileAttributes.java \ - sun/nio/fs/UnixFileKey.java \ - sun/nio/fs/UnixFileModeAttribute.java \ - sun/nio/fs/UnixFileStore.java \ - sun/nio/fs/UnixFileStoreAttributes.java \ - sun/nio/fs/UnixFileSystem.java \ - sun/nio/fs/UnixFileSystemProvider.java \ - sun/nio/fs/UnixMountEntry.java \ - sun/nio/fs/UnixNativeDispatcher.java \ - sun/nio/fs/UnixPath.java \ - sun/nio/fs/UnixSecureDirectoryStream.java \ - sun/nio/fs/UnixUriUtils.java \ - sun/nio/fs/UnixUserPrincipals.java - -FILES_c += \ - DevPollArrayWrapper.c \ - InheritedChannel.c \ - NativeThread.c \ - PollArrayWrapper.c \ - SolarisEventPort.c \ - UnixAsynchronousServerSocketChannelImpl.c \ - UnixAsynchronousSocketChannelImpl.c \ - \ - GnomeFileTypeDetector.c \ - SolarisNativeDispatcher.c \ - SolarisWatchService.c \ - UnixCopyFile.c \ - UnixNativeDispatcher.c - -FILES_export += \ - sun/nio/ch/DevPollArrayWrapper.java \ - sun/nio/ch/InheritedChannel.java \ - sun/nio/ch/NativeThread.java \ - sun/nio/ch/SolarisEventPort.java \ - sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \ - sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \ - \ - sun/nio/fs/GnomeFileTypeDetector.java \ - sun/nio/fs/SolarisNativeDispatcher.java \ - sun/nio/fs/SolarisWatchService.java \ - sun/nio/fs/UnixCopyFile.java \ - sun/nio/fs/UnixNativeDispatcher.java - -FILES_gen += \ - sun/nio/fs/SolarisConstants.java \ - sun/nio/fs/UnixConstants.java -endif # PLATFORM = solaris - -ifeq ($(PLATFORM), windows) -FILES_java += \ - sun/nio/ch/Iocp.java \ - sun/nio/ch/PendingIoCache.java \ - sun/nio/ch/WindowsAsynchronousChannelProvider.java \ - sun/nio/ch/WindowsAsynchronousFileChannelImpl.java \ - sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java \ - sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java \ - sun/nio/ch/WindowsSelectorImpl.java \ - sun/nio/ch/WindowsSelectorProvider.java \ - \ - sun/nio/fs/RegistryFileTypeDetector.java \ - sun/nio/fs/WindowsAclFileAttributeView.java \ - sun/nio/fs/WindowsChannelFactory.java \ - sun/nio/fs/WindowsConstants.java \ - sun/nio/fs/WindowsDirectoryStream.java \ - sun/nio/fs/WindowsException.java \ - sun/nio/fs/WindowsFileAttributeViews.java \ - sun/nio/fs/WindowsFileAttributes.java \ - sun/nio/fs/WindowsFileCopy.java \ - sun/nio/fs/WindowsFileStore.java \ - sun/nio/fs/WindowsFileSystem.java \ - sun/nio/fs/WindowsFileSystemProvider.java \ - sun/nio/fs/WindowsLinkSupport.java \ - sun/nio/fs/WindowsUserDefinedFileAttributeView.java \ - sun/nio/fs/WindowsNativeDispatcher.java \ - sun/nio/fs/WindowsPath.java \ - sun/nio/fs/WindowsPathParser.java \ - sun/nio/fs/WindowsPathType.java \ - sun/nio/fs/WindowsSecurity.java \ - sun/nio/fs/WindowsSecurityDescriptor.java \ - sun/nio/fs/WindowsUriSupport.java \ - sun/nio/fs/WindowsUserPrincipals.java \ - sun/nio/fs/WindowsWatchService.java - -FILES_c += \ - Iocp.c \ - RegistryFileTypeDetector.c \ - WindowsAsynchronousFileChannelImpl.c \ - WindowsAsynchronousServerSocketChannelImpl.c \ - WindowsAsynchronousSocketChannelImpl.c \ - WindowsNativeDispatcher.c \ - WindowsSelectorImpl.c - -FILES_export += \ - sun/nio/ch/Iocp.java \ - sun/nio/ch/WindowsAsynchronousFileChannelImpl.java \ - sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java \ - sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java \ - sun/nio/ch/WindowsSelectorImpl.java \ - sun/nio/fs/WindowsNativeDispatcher.java \ - sun/nio/fs/RegistryFileTypeDetector.java -endif # PLATFORM = windows - -ifeq ($(PLATFORM), linux) -FILES_java += \ - sun/nio/ch/AbstractPollSelectorImpl.java \ - sun/nio/ch/EPoll.java \ - sun/nio/ch/EPollArrayWrapper.java \ - sun/nio/ch/EPollPort.java \ - sun/nio/ch/EPollSelectorProvider.java \ - sun/nio/ch/EPollSelectorImpl.java \ - sun/nio/ch/InheritedChannel.java \ - sun/nio/ch/LinuxAsynchronousChannelProvider.java \ - sun/nio/ch/PollSelectorProvider.java \ - sun/nio/ch/PollSelectorImpl.java \ - sun/nio/ch/Port.java \ - sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \ - sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \ - sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \ - \ - sun/nio/fs/GnomeFileTypeDetector.java \ - sun/nio/fs/LinuxDosFileAttributeView.java \ - sun/nio/fs/LinuxFileStore.java \ - sun/nio/fs/LinuxFileSystem.java \ - sun/nio/fs/LinuxFileSystemProvider.java \ - sun/nio/fs/LinuxUserDefinedFileAttributeView.java \ - sun/nio/fs/LinuxNativeDispatcher.java \ - sun/nio/fs/LinuxWatchService.java \ - sun/nio/fs/UnixChannelFactory.java \ - sun/nio/fs/UnixCopyFile.java \ - sun/nio/fs/UnixDirectoryStream.java \ - sun/nio/fs/UnixException.java \ - sun/nio/fs/UnixFileAttributeViews.java \ - sun/nio/fs/UnixFileAttributes.java \ - sun/nio/fs/UnixFileKey.java \ - sun/nio/fs/UnixFileModeAttribute.java \ - sun/nio/fs/UnixFileStore.java \ - sun/nio/fs/UnixFileStoreAttributes.java \ - sun/nio/fs/UnixFileSystem.java \ - sun/nio/fs/UnixFileSystemProvider.java \ - sun/nio/fs/UnixMountEntry.java \ - sun/nio/fs/UnixNativeDispatcher.java \ - sun/nio/fs/UnixPath.java \ - sun/nio/fs/UnixSecureDirectoryStream.java \ - sun/nio/fs/UnixUriUtils.java \ - sun/nio/fs/UnixUserPrincipals.java - -FILES_c += \ - EPoll.c \ - EPollArrayWrapper.c \ - EPollPort.c \ - InheritedChannel.c \ - NativeThread.c \ - PollArrayWrapper.c \ - UnixAsynchronousServerSocketChannelImpl.c \ - UnixAsynchronousSocketChannelImpl.c \ - \ - GnomeFileTypeDetector.c \ - LinuxNativeDispatcher.c \ - LinuxWatchService.c \ - UnixCopyFile.c \ - UnixNativeDispatcher.c - -FILES_export += \ - sun/nio/ch/EPoll.java \ - sun/nio/ch/EPollArrayWrapper.java \ - sun/nio/ch/EPollPort.java \ - sun/nio/ch/InheritedChannel.java \ - sun/nio/ch/NativeThread.java \ - sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \ - sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \ - \ - sun/nio/fs/GnomeFileTypeDetector.java \ - sun/nio/fs/LinuxNativeDispatcher.java \ - sun/nio/fs/LinuxWatchService.java \ - sun/nio/fs/UnixCopyFile.java \ - sun/nio/fs/UnixNativeDispatcher.java - -FILES_gen += \ - sun/nio/fs/UnixConstants.java -endif # PLATFORM = linux - -ifeq ($(PLATFORM), macosx) -FILES_java += \ - sun/nio/ch/AbstractPollSelectorImpl.java \ - sun/nio/ch/BsdAsynchronousChannelProvider.java \ - sun/nio/ch/InheritedChannel.java \ - sun/nio/ch/KQueue.java \ - sun/nio/ch/KQueuePort.java \ - sun/nio/ch/PollSelectorProvider.java \ - sun/nio/ch/PollSelectorImpl.java \ - sun/nio/ch/Port.java \ - sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \ - sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \ - sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \ - \ - sun/nio/fs/GnomeFileTypeDetector.java \ - sun/nio/fs/BsdFileStore.java \ - sun/nio/fs/BsdFileSystem.java \ - sun/nio/fs/BsdFileSystemProvider.java \ - sun/nio/fs/BsdNativeDispatcher.java \ - sun/nio/fs/PollingWatchService.java \ - sun/nio/fs/UnixChannelFactory.java \ - sun/nio/fs/UnixCopyFile.java \ - sun/nio/fs/UnixDirectoryStream.java \ - sun/nio/fs/UnixException.java \ - sun/nio/fs/UnixFileAttributeViews.java \ - sun/nio/fs/UnixFileAttributes.java \ - sun/nio/fs/UnixFileKey.java \ - sun/nio/fs/UnixFileModeAttribute.java \ - sun/nio/fs/UnixFileStore.java \ - sun/nio/fs/UnixFileStoreAttributes.java \ - sun/nio/fs/UnixFileSystem.java \ - sun/nio/fs/UnixFileSystemProvider.java \ - sun/nio/fs/UnixMountEntry.java \ - sun/nio/fs/UnixNativeDispatcher.java \ - sun/nio/fs/UnixPath.java \ - sun/nio/fs/UnixSecureDirectoryStream.java \ - sun/nio/fs/UnixUriUtils.java \ - sun/nio/fs/UnixUserPrincipals.java - -FILES_c += \ - InheritedChannel.c \ - NativeThread.c \ - PollArrayWrapper.c \ - UnixAsynchronousServerSocketChannelImpl.c \ - UnixAsynchronousSocketChannelImpl.c \ - \ - GnomeFileTypeDetector.c \ - BsdNativeDispatcher.c \ - UnixCopyFile.c \ - UnixNativeDispatcher.c \ - \ - KQueue.c \ - KQueuePort.c - -FILES_export += \ - sun/nio/ch/InheritedChannel.java \ - sun/nio/ch/KQueue.java \ - sun/nio/ch/KQueuePort.java \ - sun/nio/ch/NativeThread.java \ - sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \ - sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \ - \ - sun/nio/fs/GnomeFileTypeDetector.java \ - sun/nio/fs/BsdNativeDispatcher.java \ - sun/nio/fs/UnixCopyFile.java \ - sun/nio/fs/UnixNativeDispatcher.java - -FILES_gen += \ - sun/nio/fs/UnixConstants.java -endif # PLATFORM = bsd, macosx - -ifeq ($(PLATFORM), macosx) -FILES_java += \ - sun/nio/ch/KQueueSelectorProvider.java \ - sun/nio/ch/KQueueSelectorImpl.java \ - sun/nio/ch/KQueueArrayWrapper.java - -FILES_c += \ - KQueueArrayWrapper.c - -vpath %.c $(call NativeSrcDirList,,native/sun/nio/fs) -vpath %.c $(call NativeSrcDirList,,native/sun/nio/ch) - -else - -# -# Find platform-specific C source files -# -vpath %.c $(PLATFORM_SRC)/native/sun/nio/fs -vpath %.c $(PLATFORM_SRC)/native/sun/nio/ch -vpath %.c $(SHARE_SRC)/native/sun/nio/ch - -endif # PLATFORM = macosx - -# -# Various variables -# - -JAVALIB = # Don't self-link - -# -# Access to io_util.c and net_util.c -# - -OTHER_INCLUDES += \ - -I$(SHARE_SRC)/native/sun/nio/ch \ - -I$(SHARE_SRC)/native/java/io \ - -I$(SHARE_SRC)/native/java/net \ - -I$(PLATFORM_SRC)/native/java/net \ - -I$(CLASSHDRDIR)/../../../java.lang/java/CClassHeaders - -ifeq ($(PLATFORM),windows) - OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \ - -libpath:$(LIBDIR) java.lib \ - $(OBJDIR)/../../../../sun/java.net/net/$(OBJDIRNAME)/net.lib \ - $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/io_util.obj \ - $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/FileDescriptor_md.obj -endif -ifeq ($(PLATFORM), linux) -OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL) -endif -ifeq ($(PLATFORM), macosx) -OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread -endif -ifeq ($(PLATFORM), solaris) -OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \ - -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -endif # PLATFORM - -# -# Rules -# - -build: sources - -clean clobber:: - $(RM) -r $(NIO_GEN) $(SNIO_GEN) - $(RM) -r $(CLASSDESTDIR)/java/nio - $(RM) -r $(CLASSDESTDIR)/sun/nio - -ifeq ($(PLATFORM), solaris) -FILES_m = mapfile-solaris -endif -ifeq ($(PLATFORM), linux) -FILES_m = mapfile-linux -endif -ifeq ($(PLATFORM), macosx) -FILES_m = mapfile-bsd -endif -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -# -# Generate source files -# - -FILES_genout = $(FILES_gen:%.java=$(GENSRCDIR)/%.java) - -BUF_SRC=$(NIO_SRC) -CH_SRC=$(NIO_SRC)/channels -CS_SRC=$(NIO_SRC)/charset -SCH_SRC=$(SNIO_SRC)/ch -SCS_SRC=$(SNIO_SRC)/cs -SFS_SRC=$(SNIO_SRC)/fs - -# Template files -HEAP_X_BUF_TEMPLATE=$(BUF_SRC)/Heap-X-Buffer.java.template -BYTE_X_BUF_TEMPLATE=$(BUF_SRC)/ByteBufferAs-X-Buffer.java.template -X_BUF_TEMPLATE=$(BUF_SRC)/X-Buffer.java.template -X_BUF_BIN_TEMPLATE=$(BUF_SRC)/X-Buffer-bin.java.template -DIRECT_X_BUF_TEMPLATE=$(BUF_SRC)/Direct-X-Buffer.java.template -DIRECT_X_BUF_BIN_TEMPLATE=$(BUF_SRC)/Direct-X-Buffer-bin.java.template -CHARSET_X_CODER_TEMPLATE=$(CS_SRC)/Charset-X-Coder.java.template - -BUF_GEN=$(NIO_GEN) -CH_GEN=$(NIO_GEN)/channels -CS_GEN=$(NIO_GEN)/charset -SCH_GEN=$(SNIO_GEN)/ch -SCS_GEN=$(SNIO_GEN)/cs -SFS_GEN=$(SNIO_GEN)/fs - -FILES_gensbcs_out = $(FILES_gen_sbcs:%.java=$(GENSRCDIR)/%.java) - -sources: $(SPP_JARFILE) $(FILES_genout) $(FILES_gensbcs_out) - -# -# Generated buffer classes -# - -GEN_BUFFER_SH = genBuffer.sh - -GEN_BUFFER_CMD = SPP="$(TOOL_SPP)" NAWK="$(NAWK)" SED="$(SED)" SH="$(SH)" \ - $(SH) $(GEN_BUFFER_SH) - -# Public abstract buffer classes -# -$(BUF_GEN)/ByteBuffer.java: $(X_BUF_TEMPLATE) \ - $(X_BUF_BIN_TEMPLATE) \ - $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=byte BIN=1 SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/CharBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=char SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ShortBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=short SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/IntBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=int SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/LongBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=long SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/FloatBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=float SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DoubleBuffer.java: $(X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=double SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ - -# Buffers whose contents are heap-allocated -# -$(BUF_GEN)/HeapByteBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=byte SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapByteBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=byte RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapCharBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=char SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapCharBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=char RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapShortBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=short SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapShortBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=short RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapIntBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=int SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapIntBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=int RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapLongBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=long SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapLongBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=long RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapFloatBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=float SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapFloatBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=float RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapDoubleBuffer.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=double SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/HeapDoubleBuffer%.java: $(HEAP_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=double RW=$* SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ - -# Direct byte buffer -# -$(BUF_GEN)/DirectByteBuffer.java: $(DIRECT_X_BUF_TEMPLATE) \ - $(DIRECT_X_BUF_TEMPLATE) \ - $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=byte BIN=1 SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectByteBuffer%.java: $(DIRECT_X_BUF_TEMPLATE) \ - $(DIRECT_X_BUF_TEMPLATE) \ - $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=byte RW=$* BIN=1 SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ - -# Unswapped views of direct byte buffers -# -$(BUF_GEN)/DirectCharBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=char BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectCharBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=char RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectShortBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=short BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectShortBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=short RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectIntBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=int BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectIntBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=int RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectLongBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=long BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectLongBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=long RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectFloatBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=float BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectFloatBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=float RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectDoubleBufferU.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=double BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectDoubleBuffer%U.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=double RW=$* BO=U SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ - -# Swapped views of direct byte buffers -# -$(BUF_GEN)/DirectCharBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=char BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectCharBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=char RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectShortBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=short BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectShortBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=short RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectIntBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=int BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectIntBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=int RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectLongBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=long BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectLongBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=long RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectFloatBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=float BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectFloatBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=float RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectDoubleBufferS.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=double BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/DirectDoubleBuffer%S.java: $(DIRECT_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=double RW=$* BO=S SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ - -# Big-endian views of byte buffers -# -$(BUF_GEN)/ByteBufferAsCharBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=char BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsCharBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=char RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsShortBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=short BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsShortBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=short RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsIntBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=int BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsIntBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=int RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsLongBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=long BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsLongBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=long RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsFloatBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=float BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsFloatBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=float RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsDoubleBufferB.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=double BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsDoubleBuffer%B.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=double RW=$* BO=B SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ - -# Little-endian views of byte buffers -# -$(BUF_GEN)/ByteBufferAsCharBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=char BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsCharBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=char RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsShortBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=short BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsShortBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=short RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsIntBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=int BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsIntBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=int RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsLongBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=long BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsLongBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=long RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsFloatBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=float BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsFloatBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=float RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsDoubleBufferL.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=double BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ -$(BUF_GEN)/ByteBufferAsDoubleBuffer%L.java: $(BYTE_X_BUF_TEMPLATE) $(GEN_BUFFER_SH) - $(prep-target) - @$(RM) $@.temp - TYPE=double RW=$* BO=L SRC=$< DST=$@.temp $(GEN_BUFFER_CMD) - $(MV) $@.temp $@ - -# -# Generated coder classes -# - -GEN_CODER_SH = genCoder.sh - -GEN_CODER_CMD = SPP="$(TOOL_SPP)" SED="$(SED)" NAWK="$(NAWK)" SH="$(SH)" $(SH) $(GEN_CODER_SH) - -$(CS_GEN)/CharsetDecoder.java: $(CHARSET_X_CODER_TEMPLATE) $(GEN_CODER_SH) - $(prep-target) - @$(RM) $@.temp - $(GEN_CODER_CMD) decoder $< $@.temp - $(MV) $@.temp $@ - -$(CS_GEN)/CharsetEncoder.java: $(CHARSET_X_CODER_TEMPLATE) $(GEN_CODER_SH) - $(prep-target) - @$(RM) $@.temp - $(GEN_CODER_CMD) encoder $< $@.temp - $(MV) $@.temp $@ - -# -# Generated exception classes -# - -GEN_EX_SH = genExceptions.sh - -GEN_EX_CMD = NAWK="$(NAWK)" SH="$(SH)" $(SH) $(GEN_EX_SH) - -$(CH_GEN)/%Exception.java: genExceptions.sh $(CH_SRC)/exceptions - $(prep-target) - @$(RM) $@.temp - $(GEN_EX_CMD) $(CH_SRC)/exceptions $(CH_GEN) - -$(CS_GEN)/%Exception.java: genExceptions.sh $(CS_SRC)/exceptions - $(prep-target) - @$(RM) $@.temp - $(GEN_EX_CMD) $(CS_SRC)/exceptions $(CS_GEN) - -$(BUF_GEN)/%Exception.java: genExceptions.sh $(BUF_SRC)/exceptions - $(prep-target) - @$(RM) $@.temp - $(GEN_EX_CMD) $(BUF_SRC)/exceptions $(BUF_GEN) - -# -# Generated charset-provider classes -# - -$(SCS_GEN)/StandardCharsets.java: genCharsetProvider.sh \ - $(HASHER_JARFILE) $(SCS_SRC)/standard-charsets - $(prep-target) - @$(RM) $@.temp - NAWK="$(NAWK)" TEMPDIR="$(TEMPDIR)" SH="$(SH)" \ - HASHER="$(TOOL_HASHER)" \ - $(SH) -e genCharsetProvider.sh $(SCS_SRC)/standard-charsets $(SCS_GEN) - -# -# Generated channel implementation classes. -# C source is compiled in TEMPDIR to avoid turds left by Windows compilers. -# - -GENSOR_SRC = $(SHARE_SRC)/native/sun/nio/ch/genSocketOptionRegistry.c - -GENSOR_EXE = $(TEMPDIR)/genSocketOptionRegistry$(EXE_SUFFIX) - -SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSOR_SRC) | \ - $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') - -$(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC) - $(install-file) - -ifndef NIO_CC - ifeq ($(PLATFORM), macosx) - NIO_CC=$(HOST_CC) - else - NIO_CC=$(CC) - endif -endif - -$(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC) - $(prep-target) - ($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \ - -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC)) - -ifdef NIO_PLATFORM_CLASSES_ROOT_DIR -$(SCH_GEN)/SocketOptionRegistry.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/ch/SocketOptionRegistry-$(PLATFORM)-$(ARCH).java - $(prep-target) - $(CP) $< $@ -else -$(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE) - $(prep-target) - NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@ - $(GENSOR_EXE) >> $@ -endif -# -# Generated sun.nio.cs SingleByte classes -# -GENCSSRC = $(LEGACY_BUILDDIR)/tools/CharsetMapping - -$(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java.template $(GENCSSRC)/sbcs - @$(prep-target) - $(TOOL_CHARSETMAPPING) $(GENCSSRC) $(SCS_GEN) sbcs - -# -# Generated file system implementation classes (Unix only) -# - -GENUC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genUnixConstants.c - -GENUC_OBJ = $(TEMPDIR)/genUnixConstants.o -GENUC_EXE = $(TEMPDIR)/genUnixConstants - -GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \ - $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') - -$(GENUC_EXE) : $(GENUC_SRC) - $(prep-target) - $(NIO_CC) $(CPPFLAGS) -c -o $(GENUC_OBJ) $(GENUC_SRC) - $(NIO_CC) $(CPPFLAGS) -o $@ $(GENUC_OBJ) - -ifdef NIO_PLATFORM_CLASSES_ROOT_DIR -$(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java - $(prep-target) - $(CP) $< $@ -else -$(SFS_GEN)/UnixConstants.java: $(GENUC_EXE) - $(prep-target) - NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@ - $(GENUC_EXE) >> $@ -endif - -GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c - -GENSC_OBJ = $(TEMPDIR)/genSolarisConstants.o -GENSC_EXE = $(TEMPDIR)/genSolarisConstants - -GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \ - $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') - -$(GENSC_EXE) : $(GENSC_SRC) - $(prep-target) - $(NIO_CC) $(CPPFLAGS) -c -o $(GENSC_OBJ) $(GENSC_SRC) - $(NIO_CC) $(CPPFLAGS) -o $@ $(GENSC_OBJ) - -ifdef NIO_PLATFORM_CLASSES_ROOT_DIR -$(SFS_GEN)/SolarisConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java - $(prep-target) - $(CP) $< $@ -else -$(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE) - $(prep-target) - NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@ - $(GENSC_EXE) >> $@ -endif - -.PHONY: sources diff --git a/jdk/makefiles/java/nio/genBuffer.sh b/jdk/makefiles/java/nio/genBuffer.sh deleted file mode 100644 index 91e6f7e80d1..00000000000 --- a/jdk/makefiles/java/nio/genBuffer.sh +++ /dev/null @@ -1,173 +0,0 @@ -#! /bin/sh - -# -# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# Generate concrete buffer classes - -# Required environment variables -# NAWK SED SPP To invoke tools -# TYPE Primitive type -# SRC Source file -# DST Destination file -# -# Optional environment variables -# RW Mutability: R(ead only), W(ritable) -# BO Byte order: B(ig), L(ittle), S(wapped), U(nswapped) -# BIN Defined => generate binary-data access methods - -type=$TYPE -rw=$RW -rwkey=XX - -case $type in - char) fulltype=character;; - int) fulltype=integer;; - *) fulltype=$type;; -esac - -case $type in - byte) LBPV=0;; - char | short) LBPV=1;; - int | float) LBPV=2;; - long | double) LBPV=3;; -esac - -case $type in - float|double) floatingPointOrIntegralType=floatingPointType;; - *) floatingPointOrIntegralType=integralType;; -esac - -typesAndBits() { - - type="$1"; BO="$2" - memtype=$type; swaptype=$type; frombits=; tobits= - - case $type in - float) memtype=int - if [ x$BO != xU ]; then - swaptype=int - fromBits=Float.intBitsToFloat - toBits=Float.floatToRawIntBits - fi;; - double) memtype=long - if [ x$BO != xU ]; then - swaptype=long - fromBits=Double.longBitsToDouble - toBits=Double.doubleToRawLongBits - fi;; - esac - - echo memtype=$memtype swaptype=$swaptype fromBits=$fromBits toBits=$toBits - - echo $type $fulltype $memtype $swaptype \ - | $NAWK '{ type = $1; fulltype = $2; memtype = $3; swaptype = $4; - x = substr(type, 1, 1); - Type = toupper(x) substr(type, 2); - Fulltype = toupper(x) substr(fulltype, 2); - Memtype = toupper(substr(memtype, 1, 1)) substr(memtype, 2); - Swaptype = toupper(substr(swaptype, 1, 1)) substr(swaptype, 2); - printf("Type=%s x=%s Fulltype=%s Memtype=%s Swaptype=%s ", - Type, x, Fulltype, Memtype, Swaptype); }' - - echo "swap=`if [ x$BO = xS ]; then echo Bits.swap; fi`" - -} - -eval `typesAndBits $type $BO` - -a=`if [ $type = int ]; then echo an; else echo a; fi` -A=`if [ $type = int ]; then echo An; else echo A; fi` - -if [ "x$rw" = xR ]; then rwkey=ro; else rwkey=rw; fi - -set -e - -$SPP <$SRC >$DST \ - -K$type \ - -K$floatingPointOrIntegralType \ - -Dtype=$type \ - -DType=$Type \ - -Dfulltype=$fulltype \ - -DFulltype=$Fulltype \ - -Dx=$x \ - -Dmemtype=$memtype \ - -DMemtype=$Memtype \ - -DSwaptype=$Swaptype \ - -DfromBits=$fromBits \ - -DtoBits=$toBits \ - -DLG_BYTES_PER_VALUE=$LBPV \ - -DBYTES_PER_VALUE="(1 << $LBPV)" \ - -DBO=$BO \ - -Dswap=$swap \ - -DRW=$rw \ - -K$rwkey \ - -Da=$a \ - -DA=$A \ - -Kbo$BO - -if [ $BIN ]; then - - genBinOps() { - type="$1" - Type=`echo $1 | $NAWK '{ print toupper(substr($1, 1, 1)) substr($1, 2) }'` - fulltype="$2" - LBPV="$3" - nbytes="$4" - nbytesButOne="$5" - a=`if [ $type = int ]; then echo an; else echo a; fi` - src=$6 - eval `typesAndBits $type` - $SPP <$src \ - -Dtype=$type \ - -DType=$Type \ - -Dfulltype=$fulltype \ - -Dmemtype=$memtype \ - -DMemtype=$Memtype \ - -DfromBits=$fromBits \ - -DtoBits=$toBits \ - -DLG_BYTES_PER_VALUE=$LBPV \ - -DBYTES_PER_VALUE="(1 << $LBPV)" \ - -Dnbytes=$nbytes \ - -DnbytesButOne=$nbytesButOne \ - -DRW=$rw \ - -K$rwkey \ - -Da=$a \ - -be - } - - mv $DST $DST.tmp - sed -e '/#BIN/,$d' <$DST.tmp >$DST - rm -f $DST.tmp - binops=`dirname $SRC`/`basename $SRC .java.template`-bin.java.template - genBinOps char character 1 two one $binops >>$DST - genBinOps short short 1 two one $binops >>$DST - genBinOps int integer 2 four three $binops >>$DST - genBinOps long long 3 eight seven $binops >>$DST - genBinOps float float 2 four three $binops >>$DST - genBinOps double double 3 eight seven $binops >>$DST - echo '}' >>$DST - -fi diff --git a/jdk/makefiles/java/nio/genCoder.sh b/jdk/makefiles/java/nio/genCoder.sh deleted file mode 100644 index 4a2668d75b7..00000000000 --- a/jdk/makefiles/java/nio/genCoder.sh +++ /dev/null @@ -1,99 +0,0 @@ -#! /bin/sh - -# -# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# Generate charset coder and decoder classes - -# Environment variables required from make: SED SPP - -what=$1 -SRC=$2 -DST=$3 - -if [ x$what = xdecoder ]; then - - echo ' '$SRC '--('$what')-->' $DST - $SPP <$SRC >$DST \ - -K$what \ - -DA='A' \ - -Da='a' \ - -DCode='Decode' \ - -Dcode='decode' \ - -DitypesPhrase='bytes in a specific charset' \ - -DotypesPhrase='sixteen-bit Unicode characters' \ - -Ditype='byte' \ - -Dotype='character' \ - -DItype='Byte' \ - -DOtype='Char' \ - -Dcoder='decoder' \ - -DCoder='Decoder' \ - -Dcoding='decoding' \ - -DOtherCoder='Encoder' \ - -DreplTypeName='string' \ - -DdefaultRepl='"\\uFFFD"' \ - -DdefaultReplName='"\\uFFFD"<\/tt>' \ - -DreplType='String' \ - -DreplFQType='java.lang.String' \ - -DreplLength='length()' \ - -DItypesPerOtype='CharsPerByte' \ - -DnotLegal='not legal for this charset' \ - -Dotypes-per-itype='chars-per-byte' \ - -DoutSequence='Unicode character' - -elif [ x$what = xencoder ]; then - - echo ' '$SRC '--('$what')-->' $DST - $SPP <$SRC >$DST \ - -K$what \ - -DA='An' \ - -Da='an' \ - -DCode='Encode' \ - -Dcode='encode' \ - -DitypesPhrase='sixteen-bit Unicode characters' \ - -DotypesPhrase='bytes in a specific charset' \ - -Ditype='character' \ - -Dotype='byte' \ - -DItype='Char' \ - -DOtype='Byte' \ - -Dcoder='encoder' \ - -DCoder='Encoder' \ - -Dcoding='encoding' \ - -DOtherCoder='Decoder' \ - -DreplTypeName='byte array' \ - -DdefaultRepl='new byte[] { (byte)'"'"\\?"'"' }' \ - -DdefaultReplName='{<\/tt>\ (byte)'"'"\\?"'"'<\/tt>\ }<\/tt>' \ - -DreplType='byte[]' \ - -DreplFQType='byte[]' \ - -DreplLength='length' \ - -DItypesPerOtype='BytesPerChar' \ - -DnotLegal='not a legal sixteen-bit Unicode sequence' \ - -Dotypes-per-itype='bytes-per-char' \ - -DoutSequence='byte sequence in the given charset' - -else - echo Illegal coder type: $what - exit 1 -fi diff --git a/jdk/makefiles/java/npt/Makefile b/jdk/makefiles/java/npt/Makefile deleted file mode 100644 index e5efd9dd423..00000000000 --- a/jdk/makefiles/java/npt/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. - -# It's currently used by jpda and hprof. Put it in base module for now. -LIBRARY = npt -PRODUCT = sun -LIBRARY_OUTPUT = npt - -# Configure the CFLAGS for this library. - -FILES_m = mapfile-vers - -include $(BUILDDIR)/common/Defs.gmk - -SRCDIR=$(SHARE_SRC)/npt -PSRCDIR=$(PLATFORM_SRC)/npt - -# Use the mapfile-vers (See the mapfile located with this Makefile) -ifdef FILES_m -include $(BUILDDIR)/common/Mapfile-vers.gmk -endif - -# -# Files to compile. -# -FILES_c = \ - npt.c \ - utf.c \ - utf_md.c - -OTHER_INCLUDES = -I$(SRCDIR) -I$(PSRCDIR) - -# -# Library to compile. -# -include $(BUILDDIR)/common/Library.gmk - -# We don't want to link against -ljava -JAVALIB= - -# Add -export options to explicitly spell exported symbols -ifeq ($(PLATFORM), windows) - OTHER_LCF += -export:nptInitialize -export:nptTerminate -endif - -# Add location of iconv header -ifeq ($(PLATFORM), macosx) - OTHER_LDLIBS += -liconv -endif - -# -# Add to ambient vpath so we pick up the library files -# -vpath %.c $(SRCDIR):$(PSRCDIR) - diff --git a/jdk/makefiles/java/redist/Makefile b/jdk/makefiles/java/redist/Makefile index 5c623b2de78..88420927a80 100644 --- a/jdk/makefiles/java/redist/Makefile +++ b/jdk/makefiles/java/redist/Makefile @@ -74,7 +74,7 @@ CLASSSHARINGDATA_DIR = $(BUILDDIR)/../make/tools/sharing # Needed to do file copy ABS_BUILDDIR :=$(call FullPath,$(BUILDDIR)) -SUBDIRS_desktop = fonts +SUBDIRS_desktop = SUBDIRS_tools = sajdi include $(BUILDDIR)/common/Subdirs.gmk diff --git a/jdk/makefiles/java/redist/fonts/Makefile b/jdk/makefiles/java/redist/fonts/Makefile deleted file mode 100644 index d98fb8fb13b..00000000000 --- a/jdk/makefiles/java/redist/fonts/Makefile +++ /dev/null @@ -1,110 +0,0 @@ -# -# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PRODUCT = java -include $(BUILDDIR)/common/Defs.gmk - - -# -# List of lucida font files that we redistribute. -# - -SHARED_FONTFILES = \ - $(LIBDIR)/fonts/LucidaTypewriterRegular.ttf \ - $(LIBDIR)/fonts/LucidaTypewriterBold.ttf \ - $(LIBDIR)/fonts/LucidaBrightRegular.ttf \ - $(LIBDIR)/fonts/LucidaBrightDemiBold.ttf \ - $(LIBDIR)/fonts/LucidaBrightItalic.ttf \ - $(LIBDIR)/fonts/LucidaBrightDemiItalic.ttf \ - $(LIBDIR)/fonts/LucidaSansRegular.ttf \ - $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \ - -ifeq ($(PLATFORM), linux) - -# The oblique versions of the font are derived from the base versions -# and since 2D can do this derivation on the fly at run time there is no -# need to redistribute the fonts. An exception to this is on Linux. -# The reason is that the Lucidas are specified in the font.properties files -# on Linux, and so AWT/Motif components expect to be able to ask the Xserver -# for these oblique fonts, but the Xserver cannot do the same derivation as -# 2D can. - -OBLIQUE_FONTFILES = \ - $(LIBDIR)/oblique-fonts/LucidaTypewriterOblique.ttf \ - $(LIBDIR)/oblique-fonts/LucidaTypewriterBoldOblique.ttf \ - $(LIBDIR)/oblique-fonts/LucidaSansOblique.ttf \ - $(LIBDIR)/oblique-fonts/LucidaSansDemiOblique.ttf \ - -endif - -ifndef OPENJDK - -# Lucida font files are not included in the OpenJDK distribution. -# Get names of font files - -# Copy font files into OUTPUTDIR area - -FONTFILES = $(SHARED_FONTFILES) -FONTSDIR = $(LIBDIR)/fonts -FONTSDIRFILE = $(FONTSDIR)/fonts.dir -INTERNAL_IMPORT_LIST = $(FONTFILES) - -ifneq ($(PLATFORM), windows) - INTERNAL_IMPORT_LIST += $(FONTSDIRFILE) -endif - -$(LIBDIR)/fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/%.ttf - $(install-file) - -$(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir - $(install-file) - -ifeq ($(PLATFORM), linux) - -# The oblique fonts are only needed/wanted on Linux. - -OBLFONTSDIR = $(LIBDIR)/oblique-fonts -OBLFONTSDIRFILE = $(OBLFONTSDIR)/fonts.dir -INTERNAL_IMPORT_LIST += $(OBLIQUE_FONTFILES) $(OBLFONTSDIRFILE) - -$(LIBDIR)/oblique-fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/oblique/%.ttf - $(install-file) - -$(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir - $(install-file) - -endif # linux - -all build : $(INTERNAL_IMPORT_LIST) - -clean clobber:: - $(RM) $(INTERNAL_IMPORT_LIST) - -else - -all build clean clobber : - -endif # !OPENJDK diff --git a/jdk/makefiles/java/redist/sajdi/Makefile b/jdk/makefiles/java/redist/sajdi/Makefile index 1e1e818772d..6bec18ce9d0 100644 --- a/jdk/makefiles/java/redist/sajdi/Makefile +++ b/jdk/makefiles/java/redist/sajdi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -54,14 +54,26 @@ IMPORT_LIST = ifeq ($(INCLUDE_SA), true) IMPORT_LIST += $(LIBDIR)/sa-jdi.jar \ $(LIB_LOCATION)/$(SALIB_NAME) - ifeq ($(PLATFORM), windows) - IMPORT_LIST += $(LIB_LOCATION)/$(SAMAP_NAME) \ - $(LIB_LOCATION)/$(SAPDB_NAME) - endif - ifneq ($(OBJCOPY),) - # the import JDK may not contain .debuginfo files - ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SA_DEBUGINFO_NAME)),) - IMPORT_LIST += $(LIB_LOCATION)/$(SA_DEBUGINFO_NAME) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(ZIP_DEBUGINFO_FILES),1) + # the import JDK may not contain .diz files + ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SA_DIZ_NAME)),) + IMPORT_LIST += $(LIB_LOCATION)/$(SA_DIZ_NAME) + endif + else + ifeq ($(PLATFORM), windows) + # the import JDK may not contain .pdb files + ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SAPDB_NAME)),) + # assume .map file is present if .pdb is present + IMPORT_LIST += $(LIB_LOCATION)/$(SAMAP_NAME) \ + $(LIB_LOCATION)/$(SAPDB_NAME) + endif + else + # the import JDK may not contain .debuginfo files + ifneq ($(wildcard $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(SA_DEBUGINFO_NAME)),) + IMPORT_LIST += $(LIB_LOCATION)/$(SA_DEBUGINFO_NAME) + endif + endif endif endif endif # INCLUDE_SA @@ -80,17 +92,22 @@ $(LIBDIR)/sa-jdi.jar: $(HOTSPOT_IMPORT_PATH)/lib/sa-jdi.jar $(LIB_LOCATION)/$(SALIB_NAME): $(HOTSPOT_SALIB_PATH)/$(SALIB_NAME) $(install-import-file) -ifeq ($(PLATFORM), windows) + ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) + ifeq ($(ZIP_DEBUGINFO_FILES),1) +$(LIB_LOCATION)/$(SA_DIZ_NAME): $(HOTSPOT_SALIB_PATH)/$(SA_DIZ_NAME) + $(install-import-file) + else + ifeq ($(PLATFORM), windows) $(LIB_LOCATION)/$(SAPDB_NAME): $(HOTSPOT_SALIB_PATH)/$(SAPDB_NAME) $(install-import-file) $(LIB_LOCATION)/$(SAMAP_NAME): $(HOTSPOT_SALIB_PATH)/$(SAMAP_NAME) $(install-import-file) -endif # windows - - ifneq ($(OBJCOPY),) + else $(LIB_LOCATION)/$(SA_DEBUGINFO_NAME): $(HOTSPOT_SALIB_PATH)/$(SA_DEBUGINFO_NAME) $(install-import-file) + endif + endif endif endif # INCLUDE_SA diff --git a/jdk/makefiles/java/security/Makefile b/jdk/makefiles/java/security/Makefile deleted file mode 100644 index 19f43144ae7..00000000000 --- a/jdk/makefiles/java/security/Makefile +++ /dev/null @@ -1,125 +0,0 @@ -# -# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PACKAGE = java.security -PRODUCT = sun -JAVAC_MAX_WARNINGS = true -JAVAC_LINT_OPTIONS = -Xlint:all -JAVAC_WARNINGS_FATAL = true -include $(BUILDDIR)/common/Defs.gmk - -# -# Rules -# -AUTO_FILES_JAVA_DIRS = java/security - -# -# Directories -# - -PROPS_SRC = $(JDK_TOPDIR)/src/share/lib/security/java.security - -ifeq ($(PLATFORM), solaris) -PROPS_SRC = $(JDK_TOPDIR)/src/share/lib/security/java.security-solaris - -else # NOT_SOLARIS - -# Register Microsoft CryptoAPI provider only on Windows platform. -ifeq ($(PLATFORM), windows) - PROPS_SRC = $(JDK_TOPDIR)/src/share/lib/security/java.security-windows -else # NOT_WINDOWS - -ifeq ($(PLATFORM), macosx) - PROPS_SRC = $(JDK_TOPDIR)/src/share/lib/security/java.security-macosx -endif # MACOSX - -endif # NOT_WINDOWS -endif # NOT_SOLARIS - - -PROPS_BUILD = $(LIBDIR)/security/java.security - -POLICY_SRC = $(JDK_TOPDIR)/src/share/lib/security/java.policy -POLICY_BUILD = $(LIBDIR)/security/java.policy - -CACERTS_SRC = $(CACERTS_FILE) -CACERTS_BUILD = $(LIBDIR)/security/cacerts - -ifndef OPENJDK - BLACKLIST_SRC = $(CLOSED_SHARE_SRC)/lib/security/blacklist - BLACKLIST_BUILD = $(LIBDIR)/security/blacklist - TRUSTEDLIBS_SRC = $(CLOSED_SHARE_SRC)/lib/security/trusted.libraries - TRUSTEDLIBS_BUILD = $(LIBDIR)/security/trusted.libraries -endif - -FILES_class = $(FILES_java:%.java=$(CLASSBINDIR)/%.class) - -# -# Rules -# -include $(BUILDDIR)/common/Rules.gmk - -ifdef OPENJDK -build: properties policy cacerts -else -build: properties policy cacerts blacklist trustedlibs -endif - -install: all - -properties: classes $(PROPS_BUILD) - -policy: classes $(POLICY_BUILD) - -cacerts: classes $(CACERTS_BUILD) - -blacklist: classes $(BLACKLIST_BUILD) - -trustedlibs: classes $(TRUSTEDLIBS_BUILD) - -$(PROPS_BUILD): $(PROPS_SRC) - $(install-file) - -$(POLICY_BUILD): $(POLICY_SRC) - $(install-file) - -$(CACERTS_BUILD): $(CACERTS_SRC) - $(install-file) - -$(BLACKLIST_BUILD): $(BLACKLIST_SRC) - $(install-file) - -$(TRUSTEDLIBS_BUILD): $(TRUSTEDLIBS_SRC) - $(install-file) - -clean clobber:: .delete.classlist - $(RM) -r $(CLASSBINDIR)/java/security - $(RM) $(PROPS_BUILD) $(POLICY_BUILD) $(CACERTS_BUILD) $(BLACKLIST_BUILD) $(TRUSTEDLIBS_BUILD) - -# Additional Rule for building sun.security.util -$(CLASSBINDIR)/%.class: $(SHARE_SRC)/sun/%.java - @$(ECHO) $? >> $(TEMPDIR)/.classes.list - diff --git a/jdk/makefiles/java/sun_nio/FILES_java.gmk b/jdk/makefiles/java/sun_nio/FILES_java.gmk deleted file mode 100644 index b00fb04c588..00000000000 --- a/jdk/makefiles/java/sun_nio/FILES_java.gmk +++ /dev/null @@ -1,78 +0,0 @@ -# -# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# This is the list of java classes that will be automatically built -# from sources. See Exportedfiles.gmk for the list of files which -# will generate header files -# -FILES_java = \ - sun/nio/cs/StandardCharsets.java \ - sun/nio/cs/AbstractCharsetProvider.java \ - sun/nio/cs/HistoricallyNamedCharset.java \ - sun/nio/cs/Surrogate.java \ - sun/nio/cs/CharsetMapping.java \ - sun/nio/cs/SingleByteEncoder.java \ - sun/nio/cs/SingleByteDecoder.java \ - sun/nio/cs/UnicodeEncoder.java \ - sun/nio/cs/UnicodeDecoder.java \ - sun/nio/cs/ISO_8859_1.java \ - sun/nio/cs/ISO_8859_2.java \ - sun/nio/cs/ISO_8859_4.java \ - sun/nio/cs/ISO_8859_5.java \ - sun/nio/cs/ISO_8859_7.java \ - sun/nio/cs/ISO_8859_9.java \ - sun/nio/cs/ISO_8859_13.java \ - sun/nio/cs/ISO_8859_15.java \ - sun/nio/cs/IBM437.java \ - sun/nio/cs/IBM737.java \ - sun/nio/cs/IBM775.java \ - sun/nio/cs/IBM850.java \ - sun/nio/cs/IBM852.java \ - sun/nio/cs/IBM855.java \ - sun/nio/cs/IBM857.java \ - sun/nio/cs/IBM858.java \ - sun/nio/cs/IBM862.java \ - sun/nio/cs/IBM866.java \ - sun/nio/cs/IBM874.java \ - sun/nio/cs/KOI8_R.java \ - sun/nio/cs/KOI8_U.java \ - sun/nio/cs/MS1250.java \ - sun/nio/cs/MS1251.java \ - sun/nio/cs/MS1252.java \ - sun/nio/cs/MS1253.java \ - sun/nio/cs/MS1254.java \ - sun/nio/cs/MS1257.java \ - sun/nio/cs/US_ASCII.java \ - sun/nio/cs/UTF_16.java \ - sun/nio/cs/UTF_16BE.java \ - sun/nio/cs/UTF_16LE.java \ - sun/nio/cs/UTF_16LE_BOM.java \ - sun/nio/cs/UTF_32.java \ - sun/nio/cs/UTF_32BE.java \ - sun/nio/cs/UTF_32LE.java \ - sun/nio/cs/UTF_32BE_BOM.java \ - sun/nio/cs/UTF_32LE_BOM.java - diff --git a/jdk/makefiles/java/sun_nio/Makefile b/jdk/makefiles/java/sun_nio/Makefile deleted file mode 100644 index 122c58aa812..00000000000 --- a/jdk/makefiles/java/sun_nio/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for sun/nio files -# - -BUILDDIR = ../.. -PACKAGE = sun.nio -PRODUCT = sun - -JAVAC_MAX_WARNINGS = true -JAVAC_WARNINGS_FATAL = true -include $(BUILDDIR)/common/Defs.gmk - -# -# Files to compile. -# -include FILES_java.gmk - -# -# Install .lib file. -# -INSTALL_DOT_LIB = true - -include $(BUILDDIR)/common/Classes.gmk - -clean:: - $(RM) -r $(CLASSHDRDIR) -clobber:: - $(RM) -r $(CLASSBINDIR)/sun/nio/cs diff --git a/jdk/makefiles/java/util/FILES_java.gmk b/jdk/makefiles/java/util/FILES_java.gmk deleted file mode 100644 index 8746e024bdf..00000000000 --- a/jdk/makefiles/java/util/FILES_java.gmk +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_java = \ - sun/util/resources/LocaleData.java \ - sun/util/resources/OpenListResourceBundle.java \ - sun/util/resources/LocaleNamesBundle.java \ - sun/util/resources/TimeZoneNamesBundle.java \ - sun/util/resources/TimeZoneNames.java \ - sun/util/resources/TimeZoneNames_de.java \ - sun/util/resources/TimeZoneNames_en.java \ - sun/util/resources/TimeZoneNames_en_CA.java \ - sun/util/resources/TimeZoneNames_en_GB.java \ - sun/util/resources/TimeZoneNames_en_IE.java \ - sun/util/resources/TimeZoneNames_es.java \ - sun/util/resources/TimeZoneNames_fr.java \ - sun/util/resources/TimeZoneNames_it.java \ - sun/util/resources/TimeZoneNames_pt_BR.java \ - sun/util/resources/TimeZoneNames_sv.java diff --git a/jdk/makefiles/java/util/FILES_properties.gmk b/jdk/makefiles/java/util/FILES_properties.gmk deleted file mode 100644 index 5aa6cbfaef5..00000000000 --- a/jdk/makefiles/java/util/FILES_properties.gmk +++ /dev/null @@ -1,213 +0,0 @@ -# -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_compiled_properties = \ - sun/util/resources/LocaleNames.properties \ - sun/util/resources/LocaleNames_be.properties \ - sun/util/resources/LocaleNames_bg.properties \ - sun/util/resources/LocaleNames_ca.properties \ - sun/util/resources/LocaleNames_cs.properties \ - sun/util/resources/LocaleNames_da.properties \ - sun/util/resources/LocaleNames_de.properties \ - sun/util/resources/LocaleNames_el.properties \ - sun/util/resources/LocaleNames_el_CY.properties \ - sun/util/resources/LocaleNames_en.properties \ - sun/util/resources/LocaleNames_en_MT.properties \ - sun/util/resources/LocaleNames_en_PH.properties \ - sun/util/resources/LocaleNames_en_SG.properties \ - sun/util/resources/LocaleNames_es.properties \ - sun/util/resources/LocaleNames_es_US.properties \ - sun/util/resources/LocaleNames_et.properties \ - sun/util/resources/LocaleNames_fi.properties \ - sun/util/resources/LocaleNames_fr.properties \ - sun/util/resources/LocaleNames_ga.properties \ - sun/util/resources/LocaleNames_hr.properties \ - sun/util/resources/LocaleNames_hu.properties \ - sun/util/resources/LocaleNames_in.properties \ - sun/util/resources/LocaleNames_is.properties \ - sun/util/resources/LocaleNames_it.properties \ - sun/util/resources/LocaleNames_lt.properties \ - sun/util/resources/LocaleNames_lv.properties \ - sun/util/resources/LocaleNames_mk.properties \ - sun/util/resources/LocaleNames_ms.properties \ - sun/util/resources/LocaleNames_mt.properties \ - sun/util/resources/LocaleNames_nl.properties \ - sun/util/resources/LocaleNames_no.properties \ - sun/util/resources/LocaleNames_no_NO_NY.properties \ - sun/util/resources/LocaleNames_pl.properties \ - sun/util/resources/LocaleNames_pt.properties \ - sun/util/resources/LocaleNames_pt_BR.properties \ - sun/util/resources/LocaleNames_pt_PT.properties \ - sun/util/resources/LocaleNames_ro.properties \ - sun/util/resources/LocaleNames_ru.properties \ - sun/util/resources/LocaleNames_sk.properties \ - sun/util/resources/LocaleNames_sl.properties \ - sun/util/resources/LocaleNames_sq.properties \ - sun/util/resources/LocaleNames_sr.properties \ - sun/util/resources/LocaleNames_sr_Latn.properties \ - sun/util/resources/LocaleNames_sv.properties \ - sun/util/resources/LocaleNames_tr.properties \ - sun/util/resources/LocaleNames_uk.properties \ - \ - sun/util/resources/CalendarData.properties \ - sun/util/resources/CalendarData_be.properties \ - sun/util/resources/CalendarData_bg.properties \ - sun/util/resources/CalendarData_ca.properties \ - sun/util/resources/CalendarData_cs.properties \ - sun/util/resources/CalendarData_da.properties \ - sun/util/resources/CalendarData_de.properties \ - sun/util/resources/CalendarData_el.properties \ - sun/util/resources/CalendarData_el_CY.properties \ - sun/util/resources/CalendarData_en.properties \ - sun/util/resources/CalendarData_en_GB.properties \ - sun/util/resources/CalendarData_en_IE.properties \ - sun/util/resources/CalendarData_en_MT.properties \ - sun/util/resources/CalendarData_es.properties \ - sun/util/resources/CalendarData_es_ES.properties \ - sun/util/resources/CalendarData_es_US.properties \ - sun/util/resources/CalendarData_et.properties \ - sun/util/resources/CalendarData_fi.properties \ - sun/util/resources/CalendarData_fr.properties \ - sun/util/resources/CalendarData_fr_CA.properties \ - sun/util/resources/CalendarData_hr.properties \ - sun/util/resources/CalendarData_hu.properties \ - sun/util/resources/CalendarData_in_ID.properties \ - sun/util/resources/CalendarData_is.properties \ - sun/util/resources/CalendarData_it.properties \ - sun/util/resources/CalendarData_lt.properties \ - sun/util/resources/CalendarData_lv.properties \ - sun/util/resources/CalendarData_mk.properties \ - sun/util/resources/CalendarData_ms_MY.properties \ - sun/util/resources/CalendarData_mt.properties \ - sun/util/resources/CalendarData_mt_MT.properties \ - sun/util/resources/CalendarData_nl.properties \ - sun/util/resources/CalendarData_no.properties \ - sun/util/resources/CalendarData_pl.properties \ - sun/util/resources/CalendarData_pt.properties \ - sun/util/resources/CalendarData_pt_PT.properties \ - sun/util/resources/CalendarData_ro.properties \ - sun/util/resources/CalendarData_ru.properties \ - sun/util/resources/CalendarData_sk.properties \ - sun/util/resources/CalendarData_sl.properties \ - sun/util/resources/CalendarData_sq.properties \ - sun/util/resources/CalendarData_sr.properties \ - sun/util/resources/CalendarData_sr_Latn_BA.properties \ - sun/util/resources/CalendarData_sr_Latn_ME.properties \ - sun/util/resources/CalendarData_sr_Latn_RS.properties \ - sun/util/resources/CalendarData_sv.properties \ - sun/util/resources/CalendarData_tr.properties \ - sun/util/resources/CalendarData_uk.properties \ - \ - sun/util/resources/CurrencyNames.properties \ - sun/util/resources/CurrencyNames_be_BY.properties \ - sun/util/resources/CurrencyNames_bg_BG.properties \ - sun/util/resources/CurrencyNames_ca_ES.properties \ - sun/util/resources/CurrencyNames_cs_CZ.properties \ - sun/util/resources/CurrencyNames_da_DK.properties \ - sun/util/resources/CurrencyNames_de.properties \ - sun/util/resources/CurrencyNames_de_AT.properties \ - sun/util/resources/CurrencyNames_de_CH.properties \ - sun/util/resources/CurrencyNames_de_DE.properties \ - sun/util/resources/CurrencyNames_de_GR.properties \ - sun/util/resources/CurrencyNames_de_LU.properties \ - sun/util/resources/CurrencyNames_el_CY.properties \ - sun/util/resources/CurrencyNames_el_GR.properties \ - sun/util/resources/CurrencyNames_en_AU.properties \ - sun/util/resources/CurrencyNames_en_CA.properties \ - sun/util/resources/CurrencyNames_en_GB.properties \ - sun/util/resources/CurrencyNames_en_IE.properties \ - sun/util/resources/CurrencyNames_en_IN.properties \ - sun/util/resources/CurrencyNames_en_MT.properties \ - sun/util/resources/CurrencyNames_en_NZ.properties \ - sun/util/resources/CurrencyNames_en_PH.properties \ - sun/util/resources/CurrencyNames_en_SG.properties \ - sun/util/resources/CurrencyNames_en_US.properties \ - sun/util/resources/CurrencyNames_en_ZA.properties \ - sun/util/resources/CurrencyNames_es.properties \ - sun/util/resources/CurrencyNames_es_AR.properties \ - sun/util/resources/CurrencyNames_es_BO.properties \ - sun/util/resources/CurrencyNames_es_CL.properties \ - sun/util/resources/CurrencyNames_es_CO.properties \ - sun/util/resources/CurrencyNames_es_CR.properties \ - sun/util/resources/CurrencyNames_es_CU.properties \ - sun/util/resources/CurrencyNames_es_DO.properties \ - sun/util/resources/CurrencyNames_es_EC.properties \ - sun/util/resources/CurrencyNames_es_ES.properties \ - sun/util/resources/CurrencyNames_es_GT.properties \ - sun/util/resources/CurrencyNames_es_HN.properties \ - sun/util/resources/CurrencyNames_es_MX.properties \ - sun/util/resources/CurrencyNames_es_NI.properties \ - sun/util/resources/CurrencyNames_es_PA.properties \ - sun/util/resources/CurrencyNames_es_PE.properties \ - sun/util/resources/CurrencyNames_es_PR.properties \ - sun/util/resources/CurrencyNames_es_PY.properties \ - sun/util/resources/CurrencyNames_es_SV.properties \ - sun/util/resources/CurrencyNames_es_US.properties \ - sun/util/resources/CurrencyNames_es_UY.properties \ - sun/util/resources/CurrencyNames_es_VE.properties \ - sun/util/resources/CurrencyNames_et_EE.properties \ - sun/util/resources/CurrencyNames_fi_FI.properties \ - sun/util/resources/CurrencyNames_fr.properties \ - sun/util/resources/CurrencyNames_fr_BE.properties \ - sun/util/resources/CurrencyNames_fr_CA.properties \ - sun/util/resources/CurrencyNames_fr_CH.properties \ - sun/util/resources/CurrencyNames_fr_FR.properties \ - sun/util/resources/CurrencyNames_fr_LU.properties \ - sun/util/resources/CurrencyNames_ga_IE.properties \ - sun/util/resources/CurrencyNames_hr_HR.properties \ - sun/util/resources/CurrencyNames_hu_HU.properties \ - sun/util/resources/CurrencyNames_in_ID.properties \ - sun/util/resources/CurrencyNames_is_IS.properties \ - sun/util/resources/CurrencyNames_it.properties \ - sun/util/resources/CurrencyNames_it_CH.properties \ - sun/util/resources/CurrencyNames_it_IT.properties \ - sun/util/resources/CurrencyNames_lt_LT.properties \ - sun/util/resources/CurrencyNames_lv_LV.properties \ - sun/util/resources/CurrencyNames_mk_MK.properties \ - sun/util/resources/CurrencyNames_ms_MY.properties \ - sun/util/resources/CurrencyNames_mt_MT.properties \ - sun/util/resources/CurrencyNames_nl_BE.properties \ - sun/util/resources/CurrencyNames_nl_NL.properties \ - sun/util/resources/CurrencyNames_no_NO.properties \ - sun/util/resources/CurrencyNames_pl_PL.properties \ - sun/util/resources/CurrencyNames_pt.properties \ - sun/util/resources/CurrencyNames_pt_BR.properties \ - sun/util/resources/CurrencyNames_pt_PT.properties \ - sun/util/resources/CurrencyNames_ro_RO.properties \ - sun/util/resources/CurrencyNames_ru_RU.properties \ - sun/util/resources/CurrencyNames_sk_SK.properties \ - sun/util/resources/CurrencyNames_sl_SI.properties \ - sun/util/resources/CurrencyNames_sq_AL.properties \ - sun/util/resources/CurrencyNames_sr_BA.properties \ - sun/util/resources/CurrencyNames_sr_CS.properties \ - sun/util/resources/CurrencyNames_sr_ME.properties \ - sun/util/resources/CurrencyNames_sr_RS.properties \ - sun/util/resources/CurrencyNames_sr_Latn_BA.properties \ - sun/util/resources/CurrencyNames_sr_Latn_ME.properties \ - sun/util/resources/CurrencyNames_sr_Latn_RS.properties \ - sun/util/resources/CurrencyNames_sv.properties \ - sun/util/resources/CurrencyNames_sv_SE.properties \ - sun/util/resources/CurrencyNames_tr_TR.properties \ - sun/util/resources/CurrencyNames_uk_UA.properties diff --git a/jdk/makefiles/java/util/Makefile b/jdk/makefiles/java/util/Makefile deleted file mode 100644 index fa6eeb69794..00000000000 --- a/jdk/makefiles/java/util/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for sun.util.resources that don't need -# to be part of the bootstrap build. -# - -BUILDDIR = ../.. - -PACKAGE = java.util.resources -PRODUCT = java -JAVAC_MAX_WARNINGS = true -JAVAC_WARNINGS_FATAL = true - -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# - -# Adds more files than before?: AUTO_FILES_JAVA_DIRS=sun/util/resources -include FILES_java.gmk - -# Adds more files than before?: AUTO_FILES_PROPERTIES_DIRS=sun/util/resources -include FILES_properties.gmk - -# -# Compile properties -# -COMPILED_PROPERTIES_SUPERCLASS=LocaleNamesBundle - -# -# Include -# -include $(BUILDDIR)/common/Classes.gmk - diff --git a/jdk/makefiles/java/verify/Makefile b/jdk/makefiles/java/verify/Makefile deleted file mode 100644 index 4343e4aa0dc..00000000000 --- a/jdk/makefiles/java/verify/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Build libverify.so -# - -BUILDDIR = ../.. -PRODUCT = java -LIBRARY = verify -include $(BUILDDIR)/common/Defs.gmk - -# -# Link to libjvm so JVM_ functions can be called. -# -OTHER_LDLIBS += $(JVMLIB) - -ifeq ($(PLATFORM), windows) - # - # Don't want JAVALIB - # - JAVALIB = - EXTRA_LIBS = -endif - -# -# Files to compile. -# -FILES_c = \ - check_code.c \ - check_format.c - -# -# Targets. -# -ifeq ($(PLATFORM), solaris) - ifneq ($(ARCH), amd64) - FILES_reorder += reorder-$(ARCH) - endif -endif -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -# -# Add to the ambient VPATH. -# -vpath %.c $(SHARE_SRC)/native/common - diff --git a/jdk/makefiles/java/verify/mapfile-vers b/jdk/makefiles/java/verify/mapfile-vers deleted file mode 100644 index ecabd58ef24..00000000000 --- a/jdk/makefiles/java/verify/mapfile-vers +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -SUNWprivate_1.1 { - global: - VerifyClass; - VerifyClassForMajorVersion; - VerifyClassname; - VerifyFixClassname; - local: - *; -}; diff --git a/jdk/makefiles/java/verify/reorder-i586 b/jdk/makefiles/java/verify/reorder-i586 deleted file mode 100644 index 56ee8e378d7..00000000000 --- a/jdk/makefiles/java/verify/reorder-i586 +++ /dev/null @@ -1,40 +0,0 @@ -data = R0x2000; -text = LOAD ?RXO; -# Test Null -text: .text%VerifyFixClassname; -text: .text%VerifyClassname; -text: .text%skip_over_fieldname: OUTPUTDIR/tmp/java/verify/obj/check_format.o; -text: .text%skip_over_field_signature: OUTPUTDIR/tmp/java/verify/obj/check_format.o; -text: .text%VerifyClass; -text: .text%make_class_info_from_name: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%class_name_to_ID: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%make_class_info: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%free_block: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%verify_method: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%verify_opcode_operands: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%initialize_dataflow: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%signature_to_fieldtype: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%check_register_values: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%pop_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%update_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%push_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_into_successors: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%set_protected: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_into_one_successor: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -# Test Exit -# Test Hello -text: .text%merge_fullinfo_types: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%isAssignableTo: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -# Test Sleep -text: .text%isLegalTarget: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%verify_constant_pool_type: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -# Test IntToString -# Test LoadToolkit -# Test LoadFrame -# Test LoadJFrame -# Test JHello -# SwingSet -text: .text%copy_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%ntohl: OUTPUTDIR/tmp/java/verify/obj/check_code.o; diff --git a/jdk/makefiles/java/verify/reorder-sparc b/jdk/makefiles/java/verify/reorder-sparc deleted file mode 100644 index 17e13469dcd..00000000000 --- a/jdk/makefiles/java/verify/reorder-sparc +++ /dev/null @@ -1,44 +0,0 @@ -data = R0x2000; -text = LOAD ?RXO; -# Test Null -text: .text%VerifyFixClassname; -text: .text%VerifyClassname; -text: .text%skip_over_fieldname: OUTPUTDIR/tmp/java/verify/obj/check_format.o; -text: .text%VerifyClass; -text: .text%CCinit: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%initialize_class_hash; -text: .text%make_class_info_from_name: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%make_class_info: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%verify_method: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%instruction_length: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%verify_opcode_operands: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%initialize_exception_table: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%initialize_dataflow: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%signature_to_fieldtype: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%check_register_values: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%pop_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%update_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%push_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_into_successors: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%pop_and_free: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%set_protected: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_into_one_successor: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%finalize_class_hash: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%CCdestroy: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -# Test Exit -# Test Hello -text: .text%merge_fullinfo_types: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -# Test Sleep -# Test IntToString -# Test LoadToolkit -# Test LoadFrame -text: .text%verify_constant_pool_type: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -# Test LoadJFrame -# Test JHello -# SwingSet -text: .text%verify_field: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%check_and_push: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%signature_to_args_size: OUTPUTDIR/tmp/java/verify/obj/check_code.o; diff --git a/jdk/makefiles/java/verify/reorder-sparcv9 b/jdk/makefiles/java/verify/reorder-sparcv9 deleted file mode 100644 index 1f58d56cda3..00000000000 --- a/jdk/makefiles/java/verify/reorder-sparcv9 +++ /dev/null @@ -1,45 +0,0 @@ -data = R0x2000; -text = LOAD ?RXO; -# Test Null -text: .text%VerifyFixClassname; -text: .text%next_utf2unicode: OUTPUTDIR/tmp/java/verify/obj64/check_format.o; -text: .text%VerifyClassname; -text: .text%skip_over_fieldname: OUTPUTDIR/tmp/java/verify/obj64/check_format.o; -text: .text%VerifyClass; -text: .text%CCinit: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%initialize_class_hash; -text: .text%make_class_info_from_name: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%make_class_info: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%verify_method: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%instruction_length: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%verify_opcode_operands: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%verify_constant_pool_type: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%check_and_push: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%pop_and_free: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%set_protected: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%initialize_exception_table: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%merge_fullinfo_types: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%initialize_dataflow: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%signature_to_fieldtype: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%check_register_values: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%pop_stack: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%update_registers: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%push_stack: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%merge_into_successors: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%merge_into_one_successor: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%merge_stack: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%merge_registers: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%finalize_class_hash: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%CCdestroy: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -# Test Exit -# Test Hello -# Test Sleep -# Test IntToString -# Test LoadToolkit -# Test LoadFrame -# Test LoadJFrame -# Test JHello -# SwingSet -text: .text%verify_field: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%signature_to_args_size: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; diff --git a/jdk/makefiles/javax/Makefile b/jdk/makefiles/javax/Makefile deleted file mode 100644 index d0c06f9c39e..00000000000 --- a/jdk/makefiles/javax/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building javax -# - -BUILDDIR = .. -include $(BUILDDIR)/common/Defs.gmk - -SUBDIRS = - -SUBDIRS_management = management - -SUBDIRS_misc = \ - crypto \ - sql - - -# imageio uses xml, so build it last -SUBDIRS_desktop = \ - swing \ - sound \ - imageio - -include $(BUILDDIR)/common/Subdirs.gmk - -all build: - $(SUBDIRS-loop) -clean clobber:: - $(SUBDIRS-loop) - diff --git a/jdk/makefiles/javax/imageio/Makefile b/jdk/makefiles/javax/imageio/Makefile deleted file mode 100644 index c73f6f549f0..00000000000 --- a/jdk/makefiles/javax/imageio/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building all of JIIO (Java Image I/O) API -# - -BUILDDIR = ../.. -PACKAGE = javax.imageio -PRODUCT = jiio -include $(BUILDDIR)/common/Defs.gmk - -# -# Files to compile -# -AUTO_FILES_JAVA_DIRS = javax/imageio com/sun/imageio - -# -# Resources -# -LOCALE_SET_DEFINITION = jre -OTHER_PROPERTIES = com/sun/imageio/plugins/common/iio-plugin.properties - -# -# Rules -# -include $(BUILDDIR)/common/Classes.gmk - -build: copy-files - -copy-files: $(FILES_copy) - -.PHONY: copy-files - diff --git a/jdk/makefiles/javax/management/Makefile b/jdk/makefiles/javax/management/Makefile deleted file mode 100644 index 7887a2ac671..00000000000 --- a/jdk/makefiles/javax/management/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building all of JMX -# - -BUILDDIR = ../.. -PACKAGE = javax.management -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files to compile -# -AUTO_JAVA_PRUNE = snmp -AUTO_FILES_JAVA_DIRS = javax/management com/sun/jmx com/sun/management/jmx - -# -# Rules -# -include $(BUILDDIR)/common/Classes.gmk - -# -# Clean up internal-use-only package. -# -clean clobber:: - $(RM) -r $(CLASSDESTDIR)/com/sun/jmx \ - $(CLASSDESTDIR)/com/sun/management/jmx \ - $(CLASSDESTDIR)/org/omg/stub/javax/management/remote/rmi \ - diff --git a/jdk/makefiles/javax/sound/FILES_c.gmk b/jdk/makefiles/javax/sound/FILES_c.gmk deleted file mode 100644 index 364639367cf..00000000000 --- a/jdk/makefiles/javax/sound/FILES_c.gmk +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - Utilities.c \ - Platform.c - -FILES_solaris = \ - PLATFORM_API_SolarisOS_Utils.c \ - PLATFORM_API_SolarisOS_Ports.c \ - PLATFORM_API_SolarisOS_PCM.c - -FILES_linux = - -FILES_bsd = - -FILES_macosx = \ - PLATFORM_API_MacOSX_MidiIn.c \ - PLATFORM_API_MacOSX_MidiOut.c \ - PLATFORM_API_MacOSX_MidiUtils.c - -FILES_cpp_macosx = \ - PLATFORM_API_MacOSX_Utils.cpp \ - PLATFORM_API_MacOSX_PCM.cpp \ - PLATFORM_API_MacOSX_Ports.cpp - -FILES_windows = \ - PLATFORM_API_WinOS_MidiIn.c \ - PLATFORM_API_WinOS_MidiOut.c \ - PLATFORM_API_WinOS_Util.c \ - PLATFORM_API_WinOS_Ports.c - -FILES_export = \ - com/sun/media/sound/Platform.java - diff --git a/jdk/makefiles/javax/sound/Makefile b/jdk/makefiles/javax/sound/Makefile deleted file mode 100644 index cb455a7eb00..00000000000 --- a/jdk/makefiles/javax/sound/Makefile +++ /dev/null @@ -1,224 +0,0 @@ -# -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PACKAGE = javax.sound -LIBRARY = jsound -PRODUCT = sun - -ifeq ($(PLATFORM),macosx) -CPLUSPLUSLIBRARY = true -endif - -include $(BUILDDIR)/common/Defs.gmk - -# include defines for sound -include SoundDefs.gmk - -# support for different mixer provider files on different platforms -#MXSP = javax.sound.sampled.spi.MixerProvider -# Mixer Service Provider Additional path -#MXSPP_ADD = - -# -# Add use of mapfile -# -FILES_m = mapfile-vers -include $(BUILDDIR)/common/Mapfile-vers.gmk - -# -# Files -# -include FILES_c.gmk - -# add java files -AUTO_FILES_JAVA_DIRS = javax/sound com/sun/media/sound - -# -# Files that just need cp. -# -SERVICEDIR = $(CLASSBINDIR)/META-INF/services - -FILES_copy = \ - $(SERVICEDIR)/javax.sound.midi.spi.MidiDeviceProvider \ - $(SERVICEDIR)/javax.sound.midi.spi.MidiFileWriter \ - $(SERVICEDIR)/javax.sound.midi.spi.MidiFileReader \ - $(SERVICEDIR)/javax.sound.midi.spi.SoundbankReader \ - $(SERVICEDIR)/javax.sound.sampled.spi.AudioFileWriter \ - $(SERVICEDIR)/javax.sound.sampled.spi.AudioFileReader \ - $(SERVICEDIR)/javax.sound.sampled.spi.FormatConversionProvider \ - $(SERVICEDIR)/javax.sound.sampled.spi.MixerProvider \ - $(LIBDIR)/sound.properties - -FILES_mkdirs = \ - $(CLASSBINDIR)/META-INF \ - $(CLASSBINDIR)/META-INF/services - -FILES_copydirs = \ - $(CLASSBINDIR) \ - $(LIBDIR) \ - $(FILES_mkdirs) - -FILES_c += $(FILES_$(PLATFORM)) -FILES_cpp += $(FILES_cpp_$(PLATFORM)) - - -# -# system dependent flags -# -ifeq ($(PLATFORM), windows) - CPPFLAGS += -DUSE_PLATFORM_MIDI_OUT=TRUE \ - -DUSE_PLATFORM_MIDI_IN=TRUE \ - -DUSE_PORTS=TRUE - LDLIBS += winmm.lib - - # Windows always provides MIDI and ports - INCLUDE_MIDI = TRUE - INCLUDE_PORTS = TRUE - - # DirectSound handles directaudio (both i586 and amd64) - SUBDIRS += jsoundds - EXTRA_SOUND_JNI_LIBS += jsoundds - #MXSPP_ADD = $(PLATFORM)-$(ARCH)/ -endif # PLATFORM win32 - -ifeq ($(PLATFORM), linux) - # ALSA handles directaudio, ports, and MIDI - SUBDIRS += jsoundalsa - EXTRA_SOUND_JNI_LIBS += jsoundalsa - #MXSPP_ADD = $(PLATFORM)-$(ARCH)/ -endif # PLATFORM linux - -ifeq ($(PLATFORM), macosx) - CPPFLAGS += -DUSE_PORTS=TRUE \ - -DUSE_DAUDIO=TRUE \ - -DUSE_PLATFORM_MIDI_OUT=TRUE \ - -DUSE_PLATFORM_MIDI_IN=TRUE - - INCLUDE_PORTS = TRUE - INCLUDE_DAUDIO = TRUE - INCLUDE_MIDI = TRUE - - LDFLAGS += -framework CoreAudio -framework CoreFoundation \ - -framework CoreServices -framework AudioUnit -lstdc++ \ - -framework CoreMIDI -framework AudioToolbox - CXXFLAGS += -I`xcode-select -print-path`/Extras/CoreAudio/PublicUtility -endif - -ifeq ($(PLATFORM), solaris) - # build with ports and direct audio - CPPFLAGS += -DUSE_PORTS=TRUE \ - -DUSE_DAUDIO=TRUE - - INCLUDE_PORTS = TRUE - INCLUDE_DAUDIO = TRUE - # build with empty MIDI i/o - INCLUDE_MIDI = TRUE -endif # PLATFORM solaris - -# for dynamic inclusion of extra sound libs: these -# JNI libs will be loaded from Platform.java -CPPFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"' - -# integrate MIDI i/o in jsound lib -ifeq ($(INCLUDE_MIDI),TRUE) - FILES_c += $(MIDIFILES_c) - FILES_export += $(MIDIFILES_export) -endif - -# integrate port files in jsound lib -ifeq ($(INCLUDE_PORTS),TRUE) - FILES_c += $(PORTFILES_c) - FILES_export += $(PORTFILES_export) -endif - -# integrate port files in jsound lib -ifeq ($(INCLUDE_DAUDIO),TRUE) - FILES_c += $(DAUDIOFILES_c) - FILES_export += $(DAUDIOFILES_export) -endif - -# -# Extra cc/linker flags. -# -CPPFLAGS += \ - -I$(SHARE_SRC)/native/com/sun/media/sound - -ifeq ($(PLATFORM), macosx) -vpath %.c $(call NativeSrcDirList,,native/com/sun/media/sound) -vpath %.cpp $(call NativeSrcDirList,,native/com/sun/media/sound) - -else -# -# Add to the ambient VPATH. -# -vpath %.c $(SHARE_SRC)/native/com/sun/media/sound -vpath %.c $(PLATFORM_SRC)/native/com/sun/media/sound -vpath %.cpp $(PLATFORM_SRC)/native/com/sun/media/sound - -endif - -# -# Include rules -# -include $(BUILDDIR)/common/Library.gmk -include $(BUILDDIR)/common/Subdirs.gmk - -# -# Rules that copy files. -# - -build: copy-files - $(SUBDIRS-loop) - -copy-files: $(FILES_copy) - -#$(SERVICEDIR)/$(MXSP): $(SHARE_SRC)/classes/com/sun/media/sound/services/$(MXSPP_ADD)$(MXSP) -# $(install-file) - -$(SERVICEDIR)/%: $(SHARE_SRC)/classes/com/sun/media/sound/services/% - $(install-file) - -$(LIBDIR)/audio/%: $(SHARE_SRC)/lib/audio/% - $(install-file) - -$(LIBDIR)/%: $(SHARE_SRC)/lib/% - $(install-file) - -# -# Since we build more than the javax.sound (as stated in the -# PACKAGE variable), we need to nuke the extra packages explicitly. -# -clean clobber:: - $(SUBDIRS-loop) - -clean clobber:: - $(RM) -r $(CLASSBINDIR)/com/sun/media/sound $(LIBDIR)/audio - $(RM) $(FILES_copy) - -# -# Declare extra phony targets. -# -.PHONY: copy-files diff --git a/jdk/makefiles/javax/sound/SoundDefs.gmk b/jdk/makefiles/javax/sound/SoundDefs.gmk deleted file mode 100644 index 06c0af8722e..00000000000 --- a/jdk/makefiles/javax/sound/SoundDefs.gmk +++ /dev/null @@ -1,124 +0,0 @@ -# -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# defines common for all Java Sound native code - -SUBDIRS= -EXTRA_SOUND_JNI_LIBS= - -# -# Extra cc/linker flags. -# -# system dependent flags -ifeq ($(PLATFORM), windows) - CPPFLAGS += -DX_PLATFORM=X_WINDOWS -endif # PLATFORM windows - -ifeq ($(PLATFORM), linux) - CPPFLAGS += -DX_PLATFORM=X_LINUX -endif # PLATFORM linux - -ifeq ($(PLATFORM), macosx) - CPPFLAGS += -DX_PLATFORM=X_MACOSX -endif # PLATFORM macosx - -ifeq ($(PLATFORM), solaris) - CPPFLAGS += -DX_PLATFORM=X_SOLARIS - - # Solaris needs specific binding to libc - LDFLAGS += -lc - - # - # Turn off C++ exception handling. - # - ifneq ($(CC_VERSION),gcc) - CXXFLAGS += -noex - endif # CC_VERSION - -endif # PLATFORM solaris - -ifeq ($(ZERO_BUILD), true) - CPPFLAGS += -DX_ARCH=X_ZERO -else - ifeq ($(ARCH), i586) - CPPFLAGS += -DX_ARCH=X_I586 - endif # ARCH i586 - - ifeq ($(ARCH), sparc) - CPPFLAGS += -DX_ARCH=X_SPARC - endif # ARCH sparc - - ifeq ($(ARCH), sparcv9) - CPPFLAGS += -DX_ARCH=X_SPARCV9 - endif # ARCH sparcv9 - - ifeq ($(ARCH), amd64) - CPPFLAGS += -DX_ARCH=X_AMD64 - endif # ARCH amd64 - - ifeq ($(ARCH), arm) - CPPFLAGS += -DX_ARCH=X_ARM - endif # ARCH arm - - ifeq ($(ARCH), ppc) - CPPFLAGS += -DX_ARCH=X_PPC - endif # ARCH ppc - -endif - - -# files needed for MIDI i/o -MIDIFILES_c = \ - MidiInDevice.c \ - MidiInDeviceProvider.c \ - MidiOutDevice.c \ - MidiOutDeviceProvider.c \ - PlatformMidi.c - -MIDIFILES_export = \ - com/sun/media/sound/MidiInDevice.java \ - com/sun/media/sound/MidiInDeviceProvider.java \ - com/sun/media/sound/MidiOutDevice.java \ - com/sun/media/sound/MidiOutDeviceProvider.java - -# files needed for ports -PORTFILES_c = \ - PortMixerProvider.c \ - PortMixer.c - -PORTFILES_export = \ - com/sun/media/sound/PortMixer.java \ - com/sun/media/sound/PortMixerProvider.java - -# files needed for direct audio -DAUDIOFILES_c = \ - DirectAudioDeviceProvider.c \ - DirectAudioDevice.c - -DAUDIOFILES_export = \ - com/sun/media/sound/DirectAudioDeviceProvider.java \ - com/sun/media/sound/DirectAudioDevice.java - - diff --git a/jdk/makefiles/javax/sound/jsoundalsa/Makefile b/jdk/makefiles/javax/sound/jsoundalsa/Makefile deleted file mode 100644 index 5fa0124cc68..00000000000 --- a/jdk/makefiles/javax/sound/jsoundalsa/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -# -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = javax.sound -LIBRARY = jsoundalsa -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# this Makefile compiles the native files for alsa support in java sound - -# include defines for sound -include ../SoundDefs.gmk - -# -# Use mapfile -# -FILES_m = mapfile-vers -include $(BUILDDIR)/common/Mapfile-vers.gmk - -# -# Files -# - -FILES_c = \ - Utilities.c \ - $(DAUDIOFILES_c) \ - $(MIDIFILES_c) \ - $(PORTFILES_c) - -# platform dependent files -FILES_c += \ - PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ - PLATFORM_API_LinuxOS_ALSA_PCM.c \ - PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ - PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ - PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ - PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ - PLATFORM_API_LinuxOS_ALSA_Ports.c - -FILES_export = \ - $(DAUDIOFILES_export) \ - $(MIDIFILES_export) \ - $(PORTFILES_export) - -OTHER_LDLIBS += -lasound - -CPPFLAGS += \ - -DUSE_DAUDIO=TRUE \ - -DUSE_PORTS=TRUE \ - -DUSE_PLATFORM_MIDI_OUT=TRUE \ - -DUSE_PLATFORM_MIDI_IN=TRUE \ - -I$(SHARE_SRC)/native/com/sun/media/sound - -# -# Add to the ambient VPATH. -# -vpath %.c $(SHARE_SRC)/native/com/sun/media/sound -vpath %.c $(PLATFORM_SRC)/native/com/sun/media/sound -vpath %.cpp $(PLATFORM_SRC)/native/com/sun/media/sound - - -# -# Include rules -# -include $(BUILDDIR)/common/Library.gmk - - - diff --git a/jdk/makefiles/javax/sound/jsoundds/Makefile b/jdk/makefiles/javax/sound/jsoundds/Makefile deleted file mode 100644 index f476b39811a..00000000000 --- a/jdk/makefiles/javax/sound/jsoundds/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = javax.sound -LIBRARY = jsoundds -PRODUCT = sun -CPLUSPLUSLIBRARY = true -include $(BUILDDIR)/common/Defs.gmk - -# this Makefile compiles the native files for DirectSound support in java sound - -# include defines for sound -include ../SoundDefs.gmk - -# -# Files -# - -FILES_c = \ - Utilities.c \ - $(DAUDIOFILES_c) - -FILES_cpp = \ - PLATFORM_API_WinOS_DirectSound.cpp - -FILES_export = \ - $(DAUDIOFILES_export) - -# -# Extra cc/linker flags. -# -LDLIBS += dsound.lib winmm.lib user32.lib ole32.lib -CPPFLAGS += \ - -DUSE_DAUDIO=TRUE \ - -I$(SHARE_SRC)/native/com/sun/media/sound \ - -I$(DXSDK_INCLUDE_PATH) - -# -# Add to the ambient VPATH. -# -vpath %.c $(SHARE_SRC)/native/com/sun/media/sound -vpath %.c $(PLATFORM_SRC)/native/com/sun/media/sound -vpath %.cpp $(PLATFORM_SRC)/native/com/sun/media/sound - -# -# Include rules -# -include $(BUILDDIR)/common/Library.gmk diff --git a/jdk/makefiles/javax/sql/Makefile b/jdk/makefiles/javax/sql/Makefile deleted file mode 100644 index cd138cb30f2..00000000000 --- a/jdk/makefiles/javax/sql/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building JDBC API and JDBC RowSet -# - -BUILDDIR = ../.. -PACKAGE = javax.sql -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files to compile. -# -AUTO_FILES_JAVA_DIRS = javax/sql - -# -# Resources -# -OTHER_PROPERTIES = $(PKGDIR)/rowset/rowset.properties - -# -# Rules -# -include $(BUILDDIR)/common/Classes.gmk - diff --git a/jdk/makefiles/javax/swing/FILES.gmk b/jdk/makefiles/javax/swing/FILES.gmk deleted file mode 100644 index c1ba62f797a..00000000000 --- a/jdk/makefiles/javax/swing/FILES.gmk +++ /dev/null @@ -1,235 +0,0 @@ -# -# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -MISC_FILES = \ - $(CLASSBINDIR)/javax/swing/text/html/default.css \ - $(CLASSBINDIR)/javax/swing/text/rtf/charsets/NeXT.txt \ - $(CLASSBINDIR)/javax/swing/text/rtf/charsets/ansi.txt \ - $(CLASSBINDIR)/javax/swing/text/rtf/charsets/cpg437.txt \ - $(CLASSBINDIR)/javax/swing/text/rtf/charsets/cpg850.txt \ - $(CLASSBINDIR)/javax/swing/text/rtf/charsets/mac.txt - -BEANINFO_DOC = \ - $(BUILDDIR)/tools/swing-beans/SwingBeanInfo.template - -BEANIMAGES = $(BUILDDIR)/tools/swing-beans/beaninfo/images -BEANINFO_IMG = \ - $(BEANIMAGES)/AbstractButtonColor16.gif \ - $(BEANIMAGES)/BorderColor16.gif \ - $(BEANIMAGES)/JAppletColor16.gif \ - $(BEANIMAGES)/JAppletColor32.gif \ - $(BEANIMAGES)/JAppletMono16.gif \ - $(BEANIMAGES)/JAppletMono32.gif \ - $(BEANIMAGES)/JButtonColor32.gif \ - $(BEANIMAGES)/JButtonColor16.gif \ - $(BEANIMAGES)/JButtonMono32.gif \ - $(BEANIMAGES)/JButtonMono16.gif \ - $(BEANIMAGES)/JCheckBoxColor32.gif \ - $(BEANIMAGES)/JCheckBoxColor16.gif \ - $(BEANIMAGES)/JCheckBoxMono32.gif \ - $(BEANIMAGES)/JCheckBoxMono16.gif \ - $(BEANIMAGES)/JCheckBoxMenuItemColor32.gif \ - $(BEANIMAGES)/JCheckBoxMenuItemColor16.gif \ - $(BEANIMAGES)/JCheckBoxMenuItemMono32.gif \ - $(BEANIMAGES)/JCheckBoxMenuItemMono16.gif \ - $(BEANIMAGES)/JComboBoxColor32.gif \ - $(BEANIMAGES)/JComboBoxColor16.gif \ - $(BEANIMAGES)/JComboBoxMono32.gif \ - $(BEANIMAGES)/JComboBoxMono16.gif \ - $(BEANIMAGES)/JComponentColor16.gif \ - $(BEANIMAGES)/JDesktopPaneColor32.gif \ - $(BEANIMAGES)/JDesktopPaneColor16.gif \ - $(BEANIMAGES)/JDesktopPaneMono32.gif \ - $(BEANIMAGES)/JDesktopPaneMono16.gif \ - $(BEANIMAGES)/JDialogColor32.gif \ - $(BEANIMAGES)/JDialogColor16.gif \ - $(BEANIMAGES)/JDialogMono16.gif \ - $(BEANIMAGES)/JDialogMono32.gif \ - $(BEANIMAGES)/JEditorPaneColor32.gif \ - $(BEANIMAGES)/JEditorPaneColor16.gif \ - $(BEANIMAGES)/JEditorPaneMono32.gif \ - $(BEANIMAGES)/JEditorPaneMono16.gif \ - $(BEANIMAGES)/JFrameColor32.gif \ - $(BEANIMAGES)/JFrameColor16.gif \ - $(BEANIMAGES)/JFrameMono32.gif \ - $(BEANIMAGES)/JFrameMono16.gif \ - $(BEANIMAGES)/JInternalFrameColor32.gif \ - $(BEANIMAGES)/JInternalFrameColor16.gif \ - $(BEANIMAGES)/JInternalFrameMono32.gif \ - $(BEANIMAGES)/JInternalFrameMono16.gif \ - $(BEANIMAGES)/JLabelColor32.gif \ - $(BEANIMAGES)/JLabelColor16.gif \ - $(BEANIMAGES)/JLabelMono32.gif \ - $(BEANIMAGES)/JLabelMono16.gif \ - $(BEANIMAGES)/JLayeredPaneColor32.gif \ - $(BEANIMAGES)/JLayeredPaneColor16.gif \ - $(BEANIMAGES)/JLayeredPaneMono32.gif \ - $(BEANIMAGES)/JLayeredPaneMono16.gif \ - $(BEANIMAGES)/JListColor32.gif \ - $(BEANIMAGES)/JListColor16.gif \ - $(BEANIMAGES)/JListMono32.gif \ - $(BEANIMAGES)/JListMono16.gif \ - $(BEANIMAGES)/JMenuBarColor32.gif \ - $(BEANIMAGES)/JMenuBarColor16.gif \ - $(BEANIMAGES)/JMenuBarMono32.gif \ - $(BEANIMAGES)/JMenuBarMono16.gif \ - $(BEANIMAGES)/JMenuColor32.gif \ - $(BEANIMAGES)/JMenuColor16.gif \ - $(BEANIMAGES)/JMenuMono32.gif \ - $(BEANIMAGES)/JMenuMono16.gif \ - $(BEANIMAGES)/JMenuItemColor32.gif \ - $(BEANIMAGES)/JMenuItemColor16.gif \ - $(BEANIMAGES)/JMenuItemMono32.gif \ - $(BEANIMAGES)/JMenuItemMono16.gif \ - $(BEANIMAGES)/JPanelColor32.gif \ - $(BEANIMAGES)/JPanelColor16.gif \ - $(BEANIMAGES)/JPanelMono32.gif \ - $(BEANIMAGES)/JPanelMono16.gif \ - $(BEANIMAGES)/JPasswordFieldColor32.gif \ - $(BEANIMAGES)/JPasswordFieldColor16.gif \ - $(BEANIMAGES)/JPasswordFieldMono32.gif \ - $(BEANIMAGES)/JPasswordFieldMono16.gif \ - $(BEANIMAGES)/JPopupMenuColor32.gif \ - $(BEANIMAGES)/JPopupMenuColor16.gif \ - $(BEANIMAGES)/JPopupMenuMono32.gif \ - $(BEANIMAGES)/JPopupMenuMono16.gif \ - $(BEANIMAGES)/JProgressBarColor32.gif \ - $(BEANIMAGES)/JProgressBarColor16.gif \ - $(BEANIMAGES)/JProgressBarMono32.gif \ - $(BEANIMAGES)/JProgressBarMono16.gif \ - $(BEANIMAGES)/JRadioButtonColor32.gif \ - $(BEANIMAGES)/JRadioButtonColor16.gif \ - $(BEANIMAGES)/JRadioButtonMono32.gif \ - $(BEANIMAGES)/JRadioButtonMono16.gif \ - $(BEANIMAGES)/JRadioButtonMenuItemColor32.gif \ - $(BEANIMAGES)/JRadioButtonMenuItemColor16.gif \ - $(BEANIMAGES)/JRadioButtonMenuItemMono32.gif \ - $(BEANIMAGES)/JRadioButtonMenuItemMono16.gif \ - $(BEANIMAGES)/JRootPaneColor32.gif \ - $(BEANIMAGES)/JRootPaneColor16.gif \ - $(BEANIMAGES)/JRootPaneMono32.gif \ - $(BEANIMAGES)/JRootPaneMono16.gif \ - $(BEANIMAGES)/JScrollPaneColor32.gif \ - $(BEANIMAGES)/JScrollPaneColor16.gif \ - $(BEANIMAGES)/JScrollPaneMono32.gif \ - $(BEANIMAGES)/JScrollPaneMono16.gif \ - $(BEANIMAGES)/JScrollBarColor32.gif \ - $(BEANIMAGES)/JScrollBarColor16.gif \ - $(BEANIMAGES)/JScrollBarMono32.gif \ - $(BEANIMAGES)/JScrollBarMono16.gif \ - $(BEANIMAGES)/JSeparatorColor32.gif \ - $(BEANIMAGES)/JSeparatorColor16.gif \ - $(BEANIMAGES)/JSeparatorMono32.gif \ - $(BEANIMAGES)/JSeparatorMono16.gif \ - $(BEANIMAGES)/JSliderColor32.gif \ - $(BEANIMAGES)/JSliderColor16.gif \ - $(BEANIMAGES)/JSliderMono32.gif \ - $(BEANIMAGES)/JSliderMono16.gif \ - $(BEANIMAGES)/JTextPaneColor32.gif \ - $(BEANIMAGES)/JTextPaneColor16.gif \ - $(BEANIMAGES)/JTextPaneMono32.gif \ - $(BEANIMAGES)/JTextPaneMono16.gif \ - $(BEANIMAGES)/JToggleButtonColor32.gif \ - $(BEANIMAGES)/JToggleButtonColor16.gif \ - $(BEANIMAGES)/JToggleButtonMono32.gif \ - $(BEANIMAGES)/JToggleButtonMono16.gif \ - $(BEANIMAGES)/JToolBarColor32.gif \ - $(BEANIMAGES)/JToolBarColor16.gif \ - $(BEANIMAGES)/JToolBarMono32.gif \ - $(BEANIMAGES)/JToolBarMono16.gif \ - $(BEANIMAGES)/JTabbedPaneColor32.gif \ - $(BEANIMAGES)/JTabbedPaneColor16.gif \ - $(BEANIMAGES)/JTabbedPaneMono32.gif \ - $(BEANIMAGES)/JTabbedPaneMono16.gif \ - $(BEANIMAGES)/JTreeColor32.gif \ - $(BEANIMAGES)/JTreeColor16.gif \ - $(BEANIMAGES)/JTreeMono32.gif \ - $(BEANIMAGES)/JTreeMono16.gif \ - $(BEANIMAGES)/JTextAreaColor32.gif \ - $(BEANIMAGES)/JTextAreaColor16.gif \ - $(BEANIMAGES)/JTextAreaMono32.gif \ - $(BEANIMAGES)/JTextAreaMono16.gif \ - $(BEANIMAGES)/JTextFieldColor32.gif \ - $(BEANIMAGES)/JTextFieldColor16.gif \ - $(BEANIMAGES)/JTextFieldMono32.gif \ - $(BEANIMAGES)/JTextFieldMono16.gif \ - $(BEANIMAGES)/JViewportColor32.gif \ - $(BEANIMAGES)/JViewportColor16.gif \ - $(BEANIMAGES)/JViewportMono32.gif \ - $(BEANIMAGES)/JViewportMono16.gif \ - $(BEANIMAGES)/JWindowColor32.gif \ - $(BEANIMAGES)/JWindowColor16.gif \ - $(BEANIMAGES)/JWindowMono32.gif \ - $(BEANIMAGES)/JWindowMono16.gif \ - $(BEANIMAGES)/JTableColor32.gif \ - $(BEANIMAGES)/JTableColor16.gif \ - $(BEANIMAGES)/JTableMono32.gif \ - $(BEANIMAGES)/JTableMono16.gif - -BEANS = \ - AbstractButton \ - JComponent - -# These classes get listed in the swingall.jar manifest file and are -# used during BeanInfo source generation. -BEANS_MANIFEST = \ - JApplet \ - JButton \ - JCheckBox \ - JCheckBoxMenuItem \ - JComboBox \ - JDialog \ - JEditorPane \ - JFrame \ - JInternalFrame \ - JLabel \ - JList \ - JMenu \ - JMenuBar \ - JMenuItem \ - JOptionPane \ - JPanel \ - JPasswordField \ - JPopupMenu \ - JProgressBar \ - JRadioButton \ - JRadioButtonMenuItem \ - JRootPane \ - JScrollBar \ - JScrollPane \ - JSeparator \ - JSlider \ - JSpinner \ - JSplitPane \ - JTabbedPane \ - JTable \ - JTextArea \ - JTextField \ - JTextPane \ - JToggleButton \ - JToolBar \ - JTree \ - JViewport \ - JWindow diff --git a/jdk/makefiles/javax/swing/Makefile b/jdk/makefiles/javax/swing/Makefile deleted file mode 100644 index 4c67858b885..00000000000 --- a/jdk/makefiles/javax/swing/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PACKAGE = javax.swing -PRODUCT = com -SWING_SRC = $(SHARE_SRC)/classes/javax/swing -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -include FILES.gmk -AUTO_FILES_JAVA_DIRS = javax/swing sun/swing com/sun/java/swing -AUTO_JAVA_PRUNE = plaf - -SUBDIRS = html32dtd plaf - -include $(BUILDDIR)/common/Classes.gmk -include $(BUILDDIR)/common/Subdirs.gmk - -build: other_files - $(SUBDIRS-loop) - -clean clobber:: - $(SUBDIRS-loop) - -other_files: $(MISC_FILES) - -$(CLASSBINDIR)/%.wav: $(SHARE_SRC)/classes/%.wav - $(install-file) - -$(CLASSBINDIR)/%.gif: $(SHARE_SRC)/classes/%.gif - $(install-file) - -$(CLASSBINDIR)/%.css: $(SHARE_SRC)/classes/%.css - $(install-file) - -$(CLASSBINDIR)/%.txt: $(SHARE_SRC)/classes/%.txt - $(install-file) - diff --git a/jdk/makefiles/javax/swing/beaninfo/FILES.gmk b/jdk/makefiles/javax/swing/beaninfo/FILES.gmk deleted file mode 100644 index 126d02bd0b9..00000000000 --- a/jdk/makefiles/javax/swing/beaninfo/FILES.gmk +++ /dev/null @@ -1,126 +0,0 @@ -# -# Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# There are the Swing classes for which a BeanInfo class is generated. -# - -# this is used for solaris - -BEANS = AbstractButton \ - Box \ - JComponent \ - JApplet \ - JButton \ - JCheckBox \ - JCheckBoxMenuItem \ - JComboBox \ - JColorChooser \ - JDesktopPane \ - JDialog \ - JEditorPane \ - JFileChooser \ - JFrame \ - JFormattedTextField \ - JInternalFrame \ - JLabel \ - JLayeredPane \ - JList \ - JMenu \ - JMenuBar \ - JMenuItem \ - JOptionPane \ - JPanel \ - JPasswordField \ - JPopupMenu \ - JProgressBar \ - JRadioButton \ - JRadioButtonMenuItem\ - JScrollBar \ - JScrollPane \ - JSeparator \ - JSlider \ - JSplitPane \ - JSpinner \ - JTabbedPane \ - JTable \ - JTextArea \ - JTextField \ - JTextPane \ - JToggleButton \ - JToolBar \ - JTree \ - JWindow - -# in a separate package -BEANS_TEXT = JTextComponent \ - -# and this is used for windows - -BEANS_SOURCES = ..\..\..\..\..\src\share\classes\javax\swing\AbstractButton.java \ - ..\..\..\..\..\src\share\classes\javax\swing\Box.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JComponent.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JColorChooser.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JApplet.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JButton.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JCheckBox.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JCheckBoxMenuItem.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JComboBox.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JDesktopPane.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JDialog.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JEditorPane.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JFileChooser.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JFormattedTextField.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JFrame.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JInternalFrame.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JLabel.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JLayeredPane.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JList.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JMenu.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JMenuBar.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JMenuItem.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JOptionPane.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JPanel.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JPasswordField.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JPopupMenu.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JProgressBar.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JRadioButton.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JRadioButtonMenuItem.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JScrollBar.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JScrollPane.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JSeparator.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JSlider.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JSpinner.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JSplitPane.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JTabbedPane.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JTable.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JTextArea.java \ - ..\..\..\..\..\src\share\classes\javax\swing\text\JTextComponent.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JTextField.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JTextPane.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JToggleButton.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JToolBar.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JTree.java \ - ..\..\..\..\..\src\share\classes\javax\swing\JWindow.java diff --git a/jdk/makefiles/javax/swing/beaninfo/Makefile b/jdk/makefiles/javax/swing/beaninfo/Makefile deleted file mode 100644 index 4ac5408528c..00000000000 --- a/jdk/makefiles/javax/swing/beaninfo/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Create 1.1 version of BeanInfo files needed by Swing. -# -# Note that this makefile gets visited only during release engineering -# time. -# - -BUILDDIR = ../../.. -include $(BUILDDIR)/common/Defs.gmk -include SwingBeans.gmk - -all build: swing-1.2-beans - diff --git a/jdk/makefiles/javax/swing/beaninfo/SwingBeans.gmk b/jdk/makefiles/javax/swing/beaninfo/SwingBeans.gmk deleted file mode 100644 index f053f73f953..00000000000 --- a/jdk/makefiles/javax/swing/beaninfo/SwingBeans.gmk +++ /dev/null @@ -1,205 +0,0 @@ -# -# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile to build the BeanInfo generation tool (ie, a doclet), and -# then the beaninfo itself. Swing versions prior to 1.2 are no longer -# built. -# -# This makefile could be a lot simpler if we made it more regular. -# - -# identify this as a swingbeans product - used only to identify a -# unique name for OBJDIR -PRODUCT = swing-beans - -# -# Main targets provided by this makefile. -# -swing-1.2-beans: - $(MAKE) DEBUG_FLAG=false make-swing-beans -swing-1.2-beans-debug: - $(MAKE) DEBUG_FLAG=true make-swing-beans - - -# get the absolute path to the jar command. -PREFIX = 1.2 -JAVADOCFLAGS += $(NO_PROPRIETARY_API_WARNINGS) $(LANGUAGE_VERSION) -SWINGPKG = javax/swing -LOCAL_JAVAC_FLAGS = $(OTHER_JAVACFLAGS) -# since JAVADOC_CMD runs on ALT_BOOTDIR, the doclet and all its classes must be compiled to match -DOCLET_JAVAC_FLAGS = -source 6 -target 6 - -include FILES.gmk -include $(BUILDDIR)/common/Release.gmk - -DOCLETSRC = $(BUILDDIR)/../make/tools/swing-beans -DOCLETDST = $(TEMPDIR) - -FILES_java = GenSwingBeanInfo.java GenDocletBeanInfo.java DocBeanInfo.java -FILES_class = $(FILES_java:%.java=$(DOCLETDST)/%.class) -FAKESRC = $(JDK_TOPDIR)/src/share/classes -BEANSRCDIR = $(TEMPDIR)/$(PREFIX)src -BEANCLASSDIR = $(TEMPDIR)/$(PREFIX)classes -FILES_beans = $(BEANS:%=$(BEANSRCDIR)/%BeanInfo.java) \ - $(BEANS_TEXT:%=$(BEANSRCDIR)/text/%BeanInfo.java) \ - $(BEANSRCDIR)/SwingBeanInfoBase.java \ - $(BEANSRCDIR)/BeanInfoUtils.java - -FILES_bclass = $(FILES_beans:$(BEANSRCDIR)/%.java=$(BEANCLASSDIR)/$(SWINGPKG)/%.class) -DOCLETFLAGS = -doclet GenDocletBeanInfo -LOCAL_CLASSPATH = "$(CLASSBINDIR)$(CLASSPATH_SEPARATOR)$(BEANCLASSDIR)$(CLASSPATH_SEPARATOR)." - -# -# Main target. -# -make-swing-beans: mkdoclet mkbeaninfo mkclasses mkpackaging - -# -# Make the doclet. -# -mkdoclet: $(DOCLETDST) $(FILES_class) .SwingBeanInfo - -$(OBJDIR) $(BEANCLASSDIR) $(BEANSRCDIR) $(DOCLETDST):: - @$(ECHO) "Making directory..." $@ - @$(MKDIR) -p $@ - -$(DOCLETDST)/%.class: $(DOCLETSRC)/%.java - $(JAVAC_CMD) $(LOCAL_JAVAC_FLAGS) $(DOCLET_JAVAC_FLAGS) -classpath "$(CLASSBINDIR)$(CLASSPATH_SEPARATOR)$(DOCLETSRC)" -d $(DOCLETDST) $? - @$(java-vm-cleanup) - -# To run, the doclet needs SwingBeanInfoBase class. Also Notice the lie -# here, SwingBeanInfoBase.class goes elswhere. - -.SwingBeanInfo: $(OBJDIR) $(BEANCLASSDIR) $(BEANSRCDIR) $(SWINGPKG)/BeanInfoUtils.class $(SWINGPKG)/SwingBeanInfoBase.class - -$(SWINGPKG)/BeanInfoUtils.class: $(BEANSRCDIR)/BeanInfoUtils.java - $(JAVAC_CMD) $(LOCAL_JAVAC_FLAGS) $(DOCLET_JAVAC_FLAGS) -d $(BEANCLASSDIR) $< - @$(java-vm-cleanup) - -$(SWINGPKG)/SwingBeanInfoBase.class: $(BEANSRCDIR)/SwingBeanInfoBase.java $(BEANSRCDIR)/BeanInfoUtils.java - $(JAVAC_CMD) $(LOCAL_JAVAC_FLAGS) $(DOCLET_JAVAC_FLAGS) -classpath $(BEANCLASSDIR) -d $(BEANCLASSDIR) $< - @$(java-vm-cleanup) - -# -# Stage 1: Generate *BeanInfo.java files. -# -mkbeaninfo: $(BEANSRCDIR) .delete.beanlist $(FILES_beans) .javadoc.beanlist - -.delete.beanlist: - @$(RM) $(TEMPDIR)/.beans.list - -.javadoc.beanlist: - if [ -s $(TEMPDIR)/.beans.list ]; \ - then $(JAVADOC_CMD) $(DOCLETFLAGS) -x $(DEBUG_FLAG) -d $(BEANSRCDIR) -t $(DOCLETSRC)/SwingBeanInfo.template -docletpath $(DOCLETDST) \ - $(shell if [ -s $(TEMPDIR)/.beans.list ]; then $(CAT) $(TEMPDIR)/.beans.list; fi); \ - fi - @$(java-vm-cleanup) - -$(BEANSRCDIR)/text/%BeanInfo.java: $(FAKESRC)/$(SWINGPKG)/text/%.java - @$(ECHO) $< >> $(TEMPDIR)/.beans.list - -$(BEANSRCDIR)/%BeanInfo.java: $(FAKESRC)/$(SWINGPKG)/%.java - @$(ECHO) $< >> $(TEMPDIR)/.beans.list - -$(BEANSRCDIR)/SwingBeanInfoBase.java: $(DOCLETSRC)/beaninfo/SwingBeanInfoBase.java - $(CP) $< $@ - -$(BEANSRCDIR)/BeanInfoUtils.java: $(DOCLETSRC)/beaninfo/BeanInfoUtils.java - $(CP) $< $@ - -# -# Compile the generated *BeanInfo.java files. -# -mkclasses: .delete.classlist $(BEANCLASSDIR)/$(SWINGPKG)/SwingBeanInfoBase.class \ - $(BEANCLASSDIR)/$(SWINGPKG)/text/JTextComponentBeanInfo.class \ - .create.classlist $(FILES_bclass) .compile.classlist - -$(BEANCLASSDIR)/$(SWINGPKG)/SwingBeanInfoBase.class:: \ - $(BEANSRCDIR)/SwingBeanInfoBase.java - -$(BEANCLASSDIR)/$(SWINGPKG)/text/JTextComponentBeanInfo.class:: \ - $(BEANSRCDIR)/JTextComponentBeanInfo.java - -$(FILES_bclass):: $(FILES_beans) - -# all the sources are in one directory, so make sure that the list does -# not have the /text direcotry in it. Kludgy, this is... -.create.classlist: - @$(ECHO) $(subst /text/,/,$(FILES_beans)) >> $(TEMPDIR)/.classes.list - -.delete.classlist: - @$(ECHO) "Deleting classes.list..." - @$(RM) $(TEMPDIR)/.classes.list - -.compile.classlist: - if [ -s $(TEMPDIR)/.classes.list ] ; then \ - $(JAVAC_CMD) $(LOCAL_JAVAC_FLAGS) -classpath $(LOCAL_CLASSPATH) -d $(BEANCLASSDIR) \ - $(shell if [ -s $(TEMPDIR)/.classes.list ] ; then $(CAT) $(TEMPDIR)/.classes.list; fi ) ; \ - fi - @$(java-vm-cleanup) - -# -# Packaging -# -mkpackaging: - $(RM) -r $(BEANCLASSDIR)/$(SWINGPKG)/beaninfo/images - $(MKDIR) -p $(BEANCLASSDIR)/$(SWINGPKG)/beaninfo/images - $(CP) $(DOCLETSRC)/beaninfo/images/*.gif $(BEANCLASSDIR)/$(SWINGPKG)/beaninfo/images - $(BOOT_JAR_CMD) cf $(TEMPDIR)/tmp.jar \ - -C $(BEANCLASSDIR) javax \ - -C $(BEANCLASSDIR) sun \ - $(BOOT_JAR_JFLAGS) - $(MV) $(TEMPDIR)/tmp.jar $(JDK_IMAGE_DIR)/lib/dt.jar - @$(java-vm-cleanup) - -# -# Cleanliness. -# -swingbeans.clean swingbeans.clobber:: - $(RM) -r 1.2src 1.2classes - $(RM) -r java javax - $(RM) *.class - $(RM) $(TEMPDIR)/.beans.list $(TEMPDIR)/.classes.list beaninfo.jar - -# -# Utility. -# - - -# -# Debugging targets for looking at variables. -# -show-vars: - @$(ECHO) FILES_beans = $(FILES_beans) - @$(ECHO) FILES_bclass = $(FILES_bclass) - -.PRECIOUS: $(FILES_beans) - -.PHONY: swing-1.2-beans swing-1.2-beans-debug \ - make-swing-beans mkdoclet .SwingBeanInfo mkbeaninfo .delete.beanlist \ - .javadoc.beanlist mkclasses .create.classlist .delete.classlist \ - .compile.classlist mkpackaging mkpackaging swingbeans.clean \ - swingbeans.clobber show-vars diff --git a/jdk/makefiles/javax/swing/beaninfo/manifest b/jdk/makefiles/javax/swing/beaninfo/manifest deleted file mode 100644 index 228fcb78814..00000000000 --- a/jdk/makefiles/javax/swing/beaninfo/manifest +++ /dev/null @@ -1,111 +0,0 @@ -Name: javax/swing/JApplet.class -Java-Bean: True - -Name: javax/swing/JButton.class -Java-Bean: True - -Name: javax/swing/JCheckBox.class -Java-Bean: True - -Name: javax/swing/JCheckBoxMenuItem.class -Java-Bean: True - -Name: javax/swing/JComboBox.class -Java-Bean: True - -Name: javax/swing/JDialog.class -Java-Bean: True - -Name: javax/swing/JEditorPane.class -Java-Bean: True - -Name: javax/swing/JFormattedTextField.class -Java-Bean: True - -Name: javax/swing/JInternalFrame.class -Java-Bean: True - -Name: javax/swing/JFrame.class -Java-Bean: True - -Name: javax/swing/JLabel.class -Java-Bean: True - -Name: javax/swing/JList.class -Java-Bean: True - -Name: javax/swing/JMenu.class -Java-Bean: True - -Name: javax/swing/JMenuBar.class -Java-Bean: True - -Name: javax/swing/JMenuItem.class -Java-Bean: True - -Name: javax/swing/JOptionPane.class -Java-Bean: True - -Name: javax/swing/JPanel.class -Java-Bean: True - -Name: javax/swing/JPasswordField.class -Java-Bean: True - -Name: javax/swing/JPopupMenu.class -Java-Bean: True - -Name: javax/swing/JProgressBar.class -Java-Bean: True - -Name: javax/swing/JRadioButton.class -Java-Bean: True - -Name: javax/swing/JRadioButtonMenuItem.class -Java-Bean: True - -Name: javax/swing/JScrollBar.class -Java-Bean: True - -Name: javax/swing/JScrollPane.class -Java-Bean: True - -Name: javax/swing/JSeparator.class -Java-Bean: True - -Name: javax/swing/JSlider.class -Java-Bean: True - -Name: javax/swing/JSpinner.class -Java-Bean: True - -Name: javax/swing/JSplitPane.class -Java-Bean: True - -Name: javax/swing/JTabbedPane.class -Java-Bean: True - -Name: javax/swing/JTextArea.class -Java-Bean: True - -Name: javax/swing/JTextField.class -Java-Bean: True - -Name: javax/swing/JTextPane.class -Java-Bean: True - -Name: javax/swing/JToolBar.class -Java-Bean: True - -Name: javax/swing/JTree.class -Java-Bean: True - -Name: javax/swing/JTable.class -Java-Bean: True - -Name: javax/swing/JToggleButton.class -Java-Bean: True - -Name: javax/swing/JWindow.class -Java-Bean: True - diff --git a/jdk/makefiles/javax/swing/html32dtd/Makefile b/jdk/makefiles/javax/swing/html32dtd/Makefile deleted file mode 100644 index c24ef3391bf..00000000000 --- a/jdk/makefiles/javax/swing/html32dtd/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = javax/swing/html/parser -PRODUCT = swing -include $(BUILDDIR)/common/Defs.gmk - -# -# Shared defintions. -# -HTML32DTD = $(CLASSBINDIR)/javax/swing/text/html/parser/html32.bdtd - -$(HTML32DTD): $(BUILD_TOOLS) - @$(prep-target) - ($(TOOL_DTDBUILDER) html32 > $@) || exit 1 - @$(java-vm-cleanup) - -all build: $(HTML32DTD) - -include $(BUILDDIR)/common/Rules.gmk - diff --git a/jdk/makefiles/javax/swing/plaf/FILES.gmk b/jdk/makefiles/javax/swing/plaf/FILES.gmk deleted file mode 100644 index b30da35124a..00000000000 --- a/jdk/makefiles/javax/swing/plaf/FILES.gmk +++ /dev/null @@ -1,117 +0,0 @@ -# -# Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -MISC_SWING_FILES = \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Computer.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/DetailsView.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Directory.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Error.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/File.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/HardDrive.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Inform.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/ListView.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/NewFolder.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Question.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/UpFolder.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/Warn.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/image-delayed.png \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/image-failed.png \ -\ - $(CLASSBINDIR)/javax/swing/plaf/basic/icons/image-delayed.png \ - $(CLASSBINDIR)/javax/swing/plaf/basic/icons/image-failed.png \ -\ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/Error.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/Inform.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/Question.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/sortDown.png \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/sortUp.png \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/Warn.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/close.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/close-pressed.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/collapsed.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/collapsed-rtl.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/computer.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/directory.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/error.png \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/expanded.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/file.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/floppy.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/hardDrive.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/homeFolder.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/iconify.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/info.png \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/maximize.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/menu.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/minimize.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/newFolder.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/paletteClose.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/question.png \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/upFolder.gif \ - $(CLASSBINDIR)/javax/swing/plaf/metal/icons/ocean/warning.png \ - $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/FrameClose.wav \ - $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/FrameMaximize.wav \ - $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/FrameMinimize.wav \ - $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav \ - $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav \ - $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/MenuItemCommand.wav \ - $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav \ - $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav \ - $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/OptionPaneError.wav \ - $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/OptionPaneQuestion.wav \ - $(CLASSBINDIR)/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav - -MISC_SWING_FILES_MOTIF_GIF = \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/Inform.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/Question.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/Warn.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/Error.gif - -MISC_SWING_FILES_MOTIF_PNG = \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/image-delayed.png \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/motif/icons/image-failed.png - -MISC_SWING_FILES_UNIX = \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/gtk/icons/Directory.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/gtk/icons/File.gif \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/gtk/icons/image-delayed.png \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/gtk/icons/image-failed.png \ - $(CLASSBINDIR)/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml - -LOGO_ICONS=\ - $(CLASSBINDIR)/com/sun/java/swing/plaf/windows/icons/JavaCup32.png \ - $(CLASSBINDIR)/javax/swing/plaf/basic/icons/JavaCup16.png - diff --git a/jdk/makefiles/javax/swing/plaf/Makefile b/jdk/makefiles/javax/swing/plaf/Makefile deleted file mode 100644 index 52753d64df5..00000000000 --- a/jdk/makefiles/javax/swing/plaf/Makefile +++ /dev/null @@ -1,133 +0,0 @@ -# -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = javax.swing.plaf -PRODUCT = com -SWING_SRC = $(SHARE_SRC)/classes/javax/swing -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -include FILES.gmk -AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf - -ifeq ($(PLATFORM), windows) - # Don't build GTK L&F on Windows - AUTO_JAVA_PRUNE = gtk -endif - -ifdef DISABLE_NIMBUS - AUTO_JAVA_PRUNE += nimbus -endif - -MISC_FILES = $(MISC_SWING_FILES) -ifneq ($(PLATFORM), windows) - # Only include GTK icons on Solaris/Linux - MISC_FILES += $(MISC_SWING_FILES_UNIX) -endif - -NIMBUS_GENSRC_DIR = $(GENSRCDIR)/javax/swing/plaf/nimbus -NIMBUS_SKIN_FILE = $(SWING_SRC)/plaf/nimbus/skin.laf - -FILES_java = $(FILES_SWING_java) - -# -# Resources -# -LOCALE_SET_DEFINITION = jre -RESOURCE_BUNDLES_COMPILED_PROPERTIES = \ - com/sun/swing/internal/plaf/basic/resources/basic.properties \ - com/sun/swing/internal/plaf/metal/resources/metal.properties \ - com/sun/swing/internal/plaf/synth/resources/synth.properties \ - com/sun/java/swing/plaf/motif/resources/motif.properties \ - com/sun/java/swing/plaf/windows/resources/windows.properties -ifneq ($(PLATFORM), windows) - # Only compile GTK resource bundles on Solaris/Linux - RESOURCE_BUNDLES_COMPILED_PROPERTIES += \ - com/sun/java/swing/plaf/gtk/resources/gtk.properties -endif - -# -# Rules. -# Process LOGO_ICONS and Motif Icons first. -# -build: $(LOGO_ICONS) $(MISC_SWING_FILES_MOTIF_GIF) $(MISC_SWING_FILES_MOTIF_PNG) other_files - -$(NIMBUS_GENSRC_DIR): $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS) - @$(ECHO) "Generating Nimbus source files:" - $(RM) -r $(NIMBUS_GENSRC_DIR) - $(TOOL_GENERATENIMBUS) \ - -skinFile $(NIMBUS_SKIN_FILE) -buildDir $(GENSRCDIR) \ - -packagePrefix $(PACKAGE).nimbus -lafName Nimbus - @$(ECHO) "Finished generating Nimbus source files" - -clean:: classes.clean - $(RM) -r $(NIMBUS_GENSRC_DIR) - -# -# Include -# -ifndef DISABLE_NIMBUS - CLASSES_INIT = $(NIMBUS_GENSRC_DIR) -endif - -include $(BUILDDIR)/common/Classes.gmk - -ifndef OPENJDK -$(LOGO_ICONS): $(CLASSBINDIR)/%.png: $(CLOSED_SRC)/share/classes/%.png - $(install-file) - -$(MISC_SWING_FILES_MOTIF_GIF): $(CLASSBINDIR)/%.gif: $(CLOSED_SRC)/share/classes/%.gif - $(install-file) - -$(MISC_SWING_FILES_MOTIF_PNG): $(CLASSBINDIR)/%.png: $(CLOSED_SRC)/share/classes/%.png - $(install-file) -endif - -other_files: $(MISC_FILES) - -$(CLASSBINDIR)/%.wav: $(SHARE_SRC)/classes/%.wav - $(install-file) - -$(CLASSBINDIR)/%.gif: $(SHARE_SRC)/classes/%.gif - $(install-file) - -$(CLASSBINDIR)/%.png: $(SHARE_SRC)/classes/%.png - $(install-file) - -$(CLASSBINDIR)/%.xml: $(SHARE_SRC)/classes/%.xml - $(install-file) - -$(CLASSBINDIR)/%.css: $(SHARE_SRC)/classes/%.css - $(install-file) - -$(CLASSBINDIR)/%.bdtd: $(SHARE_SRC)/classes/%.bdtd - $(install-file) - -$(CLASSBINDIR)/%.txt: $(SHARE_SRC)/classes/%.txt - $(install-file) - diff --git a/jdk/makefiles/sun/awt/mapfile-mawt-vers b/jdk/makefiles/mapfiles/libawt/mapfile-mawt-vers similarity index 100% rename from jdk/makefiles/sun/awt/mapfile-mawt-vers rename to jdk/makefiles/mapfiles/libawt/mapfile-mawt-vers diff --git a/jdk/makefiles/sun/awt/mapfile-vers b/jdk/makefiles/mapfiles/libawt/mapfile-vers similarity index 100% rename from jdk/makefiles/sun/awt/mapfile-vers rename to jdk/makefiles/mapfiles/libawt/mapfile-vers diff --git a/jdk/makefiles/sun/awt/mapfile-vers-linux b/jdk/makefiles/mapfiles/libawt/mapfile-vers-linux similarity index 100% rename from jdk/makefiles/sun/awt/mapfile-vers-linux rename to jdk/makefiles/mapfiles/libawt/mapfile-vers-linux diff --git a/jdk/makefiles/sun/headless/mapfile-vers b/jdk/makefiles/mapfiles/libawt_headless/mapfile-vers similarity index 100% rename from jdk/makefiles/sun/headless/mapfile-vers rename to jdk/makefiles/mapfiles/libawt_headless/mapfile-vers diff --git a/jdk/makefiles/sun/headless/reorder-i586 b/jdk/makefiles/mapfiles/libawt_headless/reorder-i586 similarity index 100% rename from jdk/makefiles/sun/headless/reorder-i586 rename to jdk/makefiles/mapfiles/libawt_headless/reorder-i586 diff --git a/jdk/makefiles/sun/headless/reorder-sparc b/jdk/makefiles/mapfiles/libawt_headless/reorder-sparc similarity index 100% rename from jdk/makefiles/sun/headless/reorder-sparc rename to jdk/makefiles/mapfiles/libawt_headless/reorder-sparc diff --git a/jdk/makefiles/sun/headless/reorder-sparcv9 b/jdk/makefiles/mapfiles/libawt_headless/reorder-sparcv9 similarity index 100% rename from jdk/makefiles/sun/headless/reorder-sparcv9 rename to jdk/makefiles/mapfiles/libawt_headless/reorder-sparcv9 diff --git a/jdk/makefiles/sun/xawt/mapfile-vers b/jdk/makefiles/mapfiles/libawt_xawt/mapfile-vers similarity index 100% rename from jdk/makefiles/sun/xawt/mapfile-vers rename to jdk/makefiles/mapfiles/libawt_xawt/mapfile-vers diff --git a/jdk/makefiles/sun/dcpr/mapfile-vers b/jdk/makefiles/mapfiles/libdcpr/mapfile-vers similarity index 100% rename from jdk/makefiles/sun/dcpr/mapfile-vers rename to jdk/makefiles/mapfiles/libdcpr/mapfile-vers diff --git a/jdk/makefiles/java/java_hprof_demo/mapfile-vers b/jdk/makefiles/mapfiles/libhprof/mapfile-vers similarity index 100% rename from jdk/makefiles/java/java_hprof_demo/mapfile-vers rename to jdk/makefiles/mapfiles/libhprof/mapfile-vers diff --git a/jdk/makefiles/java/instrument/mapfile-vers b/jdk/makefiles/mapfiles/libinstrument/mapfile-vers similarity index 100% rename from jdk/makefiles/java/instrument/mapfile-vers rename to jdk/makefiles/mapfiles/libinstrument/mapfile-vers diff --git a/jdk/makefiles/sun/security/jgss/wrapper/mapfile-vers b/jdk/makefiles/mapfiles/libj2gss/mapfile-vers similarity index 100% rename from jdk/makefiles/sun/security/jgss/wrapper/mapfile-vers rename to jdk/makefiles/mapfiles/libj2gss/mapfile-vers diff --git a/jdk/makefiles/sun/security/smartcardio/mapfile-vers b/jdk/makefiles/mapfiles/libj2pcsc/mapfile-vers similarity index 100% rename from jdk/makefiles/sun/security/smartcardio/mapfile-vers rename to jdk/makefiles/mapfiles/libj2pcsc/mapfile-vers diff --git a/jdk/makefiles/mapfiles/libj2pkcs11/mapfile-vers b/jdk/makefiles/mapfiles/libj2pkcs11/mapfile-vers new file mode 100644 index 00000000000..7301c11417d --- /dev/null +++ b/jdk/makefiles/mapfiles/libj2pkcs11/mapfile-vers @@ -0,0 +1,110 @@ +# +# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# Define public interface. + +SUNWprivate_1.1 { + global: + JNI_OnLoad; + Java_sun_security_pkcs11_wrapper_PKCS11_initializeLibrary; + Java_sun_security_pkcs11_wrapper_PKCS11_finalizeLibrary; + Java_sun_security_pkcs11_wrapper_PKCS11_connect; + Java_sun_security_pkcs11_wrapper_PKCS11_disconnect; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1Initialize; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1Finalize; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetInfo; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetSlotList; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetSlotInfo; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetTokenInfo; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetMechanismList; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetMechanismInfo; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1InitToken; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1InitPIN; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1SetPIN; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1OpenSession; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1CloseSession; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1CloseAllSessions; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetSessionInfo; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetOperationState; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1SetOperationState; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1Login; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1Logout; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1CreateObject; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1CopyObject; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1DestroyObject; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetObjectSize; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetAttributeValue; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1SetAttributeValue; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1FindObjectsInit; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1FindObjects; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1FindObjectsFinal; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptInit; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1Encrypt; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptUpdate; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1EncryptFinal; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptInit; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1Decrypt; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptUpdate; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptFinal; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestInit; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestSingle; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestUpdate; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestKey; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestFinal; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignInit; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1Sign; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignUpdate; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignFinal; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignRecoverInit; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignRecover; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyInit; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1Verify; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyUpdate; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyFinal; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyRecoverInit; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1VerifyRecover; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1DigestEncryptUpdate; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptDigestUpdate; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1SignEncryptUpdate; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1DecryptVerifyUpdate; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GenerateKey; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GenerateKeyPair; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1WrapKey; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1UnwrapKey; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1DeriveKey; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1SeedRandom; + Java_sun_security_pkcs11_wrapper_PKCS11_C_1GenerateRandom; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1GetFunctionStatus; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1CancelFunction; +# Java_sun_security_pkcs11_wrapper_PKCS11_C_1WaitForSlotEvent; + Java_sun_security_pkcs11_Secmod_nssGetLibraryHandle; + Java_sun_security_pkcs11_Secmod_nssLoadLibrary; + Java_sun_security_pkcs11_Secmod_nssVersionCheck; + Java_sun_security_pkcs11_Secmod_nssInit; + Java_sun_security_pkcs11_Secmod_nssGetModuleList; + + local: + *; +}; diff --git a/jdk/makefiles/com/oracle/security/ucrypto/mapfile-vers b/jdk/makefiles/mapfiles/libj2ucrypto/mapfile-vers similarity index 100% rename from jdk/makefiles/com/oracle/security/ucrypto/mapfile-vers rename to jdk/makefiles/mapfiles/libj2ucrypto/mapfile-vers diff --git a/jdk/makefiles/java/java/mapfile-vers b/jdk/makefiles/mapfiles/libjava/mapfile-vers similarity index 100% rename from jdk/makefiles/java/java/mapfile-vers rename to jdk/makefiles/mapfiles/libjava/mapfile-vers diff --git a/jdk/makefiles/java/java/reorder-i586 b/jdk/makefiles/mapfiles/libjava/reorder-i586 similarity index 91% rename from jdk/makefiles/java/java/reorder-i586 rename to jdk/makefiles/mapfiles/libjava/reorder-i586 index fc3202a8439..deb78fb9799 100644 --- a/jdk/makefiles/java/java/reorder-i586 +++ b/jdk/makefiles/mapfiles/libjava/reorder-i586 @@ -2,11 +2,11 @@ data = R0x2000; text = LOAD ?RXO; # Test Null text: .text%_init; -text: .text%init64IO: OUTPUTDIR/tmp/java/java.lang/java/obj/UnixFileSystem_md.o; +text: .text%init64IO: OUTPUTDIR/UnixFileSystem_md.o; text: .text%JNI_OnLoad; text: .text%Canonicalize; text: .text%canonicalize; -text: .text%collapse: OUTPUTDIR/tmp/java/java.lang/java/obj/canonicalize_md.o; +text: .text%collapse: OUTPUTDIR/canonicalize_md.o; text: .text%Java_java_lang_Object_registerNatives; text: .text%Java_java_lang_System_registerNatives; text: .text%Java_java_lang_Thread_registerNatives; @@ -18,9 +18,9 @@ text: .text%Java_java_lang_Class_registerNatives; text: .text%Java_java_lang_Class_getPrimitiveClass; text: .text%Java_java_lang_System_initProperties; text: .text%GetJavaProperties; -text: .text%uname: OUTPUTDIR/tmp/java/java.lang/java/obj/java_props_md.o; -text: .text%mapLookup: OUTPUTDIR/tmp/java/java.lang/java/obj/java_props_md.o; -text: .text%setPathEnvironment: OUTPUTDIR/tmp/java/java.lang/java/obj/java_props_md.o; +text: .text%uname: OUTPUTDIR/java_props_md.o; +text: .text%mapLookup: OUTPUTDIR/java_props_md.o; +text: .text%setPathEnvironment: OUTPUTDIR/java_props_md.o; text: .text%JNU_NewStringPlatform; text: .text%JNU_CallStaticMethodByName; text: .text%NewStringPlatform; @@ -51,7 +51,7 @@ text: .text%Java_java_lang_ClassLoader_findLoadedClass; text: .text%Java_java_lang_ClassLoader_findBootstrapClass; text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2; text: .text%Java_java_lang_System_mapLibraryName; -text: .text%cpchars: OUTPUTDIR/tmp/java/java.lang/java/obj/System.o; +text: .text%cpchars: OUTPUTDIR/System.o; text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_load; text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_find; text: .text%Java_java_lang_Float_floatToIntBits; diff --git a/jdk/makefiles/java/java/reorder-sparc b/jdk/makefiles/mapfiles/libjava/reorder-sparc similarity index 92% rename from jdk/makefiles/java/java/reorder-sparc rename to jdk/makefiles/mapfiles/libjava/reorder-sparc index 090f0001da2..32f9aaf2d8e 100644 --- a/jdk/makefiles/java/java/reorder-sparc +++ b/jdk/makefiles/mapfiles/libjava/reorder-sparc @@ -1,11 +1,11 @@ data = R0x2000; text = LOAD ?RXO; # Test Null -text: .text%init64IO: OUTPUTDIR/tmp/java/java.lang/java/obj/UnixFileSystem_md.o; +text: .text%init64IO: OUTPUTDIR/UnixFileSystem_md.o; text: .text%JNI_OnLoad; text: .text%Canonicalize; text: .text%canonicalize; -text: .text%collapse: OUTPUTDIR/tmp/java/java.lang/java/obj/canonicalize_md.o; +text: .text%collapse: OUTPUTDIR/canonicalize_md.o; text: .text%Java_java_lang_Object_registerNatives; text: .text%Java_java_lang_System_registerNatives; text: .text%Java_java_lang_Thread_registerNatives; @@ -19,9 +19,9 @@ text: .text%Java_java_lang_Class_getPrimitiveClass; text: .text%Java_java_lang_System_initProperties; text: .text%GetJavaProperties; text: .text%JNU_NewStringPlatform; -text: .text%initializeEncoding: OUTPUTDIR/tmp/java/java.lang/java/obj/jni_util.o; +text: .text%initializeEncoding: OUTPUTDIR/jni_util.o; text: .text%JNU_CallStaticMethodByName; -text: .text%newString646_US: OUTPUTDIR/tmp/java/java.lang/java/obj/jni_util.o; +text: .text%newString646_US: OUTPUTDIR/jni_util.o; text: .text%NewStringPlatform; text: .text%Java_java_io_FileInputStream_initIDs; text: .text%Java_java_io_FileDescriptor_initIDs; @@ -51,7 +51,7 @@ text: .text%Java_java_io_FileInputStream_available; text: .text%Java_java_io_FileInputStream_close0; text: .text%Java_java_lang_System_mapLibraryName; text: .text%Java_java_io_UnixFileSystem_getBooleanAttributes0; -text: .text%statMode: OUTPUTDIR/tmp/java/java.lang/java/obj/UnixFileSystem_md.o; +text: .text%statMode: OUTPUTDIR/UnixFileSystem_md.o; text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_load; text: .text%Java_java_lang_Compiler_registerNatives; text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_find; diff --git a/jdk/makefiles/java/java/reorder-sparcv9 b/jdk/makefiles/mapfiles/libjava/reorder-sparcv9 similarity index 89% rename from jdk/makefiles/java/java/reorder-sparcv9 rename to jdk/makefiles/mapfiles/libjava/reorder-sparcv9 index b20b45ab960..d64cb957793 100644 --- a/jdk/makefiles/java/java/reorder-sparcv9 +++ b/jdk/makefiles/mapfiles/libjava/reorder-sparcv9 @@ -1,11 +1,11 @@ data = R0x2000; text = LOAD ?RXO; # Test Null -text: .text%init64IO: OUTPUTDIR/tmp/java/java.lang/java/obj64/UnixFileSystem_md.o; +text: .text%init64IO: OUTPUTDIR/UnixFileSystem_md.o; text: .text%JNI_OnLoad; text: .text%Canonicalize; text: .text%canonicalize; -text: .text%collapse: OUTPUTDIR/tmp/java/java.lang/java/obj64/canonicalize_md.o; +text: .text%collapse: OUTPUTDIR/canonicalize_md.o; text: .text%Java_java_lang_Object_registerNatives; text: .text%Java_java_lang_System_registerNatives; text: .text%Java_java_lang_Thread_registerNatives; @@ -18,9 +18,9 @@ text: .text%Java_java_lang_Class_getPrimitiveClass; text: .text%Java_java_lang_System_initProperties; text: .text%GetJavaProperties; text: .text%JNU_NewStringPlatform; -text: .text%initializeEncoding: OUTPUTDIR/tmp/java/java.lang/java/obj64/jni_util.o; +text: .text%initializeEncoding: OUTPUTDIR/jni_util.o; text: .text%JNU_CallStaticMethodByName; -text: .text%newString8859_1: OUTPUTDIR/tmp/java/java.lang/java/obj64/jni_util.o; +text: .text%newString8859_1: OUTPUTDIR/jni_util.o; text: .text%NewStringPlatform; text: .text%Java_java_io_FileInputStream_initIDs; text: .text%Java_java_io_FileDescriptor_initIDs; @@ -58,7 +58,7 @@ text: .text%Java_java_io_UnixFileSystem_list; text: .text%JNU_ClassString; text: .text%JNU_CopyObjectArray; text: .text%Java_java_io_UnixFileSystem_getBooleanAttributes0; -text: .text%statMode: OUTPUTDIR/tmp/java/java.lang/java/obj64/UnixFileSystem_md.o; +text: .text%statMode: OUTPUTDIR/UnixFileSystem_md.o; text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2; text: .text%Java_java_lang_System_mapLibraryName; text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_load; @@ -82,7 +82,7 @@ text: .text%Java_java_lang_ref_Finalizer_invokeFinalizeMethod; text: .text%Java_java_lang_reflect_Array_newArray; text: .text%Java_java_lang_Throwable_getStackTraceDepth; text: .text%Java_java_lang_Throwable_getStackTraceElement; -text: .text%throwFileNotFoundException: OUTPUTDIR/tmp/java/java.lang/java/obj64/io_util.o; +text: .text%throwFileNotFoundException: OUTPUTDIR/io_util.o; text: .text%JNU_NotifyAll; # Test LoadFrame text: .text%JNU_CallMethodByName; diff --git a/jdk/makefiles/java/java_crw_demo/mapfile-vers b/jdk/makefiles/mapfiles/libjava_crw_demo/mapfile-vers similarity index 100% rename from jdk/makefiles/java/java_crw_demo/mapfile-vers rename to jdk/makefiles/mapfiles/libjava_crw_demo/mapfile-vers diff --git a/jdk/makefiles/sun/jdga/mapfile-vers b/jdk/makefiles/mapfiles/libjdga/mapfile-vers similarity index 100% rename from jdk/makefiles/sun/jdga/mapfile-vers rename to jdk/makefiles/mapfiles/libjdga/mapfile-vers diff --git a/jdk/makefiles/mapfiles/libjfr/mapfile-vers b/jdk/makefiles/mapfiles/libjfr/mapfile-vers new file mode 100644 index 00000000000..aed19a75be3 --- /dev/null +++ b/jdk/makefiles/mapfiles/libjfr/mapfile-vers @@ -0,0 +1,39 @@ +# +# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. +# ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. +# + +# Define library interface. + +SUNWprivate_1.1 { + global: + Java_oracle_jrockit_jfr_util_os_Process_getpid; + Java_oracle_jrockit_jfr_util_os_Timing_counterTime; + Java_oracle_jrockit_jfr_util_os_Timing_init; + Java_oracle_jrockit_jfr_util_log_NativeLogger_output0; + Java_oracle_jrockit_jfr_VMJFR_isEnabled; + Java_oracle_jrockit_jfr_VMJFR_options; + Java_oracle_jrockit_jfr_VMJFR_init; + Java_oracle_jrockit_jfr_VMJFR_addConstPool; + Java_oracle_jrockit_jfr_VMJFR_removeConstPool; + Java_oracle_jrockit_jfr_VMJFR_storeConstPool; + Java_oracle_jrockit_jfr_VMJFR_classID; + Java_oracle_jrockit_jfr_VMJFR_stackTraceID; + Java_oracle_jrockit_jfr_VMJFR_threadID; + Java_oracle_jrockit_jfr_VMJFR_rotate; + Java_oracle_jrockit_jfr_VMJFR_shutdown; + Java_oracle_jrockit_jfr_VMJFR_start; + Java_oracle_jrockit_jfr_VMJFR_stop; + Java_oracle_jrockit_jfr_VMJFR_buffer; + Java_oracle_jrockit_jfr_VMJFR_flush; + Java_oracle_jrockit_jfr_VMJFR_write; + Java_oracle_jrockit_jfr_VMJFR_add; + Java_oracle_jrockit_jfr_VMJFR_remove; + Java_oracle_jrockit_jfr_VMJFR_setThreshold; + Java_oracle_jrockit_jfr_VMJFR_setPeriod; + Java_oracle_jrockit_jfr_VMJFR_getPeriod; + Java_oracle_jrockit_jfr_VMJFR_descriptors; + JNI_OnLoad; + local: + *; +}; diff --git a/jdk/makefiles/java/jli/mapfile-vers b/jdk/makefiles/mapfiles/libjli/mapfile-vers similarity index 100% rename from jdk/makefiles/java/jli/mapfile-vers rename to jdk/makefiles/mapfiles/libjli/mapfile-vers diff --git a/jdk/makefiles/mapfiles/libjpeg/reorder-i586 b/jdk/makefiles/mapfiles/libjpeg/reorder-i586 index 47e18ca44d1..328c6dcd782 100644 --- a/jdk/makefiles/mapfiles/libjpeg/reorder-i586 +++ b/jdk/makefiles/mapfiles/libjpeg/reorder-i586 @@ -19,101 +19,101 @@ text: .text%jIMemMgr; text: .text%jMemInit; text: .text%jGetSmall; text: .text%jIMReader; -text: .text%alloc_small: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; -text: .text%reset_marker_reader: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; +text: .text%alloc_small: OUTPUTDIR/jmemmgr.o; +text: .text%reset_marker_reader: OUTPUTDIR/jdmarker.o; text: .text%jIInCtlr; -# text: .text%GET_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jpegdecoder.o; +# text: .text%GET_ARRAYS: OUTPUTDIR/jpegdecoder.o; text: .text%jReadHeader; text: .text%jConsumeInput; -text: .text%reset_input_controller: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -text: .text%reset_error_mgr: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jerror.o; +text: .text%reset_input_controller: OUTPUTDIR/jdinput.o; +text: .text%reset_error_mgr: OUTPUTDIR/jerror.o; text: .text%sun_jpeg_init_source; -text: .text%consume_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -text: .text%read_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -# text: .text%first_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; +text: .text%consume_markers: OUTPUTDIR/jdinput.o; +text: .text%read_markers: OUTPUTDIR/jdmarker.o; +# text: .text%first_marker: OUTPUTDIR/jdmarker.o; text: .text%sun_jpeg_fill_input_buffer; -# text: .text%RELEASE_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jpegdecoder.o; -# text: .text%get_soi: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%emit_message: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jerror.o; -# text: .text%next_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%get_interesting_appn: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -# text: .text%examine_app0: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%skip_variable: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; +# text: .text%RELEASE_ARRAYS: OUTPUTDIR/jpegdecoder.o; +# text: .text%get_soi: OUTPUTDIR/jdmarker.o; +text: .text%emit_message: OUTPUTDIR/jerror.o; +# text: .text%next_marker: OUTPUTDIR/jdmarker.o; +text: .text%get_interesting_appn: OUTPUTDIR/jdmarker.o; +# text: .text%examine_app0: OUTPUTDIR/jdmarker.o; +text: .text%skip_variable: OUTPUTDIR/jdmarker.o; text: .text%sun_jpeg_skip_input_data; -# text: .text%examine_app14: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%get_dqt: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; +# text: .text%examine_app14: OUTPUTDIR/jdmarker.o; +text: .text%get_dqt: OUTPUTDIR/jdmarker.o; text: .text%jAlcQTable; -text: .text%get_sof: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -# text: .text%get_dri: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%get_dht: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; +text: .text%get_sof: OUTPUTDIR/jdmarker.o; +# text: .text%get_dri: OUTPUTDIR/jdmarker.o; +text: .text%get_dht: OUTPUTDIR/jdmarker.o; text: .text%jAlcHTable; -text: .text%get_sos: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -# text: .text%initial_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; +text: .text%get_sos: OUTPUTDIR/jdmarker.o; +# text: .text%initial_setup: OUTPUTDIR/jdinput.o; text: .text%jDivRound; -# text: .text%default_decompress_parms: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdapimin.o; +# text: .text%default_decompress_parms: OUTPUTDIR/jdapimin.o; text: .text%jHasMultScn; text: .text%jStrtDecompress; text: .text%jIDMaster; -# text: .text%master_selection: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o; +# text: .text%master_selection: OUTPUTDIR/jdmaster.o; text: .text%jCalcDimensions; -# text: .text%use_merged_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o; -# text: .text%prepare_range_limit_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o; +# text: .text%use_merged_upsample: OUTPUTDIR/jdmaster.o; +# text: .text%prepare_range_limit_table: OUTPUTDIR/jdmaster.o; text: .text%jIDColor; -# text: .text%build_ycc_rgb_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o; +# text: .text%build_ycc_rgb_table: OUTPUTDIR/jdcolor.o; text: .text%jIUpsampler; text: .text%jRound; -text: .text%alloc_sarray: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; -text: .text%alloc_large: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; +text: .text%alloc_sarray: OUTPUTDIR/jmemmgr.o; +text: .text%alloc_large: OUTPUTDIR/jmemmgr.o; text: .text%jGetLarge; text: .text%jIDPostC; text: .text%jIIDCT; text: .text%jIHDecoder; text: .text%jIDCoefC; text: .text%jIDMainC; -# text: .text%alloc_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; -text: .text%realize_virt_arrays: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; -text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -# text: .text%per_scan_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -# text: .text%latch_quant_tables: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -text: .text%start_pass_huff_decoder: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o; +# text: .text%alloc_funny_pointers: OUTPUTDIR/jdmainct.o; +text: .text%realize_virt_arrays: OUTPUTDIR/jmemmgr.o; +text: .text%start_input_pass: OUTPUTDIR/jdinput.o; +# text: .text%per_scan_setup: OUTPUTDIR/jdinput.o; +# text: .text%latch_quant_tables: OUTPUTDIR/jdinput.o; +text: .text%start_pass_huff_decoder: OUTPUTDIR/jdhuff.o; text: .text%jMkDDerived; -text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o; -# text: .text%start_iMCU_row: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o; -# text: .text%output_pass_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdapistd.o; -text: .text%prepare_for_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o; -text: .text%start_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jddctmgr.o; -text: .text%start_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o; -text: .text%start_pass_dcolor: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o; -text: .text%start_pass_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o; -text: .text%start_pass_dpost: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdpostct.o; -text: .text%start_pass_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; -# text: .text%make_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; +text: .text%start_input_pass: OUTPUTDIR/jdcoefct.o; +# text: .text%start_iMCU_row: OUTPUTDIR/jdcoefct.o; +# text: .text%output_pass_setup: OUTPUTDIR/jdapistd.o; +text: .text%prepare_for_output_pass: OUTPUTDIR/jdmaster.o; +text: .text%start_pass: OUTPUTDIR/jddctmgr.o; +text: .text%start_output_pass: OUTPUTDIR/jdcoefct.o; +text: .text%start_pass_dcolor: OUTPUTDIR/jdcolor.o; +text: .text%start_pass_upsample: OUTPUTDIR/jdsample.o; +text: .text%start_pass_dpost: OUTPUTDIR/jdpostct.o; +text: .text%start_pass_main: OUTPUTDIR/jdmainct.o; +# text: .text%make_funny_pointers: OUTPUTDIR/jdmainct.o; text: .text%jReadScanlines; -text: .text%process_data_context_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; -text: .text%decompress_onepass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o; +text: .text%process_data_context_main: OUTPUTDIR/jdmainct.o; +text: .text%decompress_onepass: OUTPUTDIR/jdcoefct.o; text: .text%jZeroFar; -text: .text%decode_mcu: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o; +text: .text%decode_mcu: OUTPUTDIR/jdhuff.o; text: .text%jFilBitBuf; text: .text%jHufDecode; text: .text%jRDislow; -text: .text%sep_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o; -text: .text%fullsize_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o; -text: .text%h2v2_fancy_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o; -text: .text%ycc_rgb_convert: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o; -# text: .text%set_wraparound_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; -# text: .text%process_restart: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o; -text: .text%read_restart_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%finish_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -# text: .text%set_bottom_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; +text: .text%sep_upsample: OUTPUTDIR/jdsample.o; +text: .text%fullsize_upsample: OUTPUTDIR/jdsample.o; +text: .text%h2v2_fancy_upsample: OUTPUTDIR/jdsample.o; +text: .text%ycc_rgb_convert: OUTPUTDIR/jdcolor.o; +# text: .text%set_wraparound_pointers: OUTPUTDIR/jdmainct.o; +# text: .text%process_restart: OUTPUTDIR/jdhuff.o; +text: .text%read_restart_marker: OUTPUTDIR/jdmarker.o; +text: .text%finish_input_pass: OUTPUTDIR/jdinput.o; +# text: .text%set_bottom_pointers: OUTPUTDIR/jdmainct.o; text: .text%jFinDecompress; -text: .text%finish_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o; +text: .text%finish_output_pass: OUTPUTDIR/jdmaster.o; text: .text%sun_jpeg_term_source; text: .text%jAbort; -text: .text%free_pool: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; +text: .text%free_pool: OUTPUTDIR/jmemmgr.o; text: .text%jFreeLarge; text: .text%jFreeSmall; text: .text%jDestDecompress; text: .text%jDestroy; -text: .text%self_destruct: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; +text: .text%self_destruct: OUTPUTDIR/jmemmgr.o; text: .text%jMemTerm; -text: .text%process_data_simple_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; +text: .text%process_data_simple_main: OUTPUTDIR/jdmainct.o; diff --git a/jdk/makefiles/mapfiles/libjpeg/reorder-sparc b/jdk/makefiles/mapfiles/libjpeg/reorder-sparc index a7b21edca43..e771347cead 100644 --- a/jdk/makefiles/mapfiles/libjpeg/reorder-sparc +++ b/jdk/makefiles/mapfiles/libjpeg/reorder-sparc @@ -19,101 +19,101 @@ text: .text%jIMemMgr; text: .text%jMemInit; text: .text%jGetSmall; text: .text%jIMReader; -text: .text%alloc_small: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; -text: .text%reset_marker_reader: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; +text: .text%alloc_small: OUTPUTDIR/jmemmgr.o; +text: .text%reset_marker_reader: OUTPUTDIR/jdmarker.o; text: .text%jIInCtlr; -text: .text%GET_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jpegdecoder.o; +text: .text%GET_ARRAYS: OUTPUTDIR/jpegdecoder.o; text: .text%jReadHeader; text: .text%jConsumeInput; -text: .text%reset_input_controller: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -text: .text%reset_error_mgr: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jerror.o; +text: .text%reset_input_controller: OUTPUTDIR/jdinput.o; +text: .text%reset_error_mgr: OUTPUTDIR/jerror.o; text: .text%sun_jpeg_init_source; -text: .text%consume_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -text: .text%read_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -# text: .text%first_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; +text: .text%consume_markers: OUTPUTDIR/jdinput.o; +text: .text%read_markers: OUTPUTDIR/jdmarker.o; +# text: .text%first_marker: OUTPUTDIR/jdmarker.o; text: .text%sun_jpeg_fill_input_buffer; -text: .text%RELEASE_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jpegdecoder.o; -# text: .text%get_soi: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%emit_message: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jerror.o; -text: .text%next_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%get_interesting_appn: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%examine_app0: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%skip_variable: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; +text: .text%RELEASE_ARRAYS: OUTPUTDIR/jpegdecoder.o; +# text: .text%get_soi: OUTPUTDIR/jdmarker.o; +text: .text%emit_message: OUTPUTDIR/jerror.o; +text: .text%next_marker: OUTPUTDIR/jdmarker.o; +text: .text%get_interesting_appn: OUTPUTDIR/jdmarker.o; +text: .text%examine_app0: OUTPUTDIR/jdmarker.o; +text: .text%skip_variable: OUTPUTDIR/jdmarker.o; text: .text%sun_jpeg_skip_input_data; -text: .text%examine_app14: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%get_dqt: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; +text: .text%examine_app14: OUTPUTDIR/jdmarker.o; +text: .text%get_dqt: OUTPUTDIR/jdmarker.o; text: .text%jAlcQTable; -text: .text%get_sof: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -# text: .text%get_dri: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%get_dht: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; +text: .text%get_sof: OUTPUTDIR/jdmarker.o; +# text: .text%get_dri: OUTPUTDIR/jdmarker.o; +text: .text%get_dht: OUTPUTDIR/jdmarker.o; text: .text%jAlcHTable; -text: .text%get_sos: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%initial_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; +text: .text%get_sos: OUTPUTDIR/jdmarker.o; +text: .text%initial_setup: OUTPUTDIR/jdinput.o; text: .text%jDivRound; -text: .text%default_decompress_parms: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdapimin.o; +text: .text%default_decompress_parms: OUTPUTDIR/jdapimin.o; text: .text%jHasMultScn; text: .text%jStrtDecompress; text: .text%jIDMaster; -text: .text%master_selection: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o; +text: .text%master_selection: OUTPUTDIR/jdmaster.o; text: .text%jCalcDimensions; -# text: .text%use_merged_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o; -# text: .text%prepare_range_limit_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o; +# text: .text%use_merged_upsample: OUTPUTDIR/jdmaster.o; +# text: .text%prepare_range_limit_table: OUTPUTDIR/jdmaster.o; text: .text%jIDColor; -# text: .text%build_ycc_rgb_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o; +# text: .text%build_ycc_rgb_table: OUTPUTDIR/jdcolor.o; text: .text%jIUpsampler; text: .text%jRound; -text: .text%alloc_sarray: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; -text: .text%alloc_large: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; +text: .text%alloc_sarray: OUTPUTDIR/jmemmgr.o; +text: .text%alloc_large: OUTPUTDIR/jmemmgr.o; text: .text%jGetLarge; text: .text%jIDPostC; text: .text%jIIDCT; text: .text%jIHDecoder; text: .text%jIDCoefC; text: .text%jIDMainC; -text: .text%alloc_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; -text: .text%realize_virt_arrays: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; -text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -text: .text%per_scan_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -text: .text%latch_quant_tables: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -text: .text%start_pass_huff_decoder: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o; +text: .text%alloc_funny_pointers: OUTPUTDIR/jdmainct.o; +text: .text%realize_virt_arrays: OUTPUTDIR/jmemmgr.o; +text: .text%start_input_pass: OUTPUTDIR/jdinput.o; +text: .text%per_scan_setup: OUTPUTDIR/jdinput.o; +text: .text%latch_quant_tables: OUTPUTDIR/jdinput.o; +text: .text%start_pass_huff_decoder: OUTPUTDIR/jdhuff.o; text: .text%jMkDDerived; -text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o; -# text: .text%start_iMCU_row: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o; -text: .text%output_pass_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdapistd.o; -text: .text%prepare_for_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o; -text: .text%start_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jddctmgr.o; -text: .text%start_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o; -text: .text%start_pass_dcolor: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o; -text: .text%start_pass_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o; -text: .text%start_pass_dpost: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdpostct.o; -text: .text%start_pass_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; -text: .text%make_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; +text: .text%start_input_pass: OUTPUTDIR/jdcoefct.o; +# text: .text%start_iMCU_row: OUTPUTDIR/jdcoefct.o; +text: .text%output_pass_setup: OUTPUTDIR/jdapistd.o; +text: .text%prepare_for_output_pass: OUTPUTDIR/jdmaster.o; +text: .text%start_pass: OUTPUTDIR/jddctmgr.o; +text: .text%start_output_pass: OUTPUTDIR/jdcoefct.o; +text: .text%start_pass_dcolor: OUTPUTDIR/jdcolor.o; +text: .text%start_pass_upsample: OUTPUTDIR/jdsample.o; +text: .text%start_pass_dpost: OUTPUTDIR/jdpostct.o; +text: .text%start_pass_main: OUTPUTDIR/jdmainct.o; +text: .text%make_funny_pointers: OUTPUTDIR/jdmainct.o; text: .text%jReadScanlines; -text: .text%process_data_context_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; -text: .text%decompress_onepass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcoefct.o; +text: .text%process_data_context_main: OUTPUTDIR/jdmainct.o; +text: .text%decompress_onepass: OUTPUTDIR/jdcoefct.o; text: .text%jZeroFar; -text: .text%decode_mcu: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o; +text: .text%decode_mcu: OUTPUTDIR/jdhuff.o; text: .text%jFilBitBuf; text: .text%jHufDecode; text: .text%jRDislow; -text: .text%sep_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o; -text: .text%fullsize_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o; -text: .text%h2v2_fancy_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdsample.o; -text: .text%ycc_rgb_convert: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdcolor.o; -# text: .text%set_wraparound_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; -#text: .text%process_restart: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdhuff.o; -text: .text%read_restart_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmarker.o; -text: .text%finish_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdinput.o; -# text: .text%set_bottom_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; +text: .text%sep_upsample: OUTPUTDIR/jdsample.o; +text: .text%fullsize_upsample: OUTPUTDIR/jdsample.o; +text: .text%h2v2_fancy_upsample: OUTPUTDIR/jdsample.o; +text: .text%ycc_rgb_convert: OUTPUTDIR/jdcolor.o; +# text: .text%set_wraparound_pointers: OUTPUTDIR/jdmainct.o; +#text: .text%process_restart: OUTPUTDIR/jdhuff.o; +text: .text%read_restart_marker: OUTPUTDIR/jdmarker.o; +text: .text%finish_input_pass: OUTPUTDIR/jdinput.o; +# text: .text%set_bottom_pointers: OUTPUTDIR/jdmainct.o; text: .text%jFinDecompress; -text: .text%finish_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmaster.o; +text: .text%finish_output_pass: OUTPUTDIR/jdmaster.o; text: .text%sun_jpeg_term_source; text: .text%jAbort; -text: .text%free_pool: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; +text: .text%free_pool: OUTPUTDIR/jmemmgr.o; text: .text%jFreeLarge; text: .text%jFreeSmall; text: .text%jDestDecompress; text: .text%jDestroy; -text: .text%self_destruct: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jmemmgr.o; +text: .text%self_destruct: OUTPUTDIR/jmemmgr.o; text: .text%jMemTerm; -text: .text%process_data_simple_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj/jdmainct.o; +text: .text%process_data_simple_main: OUTPUTDIR/jdmainct.o; diff --git a/jdk/makefiles/mapfiles/libjpeg/reorder-sparcv9 b/jdk/makefiles/mapfiles/libjpeg/reorder-sparcv9 index 3af1a21eb80..5c01872c381 100644 --- a/jdk/makefiles/mapfiles/libjpeg/reorder-sparcv9 +++ b/jdk/makefiles/mapfiles/libjpeg/reorder-sparcv9 @@ -19,101 +19,101 @@ text: .text%jIMemMgr; text: .text%jMemInit; text: .text%jGetSmall; text: .text%jIMReader; -text: .text%alloc_small: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o; -text: .text%reset_marker_reader: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; +text: .text%alloc_small: OUTPUTDIR/jmemmgr.o; +text: .text%reset_marker_reader: OUTPUTDIR/jdmarker.o; text: .text%jIInCtlr; -text: .text%GET_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jpegdecoder.o; +text: .text%GET_ARRAYS: OUTPUTDIR/jpegdecoder.o; text: .text%jReadHeader; text: .text%jConsumeInput; -text: .text%reset_input_controller: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o; -text: .text%reset_error_mgr: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jerror.o; +text: .text%reset_input_controller: OUTPUTDIR/jdinput.o; +text: .text%reset_error_mgr: OUTPUTDIR/jerror.o; text: .text%sun_jpeg_init_source; -text: .text%consume_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o; -text: .text%read_markers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; -# text: .text%first_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; +text: .text%consume_markers: OUTPUTDIR/jdinput.o; +text: .text%read_markers: OUTPUTDIR/jdmarker.o; +# text: .text%first_marker: OUTPUTDIR/jdmarker.o; text: .text%sun_jpeg_fill_input_buffer; -text: .text%RELEASE_ARRAYS: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jpegdecoder.o; -# text: .text%get_soi: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; -text: .text%emit_message: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jerror.o; -text: .text%next_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; -text: .text%get_interesting_appn: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; -text: .text%examine_app0: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; -text: .text%skip_variable: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; +text: .text%RELEASE_ARRAYS: OUTPUTDIR/jpegdecoder.o; +# text: .text%get_soi: OUTPUTDIR/jdmarker.o; +text: .text%emit_message: OUTPUTDIR/jerror.o; +text: .text%next_marker: OUTPUTDIR/jdmarker.o; +text: .text%get_interesting_appn: OUTPUTDIR/jdmarker.o; +text: .text%examine_app0: OUTPUTDIR/jdmarker.o; +text: .text%skip_variable: OUTPUTDIR/jdmarker.o; text: .text%sun_jpeg_skip_input_data; -text: .text%examine_app14: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; -text: .text%get_dqt: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; +text: .text%examine_app14: OUTPUTDIR/jdmarker.o; +text: .text%get_dqt: OUTPUTDIR/jdmarker.o; text: .text%jAlcQTable; -text: .text%get_sof: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; -# text: .text%get_dri: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; -text: .text%get_dht: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; +text: .text%get_sof: OUTPUTDIR/jdmarker.o; +# text: .text%get_dri: OUTPUTDIR/jdmarker.o; +text: .text%get_dht: OUTPUTDIR/jdmarker.o; text: .text%jAlcHTable; -text: .text%get_sos: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; -text: .text%initial_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o; +text: .text%get_sos: OUTPUTDIR/jdmarker.o; +text: .text%initial_setup: OUTPUTDIR/jdinput.o; text: .text%jDivRound; -text: .text%default_decompress_parms: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdapimin.o; +text: .text%default_decompress_parms: OUTPUTDIR/jdapimin.o; text: .text%jHasMultScn; text: .text%jStrtDecompress; text: .text%jIDMaster; -text: .text%master_selection: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmaster.o; +text: .text%master_selection: OUTPUTDIR/jdmaster.o; text: .text%jCalcDimensions; -# text: .text%use_merged_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmaster.o; -# text: .text%prepare_range_limit_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmaster.o; +# text: .text%use_merged_upsample: OUTPUTDIR/jdmaster.o; +# text: .text%prepare_range_limit_table: OUTPUTDIR/jdmaster.o; text: .text%jIDColor; -# text: .text%build_ycc_rgb_table: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcolor.o; +# text: .text%build_ycc_rgb_table: OUTPUTDIR/jdcolor.o; text: .text%jIUpsampler; text: .text%jRound; -text: .text%alloc_sarray: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o; -text: .text%alloc_large: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o; +text: .text%alloc_sarray: OUTPUTDIR/jmemmgr.o; +text: .text%alloc_large: OUTPUTDIR/jmemmgr.o; text: .text%jGetLarge; text: .text%jIDPostC; text: .text%jIIDCT; text: .text%jIHDecoder; text: .text%jIDCoefC; text: .text%jIDMainC; -text: .text%alloc_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o; -text: .text%realize_virt_arrays: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o; -text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o; -text: .text%per_scan_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o; -text: .text%latch_quant_tables: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o; -text: .text%start_pass_huff_decoder: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdhuff.o; +text: .text%alloc_funny_pointers: OUTPUTDIR/jdmainct.o; +text: .text%realize_virt_arrays: OUTPUTDIR/jmemmgr.o; +text: .text%start_input_pass: OUTPUTDIR/jdinput.o; +text: .text%per_scan_setup: OUTPUTDIR/jdinput.o; +text: .text%latch_quant_tables: OUTPUTDIR/jdinput.o; +text: .text%start_pass_huff_decoder: OUTPUTDIR/jdhuff.o; text: .text%jMkDDerived; -text: .text%start_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcoefct.o; -# text: .text%start_iMCU_row: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcoefct.o; -text: .text%output_pass_setup: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdapistd.o; -text: .text%prepare_for_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmaster.o; -text: .text%start_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jddctmgr.o; -text: .text%start_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcoefct.o; -text: .text%start_pass_dcolor: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcolor.o; -text: .text%start_pass_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdsample.o; -text: .text%start_pass_dpost: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdpostct.o; -text: .text%start_pass_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o; -text: .text%make_funny_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o; +text: .text%start_input_pass: OUTPUTDIR/jdcoefct.o; +# text: .text%start_iMCU_row: OUTPUTDIR/jdcoefct.o; +text: .text%output_pass_setup: OUTPUTDIR/jdapistd.o; +text: .text%prepare_for_output_pass: OUTPUTDIR/jdmaster.o; +text: .text%start_pass: OUTPUTDIR/jddctmgr.o; +text: .text%start_output_pass: OUTPUTDIR/jdcoefct.o; +text: .text%start_pass_dcolor: OUTPUTDIR/jdcolor.o; +text: .text%start_pass_upsample: OUTPUTDIR/jdsample.o; +text: .text%start_pass_dpost: OUTPUTDIR/jdpostct.o; +text: .text%start_pass_main: OUTPUTDIR/jdmainct.o; +text: .text%make_funny_pointers: OUTPUTDIR/jdmainct.o; text: .text%jReadScanlines; -text: .text%process_data_context_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o; -text: .text%decompress_onepass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcoefct.o; +text: .text%process_data_context_main: OUTPUTDIR/jdmainct.o; +text: .text%decompress_onepass: OUTPUTDIR/jdcoefct.o; text: .text%jZeroFar; -text: .text%decode_mcu: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdhuff.o; +text: .text%decode_mcu: OUTPUTDIR/jdhuff.o; text: .text%jFilBitBuf; text: .text%jHufDecode; text: .text%jRDislow; -text: .text%sep_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdsample.o; -text: .text%fullsize_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdsample.o; -text: .text%h2v2_fancy_upsample: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdsample.o; -text: .text%ycc_rgb_convert: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdcolor.o; -# text: .text%set_wraparound_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o; -text: .text%process_restart: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdhuff.o; -text: .text%read_restart_marker: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmarker.o; -text: .text%finish_input_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdinput.o; -# text: .text%set_bottom_pointers: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o; +text: .text%sep_upsample: OUTPUTDIR/jdsample.o; +text: .text%fullsize_upsample: OUTPUTDIR/jdsample.o; +text: .text%h2v2_fancy_upsample: OUTPUTDIR/jdsample.o; +text: .text%ycc_rgb_convert: OUTPUTDIR/jdcolor.o; +# text: .text%set_wraparound_pointers: OUTPUTDIR/jdmainct.o; +text: .text%process_restart: OUTPUTDIR/jdhuff.o; +text: .text%read_restart_marker: OUTPUTDIR/jdmarker.o; +text: .text%finish_input_pass: OUTPUTDIR/jdinput.o; +# text: .text%set_bottom_pointers: OUTPUTDIR/jdmainct.o; text: .text%jFinDecompress; -text: .text%finish_output_pass: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmaster.o; +text: .text%finish_output_pass: OUTPUTDIR/jdmaster.o; text: .text%sun_jpeg_term_source; text: .text%jAbort; -text: .text%free_pool: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o; +text: .text%free_pool: OUTPUTDIR/jmemmgr.o; text: .text%jFreeLarge; text: .text%jFreeSmall; text: .text%jDestDecompress; text: .text%jDestroy; -text: .text%self_destruct: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jmemmgr.o; +text: .text%self_destruct: OUTPUTDIR/jmemmgr.o; text: .text%jMemTerm; -text: .text%process_data_simple_main: OUTPUTDIR/tmp/sun/sun.awt/jpeg/obj64/jdmainct.o; +text: .text%process_data_simple_main: OUTPUTDIR/jdmainct.o; diff --git a/jdk/makefiles/javax/sound/mapfile-vers b/jdk/makefiles/mapfiles/libjsound/mapfile-vers similarity index 100% rename from jdk/makefiles/javax/sound/mapfile-vers rename to jdk/makefiles/mapfiles/libjsound/mapfile-vers diff --git a/jdk/makefiles/javax/sound/jsoundalsa/mapfile-vers b/jdk/makefiles/mapfiles/libjsoundalsa/mapfile-vers similarity index 100% rename from jdk/makefiles/javax/sound/jsoundalsa/mapfile-vers rename to jdk/makefiles/mapfiles/libjsoundalsa/mapfile-vers diff --git a/jdk/makefiles/sun/cmm/kcms/mapfile-vers b/jdk/makefiles/mapfiles/libkcms/mapfile-vers similarity index 100% rename from jdk/makefiles/sun/cmm/kcms/mapfile-vers rename to jdk/makefiles/mapfiles/libkcms/mapfile-vers diff --git a/jdk/makefiles/java/management/mapfile-vers b/jdk/makefiles/mapfiles/libmanagement/mapfile-vers similarity index 100% rename from jdk/makefiles/java/management/mapfile-vers rename to jdk/makefiles/mapfiles/libmanagement/mapfile-vers diff --git a/jdk/makefiles/sun/image/generic/mapfile-vers b/jdk/makefiles/mapfiles/libmlib_image/mapfile-vers similarity index 100% rename from jdk/makefiles/sun/image/generic/mapfile-vers rename to jdk/makefiles/mapfiles/libmlib_image/mapfile-vers diff --git a/jdk/makefiles/java/net/mapfile-vers b/jdk/makefiles/mapfiles/libnet/mapfile-vers similarity index 100% rename from jdk/makefiles/java/net/mapfile-vers rename to jdk/makefiles/mapfiles/libnet/mapfile-vers diff --git a/jdk/makefiles/java/nio/mapfile-bsd b/jdk/makefiles/mapfiles/libnio/mapfile-bsd similarity index 100% rename from jdk/makefiles/java/nio/mapfile-bsd rename to jdk/makefiles/mapfiles/libnio/mapfile-bsd diff --git a/jdk/makefiles/java/nio/mapfile-linux b/jdk/makefiles/mapfiles/libnio/mapfile-linux similarity index 100% rename from jdk/makefiles/java/nio/mapfile-linux rename to jdk/makefiles/mapfiles/libnio/mapfile-linux diff --git a/jdk/makefiles/java/nio/mapfile-solaris b/jdk/makefiles/mapfiles/libnio/mapfile-solaris similarity index 100% rename from jdk/makefiles/java/nio/mapfile-solaris rename to jdk/makefiles/mapfiles/libnio/mapfile-solaris diff --git a/jdk/makefiles/java/nio/reorder-i586 b/jdk/makefiles/mapfiles/libnio/reorder-i586 similarity index 100% rename from jdk/makefiles/java/nio/reorder-i586 rename to jdk/makefiles/mapfiles/libnio/reorder-i586 diff --git a/jdk/makefiles/java/nio/reorder-sparc b/jdk/makefiles/mapfiles/libnio/reorder-sparc similarity index 100% rename from jdk/makefiles/java/nio/reorder-sparc rename to jdk/makefiles/mapfiles/libnio/reorder-sparc diff --git a/jdk/makefiles/java/nio/reorder-sparcv9 b/jdk/makefiles/mapfiles/libnio/reorder-sparcv9 similarity index 100% rename from jdk/makefiles/java/nio/reorder-sparcv9 rename to jdk/makefiles/mapfiles/libnio/reorder-sparcv9 diff --git a/jdk/makefiles/java/npt/mapfile-vers b/jdk/makefiles/mapfiles/libnpt/mapfile-vers similarity index 100% rename from jdk/makefiles/java/npt/mapfile-vers rename to jdk/makefiles/mapfiles/libnpt/mapfile-vers diff --git a/jdk/makefiles/sun/splashscreen/mapfile-vers b/jdk/makefiles/mapfiles/libsplashscreen/mapfile-vers similarity index 100% rename from jdk/makefiles/sun/splashscreen/mapfile-vers rename to jdk/makefiles/mapfiles/libsplashscreen/mapfile-vers diff --git a/jdk/makefiles/sun/security/ec/mapfile-vers b/jdk/makefiles/mapfiles/libsunec/mapfile-vers similarity index 100% rename from jdk/makefiles/sun/security/ec/mapfile-vers rename to jdk/makefiles/mapfiles/libsunec/mapfile-vers diff --git a/jdk/makefiles/mapfiles/libverify/reorder-i586 b/jdk/makefiles/mapfiles/libverify/reorder-i586 index 56ee8e378d7..72f02543150 100644 --- a/jdk/makefiles/mapfiles/libverify/reorder-i586 +++ b/jdk/makefiles/mapfiles/libverify/reorder-i586 @@ -3,38 +3,38 @@ text = LOAD ?RXO; # Test Null text: .text%VerifyFixClassname; text: .text%VerifyClassname; -text: .text%skip_over_fieldname: OUTPUTDIR/tmp/java/verify/obj/check_format.o; -text: .text%skip_over_field_signature: OUTPUTDIR/tmp/java/verify/obj/check_format.o; +text: .text%skip_over_fieldname: OUTPUTDIR/check_format.o; +text: .text%skip_over_field_signature: OUTPUTDIR/check_format.o; text: .text%VerifyClass; -text: .text%make_class_info_from_name: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%class_name_to_ID: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%make_class_info: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%free_block: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%verify_method: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%verify_opcode_operands: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%initialize_dataflow: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%signature_to_fieldtype: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%check_register_values: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%pop_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%update_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%push_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_into_successors: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%set_protected: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_into_one_successor: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o; +text: .text%make_class_info_from_name: OUTPUTDIR/check_code.o; +text: .text%class_name_to_ID: OUTPUTDIR/check_code.o; +text: .text%make_class_info: OUTPUTDIR/check_code.o; +text: .text%free_block: OUTPUTDIR/check_code.o; +text: .text%verify_method: OUTPUTDIR/check_code.o; +text: .text%verify_opcode_operands: OUTPUTDIR/check_code.o; +text: .text%initialize_dataflow: OUTPUTDIR/check_code.o; +text: .text%signature_to_fieldtype: OUTPUTDIR/check_code.o; +text: .text%check_register_values: OUTPUTDIR/check_code.o; +text: .text%pop_stack: OUTPUTDIR/check_code.o; +text: .text%update_registers: OUTPUTDIR/check_code.o; +text: .text%push_stack: OUTPUTDIR/check_code.o; +text: .text%merge_into_successors: OUTPUTDIR/check_code.o; +text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/check_code.o; +text: .text%set_protected: OUTPUTDIR/check_code.o; +text: .text%merge_into_one_successor: OUTPUTDIR/check_code.o; +text: .text%merge_registers: OUTPUTDIR/check_code.o; # Test Exit # Test Hello -text: .text%merge_fullinfo_types: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%isAssignableTo: OUTPUTDIR/tmp/java/verify/obj/check_code.o; +text: .text%merge_fullinfo_types: OUTPUTDIR/check_code.o; +text: .text%isAssignableTo: OUTPUTDIR/check_code.o; # Test Sleep -text: .text%isLegalTarget: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%verify_constant_pool_type: OUTPUTDIR/tmp/java/verify/obj/check_code.o; +text: .text%isLegalTarget: OUTPUTDIR/check_code.o; +text: .text%verify_constant_pool_type: OUTPUTDIR/check_code.o; # Test IntToString # Test LoadToolkit # Test LoadFrame # Test LoadJFrame # Test JHello # SwingSet -text: .text%copy_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%ntohl: OUTPUTDIR/tmp/java/verify/obj/check_code.o; +text: .text%copy_stack: OUTPUTDIR/check_code.o; +text: .text%ntohl: OUTPUTDIR/check_code.o; diff --git a/jdk/makefiles/mapfiles/libverify/reorder-sparc b/jdk/makefiles/mapfiles/libverify/reorder-sparc index 17e13469dcd..58056cfe1a6 100644 --- a/jdk/makefiles/mapfiles/libverify/reorder-sparc +++ b/jdk/makefiles/mapfiles/libverify/reorder-sparc @@ -3,42 +3,42 @@ text = LOAD ?RXO; # Test Null text: .text%VerifyFixClassname; text: .text%VerifyClassname; -text: .text%skip_over_fieldname: OUTPUTDIR/tmp/java/verify/obj/check_format.o; +text: .text%skip_over_fieldname: OUTPUTDIR/check_format.o; text: .text%VerifyClass; -text: .text%CCinit: OUTPUTDIR/tmp/java/verify/obj/check_code.o; +text: .text%CCinit: OUTPUTDIR/check_code.o; text: .text%initialize_class_hash; -text: .text%make_class_info_from_name: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%make_class_info: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%verify_method: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%instruction_length: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%verify_opcode_operands: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%initialize_exception_table: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%initialize_dataflow: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%signature_to_fieldtype: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%check_register_values: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%pop_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%update_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%push_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_into_successors: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%pop_and_free: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%set_protected: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_into_one_successor: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_stack: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%merge_registers: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%finalize_class_hash: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%CCdestroy: OUTPUTDIR/tmp/java/verify/obj/check_code.o; +text: .text%make_class_info_from_name: OUTPUTDIR/check_code.o; +text: .text%make_class_info: OUTPUTDIR/check_code.o; +text: .text%verify_method: OUTPUTDIR/check_code.o; +text: .text%instruction_length: OUTPUTDIR/check_code.o; +text: .text%verify_opcode_operands: OUTPUTDIR/check_code.o; +text: .text%initialize_exception_table: OUTPUTDIR/check_code.o; +text: .text%initialize_dataflow: OUTPUTDIR/check_code.o; +text: .text%signature_to_fieldtype: OUTPUTDIR/check_code.o; +text: .text%check_register_values: OUTPUTDIR/check_code.o; +text: .text%pop_stack: OUTPUTDIR/check_code.o; +text: .text%update_registers: OUTPUTDIR/check_code.o; +text: .text%push_stack: OUTPUTDIR/check_code.o; +text: .text%merge_into_successors: OUTPUTDIR/check_code.o; +text: .text%pop_and_free: OUTPUTDIR/check_code.o; +text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/check_code.o; +text: .text%set_protected: OUTPUTDIR/check_code.o; +text: .text%merge_into_one_successor: OUTPUTDIR/check_code.o; +text: .text%merge_stack: OUTPUTDIR/check_code.o; +text: .text%merge_registers: OUTPUTDIR/check_code.o; +text: .text%finalize_class_hash: OUTPUTDIR/check_code.o; +text: .text%CCdestroy: OUTPUTDIR/check_code.o; # Test Exit # Test Hello -text: .text%merge_fullinfo_types: OUTPUTDIR/tmp/java/verify/obj/check_code.o; +text: .text%merge_fullinfo_types: OUTPUTDIR/check_code.o; # Test Sleep # Test IntToString # Test LoadToolkit # Test LoadFrame -text: .text%verify_constant_pool_type: OUTPUTDIR/tmp/java/verify/obj/check_code.o; +text: .text%verify_constant_pool_type: OUTPUTDIR/check_code.o; # Test LoadJFrame # Test JHello # SwingSet -text: .text%verify_field: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%check_and_push: OUTPUTDIR/tmp/java/verify/obj/check_code.o; -text: .text%signature_to_args_size: OUTPUTDIR/tmp/java/verify/obj/check_code.o; +text: .text%verify_field: OUTPUTDIR/check_code.o; +text: .text%check_and_push: OUTPUTDIR/check_code.o; +text: .text%signature_to_args_size: OUTPUTDIR/check_code.o; diff --git a/jdk/makefiles/mapfiles/libverify/reorder-sparcv9 b/jdk/makefiles/mapfiles/libverify/reorder-sparcv9 index 1f58d56cda3..c0185f66769 100644 --- a/jdk/makefiles/mapfiles/libverify/reorder-sparcv9 +++ b/jdk/makefiles/mapfiles/libverify/reorder-sparcv9 @@ -2,36 +2,36 @@ data = R0x2000; text = LOAD ?RXO; # Test Null text: .text%VerifyFixClassname; -text: .text%next_utf2unicode: OUTPUTDIR/tmp/java/verify/obj64/check_format.o; +text: .text%next_utf2unicode: OUTPUTDIR/check_format.o; text: .text%VerifyClassname; -text: .text%skip_over_fieldname: OUTPUTDIR/tmp/java/verify/obj64/check_format.o; +text: .text%skip_over_fieldname: OUTPUTDIR/check_format.o; text: .text%VerifyClass; -text: .text%CCinit: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; +text: .text%CCinit: OUTPUTDIR/check_code.o; text: .text%initialize_class_hash; -text: .text%make_class_info_from_name: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%make_class_info: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%verify_method: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%instruction_length: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%verify_opcode_operands: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%verify_constant_pool_type: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%check_and_push: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%pop_and_free: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%set_protected: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%initialize_exception_table: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%merge_fullinfo_types: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%initialize_dataflow: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%signature_to_fieldtype: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%check_register_values: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%pop_stack: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%update_registers: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%push_stack: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%merge_into_successors: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%merge_into_one_successor: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%merge_stack: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%merge_registers: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%finalize_class_hash: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%CCdestroy: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; +text: .text%make_class_info_from_name: OUTPUTDIR/check_code.o; +text: .text%make_class_info: OUTPUTDIR/check_code.o; +text: .text%verify_method: OUTPUTDIR/check_code.o; +text: .text%instruction_length: OUTPUTDIR/check_code.o; +text: .text%verify_opcode_operands: OUTPUTDIR/check_code.o; +text: .text%verify_constant_pool_type: OUTPUTDIR/check_code.o; +text: .text%cp_index_to_class_fullinfo: OUTPUTDIR/check_code.o; +text: .text%check_and_push: OUTPUTDIR/check_code.o; +text: .text%pop_and_free: OUTPUTDIR/check_code.o; +text: .text%set_protected: OUTPUTDIR/check_code.o; +text: .text%initialize_exception_table: OUTPUTDIR/check_code.o; +text: .text%merge_fullinfo_types: OUTPUTDIR/check_code.o; +text: .text%initialize_dataflow: OUTPUTDIR/check_code.o; +text: .text%signature_to_fieldtype: OUTPUTDIR/check_code.o; +text: .text%check_register_values: OUTPUTDIR/check_code.o; +text: .text%pop_stack: OUTPUTDIR/check_code.o; +text: .text%update_registers: OUTPUTDIR/check_code.o; +text: .text%push_stack: OUTPUTDIR/check_code.o; +text: .text%merge_into_successors: OUTPUTDIR/check_code.o; +text: .text%merge_into_one_successor: OUTPUTDIR/check_code.o; +text: .text%merge_stack: OUTPUTDIR/check_code.o; +text: .text%merge_registers: OUTPUTDIR/check_code.o; +text: .text%finalize_class_hash: OUTPUTDIR/check_code.o; +text: .text%CCdestroy: OUTPUTDIR/check_code.o; # Test Exit # Test Hello # Test Sleep @@ -41,5 +41,5 @@ text: .text%CCdestroy: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; # Test LoadJFrame # Test JHello # SwingSet -text: .text%verify_field: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; -text: .text%signature_to_args_size: OUTPUTDIR/tmp/java/verify/obj64/check_code.o; +text: .text%verify_field: OUTPUTDIR/check_code.o; +text: .text%signature_to_args_size: OUTPUTDIR/check_code.o; diff --git a/jdk/makefiles/mapfiles/libzip/reorder-i586 b/jdk/makefiles/mapfiles/libzip/reorder-i586 index ee717ff2f26..16bc0de9367 100644 --- a/jdk/makefiles/mapfiles/libzip/reorder-i586 +++ b/jdk/makefiles/mapfiles/libzip/reorder-i586 @@ -5,15 +5,15 @@ text: .text%ZIP_Open; text: .text%ZIP_Open_Generic; text: .text%InitializeZip; text: .text%allocZip; -text: .text%readCEN: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o; -text: .text%findEND: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o; -text: .text%hash: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o; -text: .text%isMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o; -text: .text%addMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o; +text: .text%readCEN: OUTPUTDIR/zip_util.o; +text: .text%findEND: OUTPUTDIR/zip_util.o; +text: .text%hash: OUTPUTDIR/zip_util.o; +text: .text%isMetaName: OUTPUTDIR/zip_util.o; +text: .text%addMetaName: OUTPUTDIR/zip_util.o; text: .text%ZIP_FindEntry; text: .text%ZIP_GetEntry; text: .text%ZIP_Lock; -text: .text%readLOC: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o; +text: .text%readLOC: OUTPUTDIR/zip_util.o; text: .text%ZIP_Unlock; text: .text%ZIP_FreeEntry; text: .text%Java_java_util_zip_ZipFile_initIDs; @@ -37,7 +37,7 @@ text: .text%Java_java_util_zip_Inflater_inflateBytes; text: .text%inflate; text: .text%Java_java_util_zip_ZipFile_read; text: .text%ZIP_Read; -text: .text%huft_build: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/inftrees.o; +text: .text%huft_build: OUTPUTDIR/inftrees.o; text: .text%zcfree; text: .text%Java_java_util_jar_JarFile_getMetaInfEntryNames; text: .text%ZIP_ReadEntry; diff --git a/jdk/makefiles/mapfiles/libzip/reorder-sparc b/jdk/makefiles/mapfiles/libzip/reorder-sparc index 176c7709e49..df4ea6db1f7 100644 --- a/jdk/makefiles/mapfiles/libzip/reorder-sparc +++ b/jdk/makefiles/mapfiles/libzip/reorder-sparc @@ -5,11 +5,11 @@ text: .text%ZIP_Open; text: .text%ZIP_Open_Generic; text: .text%InitializeZip; text: .text%allocZip; -text: .text%readCEN: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o; -text: .text%findEND: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o; -text: .text%hash: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o; -text: .text%isMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o; -text: .text%addMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj/zip_util.o; +text: .text%readCEN: OUTPUTDIR/zip_util.o; +text: .text%findEND: OUTPUTDIR/zip_util.o; +text: .text%hash: OUTPUTDIR/zip_util.o; +text: .text%isMetaName: OUTPUTDIR/zip_util.o; +text: .text%addMetaName: OUTPUTDIR/zip_util.o; text: .text%ZIP_FindEntry; text: .text%ZIP_GetEntry; text: .text%ZIP_Lock; diff --git a/jdk/makefiles/mapfiles/libzip/reorder-sparcv9 b/jdk/makefiles/mapfiles/libzip/reorder-sparcv9 index bf2d983ed19..f5c24f29fd2 100644 --- a/jdk/makefiles/mapfiles/libzip/reorder-sparcv9 +++ b/jdk/makefiles/mapfiles/libzip/reorder-sparcv9 @@ -4,15 +4,15 @@ text: .text%ZIP_Open; text: .text%ZIP_Open_Generic; text: .text%InitializeZip; text: .text%allocZip; -text: .text%readCEN: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o; -text: .text%findEND: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o; -text: .text%hash: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o; -text: .text%isMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o; -text: .text%addMetaName: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o; +text: .text%readCEN: OUTPUTDIR/zip_util.o; +text: .text%findEND: OUTPUTDIR/zip_util.o; +text: .text%hash: OUTPUTDIR/zip_util.o; +text: .text%isMetaName: OUTPUTDIR/zip_util.o; +text: .text%addMetaName: OUTPUTDIR/zip_util.o; text: .text%ZIP_FindEntry; text: .text%ZIP_GetEntry; text: .text%ZIP_Lock; -text: .text%readLOC: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/zip_util.o; +text: .text%readLOC: OUTPUTDIR/zip_util.o; text: .text%ZIP_Unlock; text: .text%ZIP_FreeEntry; text: .text%Java_java_util_zip_ZipFile_initIDs; @@ -36,7 +36,7 @@ text: .text%Java_java_util_zip_Inflater_inflateBytes; text: .text%inflate; text: .text%Java_java_util_zip_ZipFile_read; text: .text%ZIP_Read; -text: .text%huft_build: OUTPUTDIR/tmp/sun/java.util.zip/zip/obj64/inftrees.o; +text: .text%huft_build: OUTPUTDIR/inftrees.o; text: .text%zcfree; text: .text%Java_java_util_jar_JarFile_getMetaInfEntryNames; text: .text%ZIP_ReadEntry; diff --git a/jdk/makefiles/java/nio/addNotices.sh b/jdk/makefiles/scripts/addNotices.sh similarity index 100% rename from jdk/makefiles/java/nio/addNotices.sh rename to jdk/makefiles/scripts/addNotices.sh diff --git a/jdk/makefiles/java/nio/genCharsetProvider.sh b/jdk/makefiles/scripts/genCharsetProvider.sh similarity index 98% rename from jdk/makefiles/java/nio/genCharsetProvider.sh rename to jdk/makefiles/scripts/genCharsetProvider.sh index 1b0fe1aac57..ca7a2dad85f 100644 --- a/jdk/makefiles/java/nio/genCharsetProvider.sh +++ b/jdk/makefiles/scripts/genCharsetProvider.sh @@ -48,7 +48,7 @@ echo '-->' $OUT # Header # -$SH ./addNotices.sh "$COPYRIGHT_YEARS" > $OUT +$SH ${SCRIPTS}/addNotices.sh "$COPYRIGHT_YEARS" > $OUT cat <<__END__ >>$OUT diff --git a/jdk/makefiles/java/nio/genExceptions.sh b/jdk/makefiles/scripts/genExceptions.sh similarity index 97% rename from jdk/makefiles/java/nio/genExceptions.sh rename to jdk/makefiles/scripts/genExceptions.sh index 9839282bdd2..b3f653d7f7e 100644 --- a/jdk/makefiles/java/nio/genExceptions.sh +++ b/jdk/makefiles/scripts/genExceptions.sh @@ -41,7 +41,7 @@ gen() { echo '-->' $DST/$ID.java out=$DST/${ID}.java - $SH ./addNotices.sh "$COPYRIGHT_YEARS" > $out + $SH ${SCRIPTS}/addNotices.sh "$COPYRIGHT_YEARS" > $out cat >>$out <<__END__ diff --git a/jdk/makefiles/java/java/localelist.sh b/jdk/makefiles/scripts/localelist.sh similarity index 100% rename from jdk/makefiles/java/java/localelist.sh rename to jdk/makefiles/scripts/localelist.sh diff --git a/jdk/makefiles/sun/Makefile b/jdk/makefiles/sun/Makefile deleted file mode 100644 index fc4ea995515..00000000000 --- a/jdk/makefiles/sun/Makefile +++ /dev/null @@ -1,98 +0,0 @@ -# -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building all of sun tools -# - -BUILDDIR = .. -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# Rhino/Mozilla java sources -ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,) -ifneq ("$(ORG_EXISTS)", "") - ORG_SUBDIR = org -endif - -# Non windows subdirs -ifneq ($(PLATFORM), windows) - ifndef OPENJDK - ifeq ($(PLATFORM), solaris) - ifneq ($(ARCH), amd64) - # Solaris 11 does not have support for new compilation of DGA code. - OS_VERSION = $(shell uname -r) - OS_MAJOR_VERSION := $(call MajorVersion,$(OS_VERSION)) - OS_MINOR_VERSION := $(call MinorVersion,$(OS_VERSION)) - ifeq ($(shell $(EXPR) $(OS_MAJOR_VERSION) == 5), 1) - ifeq ($(shell $(EXPR) $(OS_MINOR_VERSION) \<= 10), 1) - DGA_SUBDIR = jdga - endif - endif - endif - endif - endif - HEADLESS_SUBDIR = headless - XAWT_SUBDIR = xawt -endif - -ifeq ($(PLATFORM), macosx) - LWAWT_PRE_SUBDIR = osxapp - LWAWT_SUBDIR = lwawt -endif - -ifndef OPENJDK -ifneq ($(PLATFORM), macosx) - JDBC_SUBDIR = jdbc -endif -endif - -ifdef OPENJDK -else - RENDER_SUBDIR = dcpr -endif - -# nio need to be compiled before awt to have all charsets ready -SUBDIRS = security javazic nio - -ifdef BUILD_HEADLESS_ONLY - DISPLAY_LIBS = awt $(HEADLESS_SUBDIR) - DISPLAY_TOOLS = -else - DISPLAY_LIBS = awt splashscreen $(XAWT_SUBDIR) $(HEADLESS_SUBDIR) - DISPLAY_TOOLS = -endif -SUBDIRS_desktop = $(RENDER_SUBDIR) image \ - $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR)\ - cmm $(DISPLAY_TOOLS) -SUBDIRS_management = -SUBDIRS_misc = $(ORG_SUBDIR) $(JDBC_SUBDIR) -SUBDIRS_tools = - -include $(BUILDDIR)/common/Subdirs.gmk - -all build clean clobber:: - $(SUBDIRS-loop) - diff --git a/jdk/makefiles/sun/awt/CondenseRules.awk b/jdk/makefiles/sun/awt/CondenseRules.awk deleted file mode 100644 index 89cfd6841b9..00000000000 --- a/jdk/makefiles/sun/awt/CondenseRules.awk +++ /dev/null @@ -1,21 +0,0 @@ -BEGIN { - previous=""; - prefix=""; - ORS=""; - OFS=""; -} -{ - if ($1 != previous) { - if (previous != "") { - print "\n\n"; - } - previous = $1; - print $1; - prefix="\t"; - } - print prefix $2; - prefix=" "; -} -END { - print "\n"; -} diff --git a/jdk/makefiles/sun/awt/Depend.mak b/jdk/makefiles/sun/awt/Depend.mak deleted file mode 100644 index 95e56154914..00000000000 --- a/jdk/makefiles/sun/awt/Depend.mak +++ /dev/null @@ -1,163 +0,0 @@ -# -# This makefile must be executed on a system with makedepend, such as Solaris. -# In my copious amount of spare time, I hope to write a Java-based makedepend -# to eliminate this dependency (no pun intended). TB - -BUILD_DIR = ../.. -TOPDIR = ../../.. - -STUBDIR = WindowsSystemHeaderStubs -BUILDSTUBDIR = BuildStubs - -SHARE_SRC = $(TOPDIR)/src/share -SUN_SRC = $(SHARE_SRC)/native/sun -COMP_SRC = $(SUN_SRC)/awt/alphacomposite -DEBUG_SRC = $(SUN_SRC)/awt/debug -IMG_SRC = $(SUN_SRC)/awt/image -MEDIA_SRC = $(SUN_SRC)/awt/medialib -J2D_SRC = $(SUN_SRC)/java2d -J2D_FONT_SRC = $(SUN_SRC)/font -J2D_WINDOWS_SRC = $(WINDOWS_SRC)/native/sun/java2d -AWT_WINDOWS_SRC = $(WINDOWS_SRC)/native/sun/awt -LOOP_SRC = $(SUN_SRC)/java2d/loops -PIPE_SRC = $(SUN_SRC)/java2d/pipe -WINDOWS_SRC = $(TOPDIR)/src/windows -SRC = $(WINDOWS_SRC)/native/sun/windows - -# ensure consistent sort order -LC_ALL:= C - -SRCDIRS = \ - $(COMP_SRC) \ - $(DEBUG_SRC) \ - $(IMG_SRC) \ - $(IMG_SRC)/cvutils \ - $(IMG_SRC)/gif \ - $(MEDIA_SRC) \ - $(J2D_SRC) \ - $(J2D_FONT_SRC) \ - $(J2D_SRC)/opengl \ - $(J2D_WINDOWS_SRC)/windows \ - $(J2D_WINDOWS_SRC)/d3d \ - $(J2D_WINDOWS_SRC)/opengl \ - $(LOOP_SRC) \ - $(PIPE_SRC) \ - $(SRC) - -INCLUDES = \ - -I$(STUBDIR) \ - -I$(BUILDSTUBDIR) \ - -I$(SHARE_SRC)/javavm/export \ - -I$(WINDOWS_SRC)/javavm/export \ - -I$(SHARE_SRC)/native/common \ - -I$(WINDOWS_SRC)/native/common \ - -I$(SUN_SRC)/dc/doe \ - -I$(SUN_SRC)/dc/path \ - -I$(COMP_SRC) \ - -I$(DEBUG_SRC) \ - -I$(IMG_SRC) \ - -I$(IMG_SRC)/cvutils \ - -I$(MEDIA_SRC) \ - -I$(J2D_SRC) \ - -I$(J2D_FONT_SRC) \ - -I$(J2D_SRC)/opengl \ - -I$(J2D_WINDOWS_SRC) \ - -I$(J2D_WINDOWS_SRC)/windows \ - -I$(J2D_WINDOWS_SRC)/d3d \ - -I$(J2D_WINDOWS_SRC)/opengl \ - -I$(AWT_WINDOWS_SRC) \ - -I$(LOOP_SRC) \ - -I$(PIPE_SRC) \ - -I$(SRC) - -STUBFILES = \ - $(STUBDIR)/ddraw.h \ - $(STUBDIR)/d3d.h \ - $(STUBDIR)/d3d9.h \ - $(STUBDIR)/Ole2.h \ - $(STUBDIR)/Zmouse.h \ - $(STUBDIR)/cderr.h \ - $(STUBDIR)/comdef.h \ - $(STUBDIR)/commctrl.h \ - $(STUBDIR)/commdlg.h \ - $(STUBDIR)/comutil.h \ - $(STUBDIR)/direct.h \ - $(STUBDIR)/d3dcom.h \ - $(STUBDIR)/imm.h \ - $(STUBDIR)/ime.h \ - $(STUBDIR)/io.h \ - $(STUBDIR)/map \ - $(STUBDIR)/mmsystem.h \ - $(STUBDIR)/new.h \ - $(STUBDIR)/new \ - $(STUBDIR)/ole2.h \ - $(STUBDIR)/process.h \ - $(STUBDIR)/richole.h \ - $(STUBDIR)/richedit.h \ - $(STUBDIR)/shellapi.h \ - $(STUBDIR)/shlwapi.h \ - $(STUBDIR)/shlobj.h \ - $(STUBDIR)/tchar.h \ - $(STUBDIR)/winbase.h \ - $(STUBDIR)/windef.h \ - $(STUBDIR)/windows.h \ - $(STUBDIR)/Windows.h \ - $(STUBDIR)/windowsx.h \ - $(STUBDIR)/winspool.h \ - $(STUBDIR)/winuser.h \ - $(STUBDIR)/wtypes.h \ - $(STUBDIR)/zmouse.h \ - -EXTRAFILES_c = \ - img_colors.c - -default: dependencies - -include FILES_c_windows.gmk - -dependencies: - rm -rf make.depend - rm -rf make.tmp make.tmp2 make.tmp.bak - rm -rf $(STUBDIR) $(BUILDSTUBDIR) depend.filelist - for file in $(FILES_c) $(FILES_cpp) $(EXTRAFILES_c); do \ - for dir in $(SRCDIRS); do \ - if [ -f $$dir/$$file ]; then \ - echo $$dir/$$file >>depend.filelist; \ - fi; \ - if [ -f $$dir/$${file}pp ]; then \ - echo $$dir/$${file}pp >>depend.filelist; \ - fi; \ - done; \ - done - touch make.tmp - mkdir $(STUBDIR) - touch $(STUBFILES) - mkdir $(BUILDSTUBDIR) - gnumake -f Depend.mak classhdrstubs - touch $(BUILDSTUBDIR)/awt_colors.h - cat depend.filelist | xargs -n 100 makedepend \ - -DWIN32 -D_X86X -Dx86 -DDEBUG -D_MSC_VER -DMLIB_NO_LIBSUNMATH \ - -DUNICODE -D_UNICODE \ - -a -f make.tmp -o.obj $(INCLUDES) - fgrep .obj make.tmp | sed -f Depend.sed | sort -f -u | nawk -f CondenseRules.awk > make.depend - rm -rf make.tmp make.tmp2 make.tmp.bak - rm -rf $(STUBDIR) $(BUILDSTUBDIR) depend.filelist - - -include FILES_export_windows.gmk - -EXTRAFILES_java = \ - sun/java2d/opengl/OGLContext/OGLContextCaps.java \ - sun/java2d/d3d/D3DPaints/MultiGradient.java \ - sun/java2d/d3d/D3DContext/D3DContextCaps.java \ - java/lang/Integer.java - -FILES_java = $(FILES_export) $(FILES_export2) $(FILES_export3) \ - $(EXTRAFILES_java) - -classhdrstubs: - for file in `echo $(FILES_java) | \ - tr ' ' '\n' | \ - sed -e 'y/\//_/' -e 's/\.java/.h/'`; do \ - echo "#include " > $(BUILDSTUBDIR)/$$file; \ - done diff --git a/jdk/makefiles/sun/awt/Depend.sed b/jdk/makefiles/sun/awt/Depend.sed deleted file mode 100644 index 00a4bdd19e1..00000000000 --- a/jdk/makefiles/sun/awt/Depend.sed +++ /dev/null @@ -1,32 +0,0 @@ -# Unqualify std headers -# remove headers with no extension as well (e.g. C++ 94 STL headers) - robi -# s/ \/usr\/include[^ ]*\.h//g -s/ \/usr\/include[^ ]*//g - -# Unqualify std Windows headers -# remove headers with no extension as well (e.g. C++ 94 STL headers) - robi -# s/ WindowsSystemHeaderStubs[^ ]*\.h//g -s/ WindowsSystemHeaderStubs[^ ]*//g - -# #################################### -# Rules to allow for generation of dependencies on an unbuilt tree... -# -# BuildStubs is populated with stubs for include files that are -# generated by the build and then dependencies are adjusted here -# -# Adjust awt_colors.h -# Change BuildStubs to . -s/ BuildStubs\/awt_colors.h/ $(OBJDIR)\/awt_colors.h/g -# -# Adjust CClassHeaders -# Change BuildStubs to CClassHeaders -s/ BuildStubs/ $(CLASSHDRDIR)/g -# -# End of unbuilt tree adjustments -# #################################### - -# Remove any empty rules -/:[ ]*$/d - -# Change .obj path from src to proper awt/obj or awt/obj_g directory -s/^.*\/\(.*:\)/$(OBJDIR)\/\1:/ diff --git a/jdk/makefiles/sun/awt/FILES_c_macosx.gmk b/jdk/makefiles/sun/awt/FILES_c_macosx.gmk deleted file mode 100644 index adf5a9a5f0b..00000000000 --- a/jdk/makefiles/sun/awt/FILES_c_macosx.gmk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_AWT_objc = \ - $(TARGDIR)MacOSXResourceBundle.m - diff --git a/jdk/makefiles/sun/awt/FILES_c_unix.gmk b/jdk/makefiles/sun/awt/FILES_c_unix.gmk deleted file mode 100644 index 55a387e69f6..00000000000 --- a/jdk/makefiles/sun/awt/FILES_c_unix.gmk +++ /dev/null @@ -1,173 +0,0 @@ -# -# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# The debug_* files included here aren't for 2D specifically but they -# have no X dependency. - -FILES_2D_vis = \ - vis_FuncArray.c \ - java2d_Mlib.c \ - mlib_ImageCreate.c \ - mlib_ImageZoom_NN.c \ - mlib_ImageCopy_Bit.c \ - mlib_sys.c \ - mlib_v_ImageClear.c \ - mlib_v_ImageClear_f.c \ - mlib_v_ImageConstXor.c \ - mlib_v_ImageCopy.c \ - mlib_v_ImageCopy_f.c \ - mlib_v_ImageXor.c \ - mlib_v_ImageZoom_NN_f.c \ - vis_Interp.c \ - vis_AlphaMacros.c \ - vis_AlphaMaskBlit.c \ - vis_AlphaMaskFill.c \ - vis_ByteGray.c \ - vis_ByteGray_FromRgb.c \ - vis_ByteGray_Mask.c \ - vis_ByteIndexed.c \ - vis_DrawLine.c \ - vis_FourByteAbgr.c \ - vis_IntArgb.c \ - vis_IntArgbPre.c \ - vis_IntArgbPre_Mask.c \ - vis_IntBgr.c \ - vis_IntRgb.c \ - vis_IntRgbx.c \ - vis_SrcMaskFill.c \ - vis_SrcOverMaskBlit.c \ - vis_SrcOverMaskFill.c \ - vis_FourByteAbgrPre.c \ - vis_GlyphList.c \ - vis_GlyphListXor.c \ - vis_IntArgbBm.c \ - vis_ThreeByteBgr.c \ - vis_UshortGray.c \ - vis_UshortGray_FromRgb.c \ - vis_XorBlit.c - -FILES_2D_c = \ - gifdecoder.c \ - imageInitIDs.c \ - img_colors.c \ - img_globals.c \ - SurfaceData.c \ - Region.c \ - BufImgSurfaceData.c \ - Disposer.c \ - Trace.c \ - GraphicsPrimitiveMgr.c \ - Blit.c \ - BlitBg.c \ - ScaledBlit.c \ - FillRect.c \ - FillSpans.c \ - FillParallelogram.c \ - DrawParallelogram.c \ - DrawLine.c \ - DrawRect.c \ - DrawPolygons.c \ - DrawPath.c \ - FillPath.c \ - ProcessPath.c \ - MaskBlit.c \ - MaskFill.c \ - TransformHelper.c \ - AlphaMath.c \ - AlphaMacros.c \ - AnyByte.c \ - ByteBinary1Bit.c \ - ByteBinary2Bit.c \ - ByteBinary4Bit.c \ - ByteIndexed.c \ - ByteGray.c \ - Index8Gray.c \ - Index12Gray.c \ - AnyShort.c \ - Ushort555Rgb.c \ - Ushort565Rgb.c \ - Ushort4444Argb.c \ - Ushort555Rgbx.c \ - UshortGray.c \ - UshortIndexed.c \ - Any3Byte.c \ - ThreeByteBgr.c \ - AnyInt.c \ - IntArgb.c \ - IntArgbPre.c \ - IntArgbBm.c \ - IntRgb.c \ - IntBgr.c \ - IntRgbx.c \ - Any4Byte.c \ - FourByteAbgr.c \ - FourByteAbgrPre.c \ - BufferedMaskBlit.c \ - BufferedRenderPipe.c \ - ShapeSpanIterator.c \ - SpanClipRenderer.c \ - awt_ImageRep.c \ - awt_ImagingLib.c \ - awt_Mlib.c \ - awt_parseImage.c \ - DataBufferNative.c \ - dither.c \ - debug_assert.c \ - debug_mem.c \ - debug_trace.c \ - debug_util.c - -# These files are required to be built, with or without motif. Some of -# these are only dependent on X11, and some contain native source that -# is required, even in a headless build. - -FILES_NO_MOTIF_c = \ - awt_Font.c \ - HeadlessToolkit.c \ - fontpath.c \ - VDrawingArea.c \ - X11Color.c \ - X11Renderer.c \ - X11PMBlitLoops.c \ - X11SurfaceData.c \ - X11FontScaler_md.c \ - X11TextRenderer_md.c \ - OGLBlitLoops.c \ - OGLBufImgOps.c \ - OGLContext.c \ - OGLFuncs.c \ - OGLMaskBlit.c \ - OGLMaskFill.c \ - OGLPaints.c \ - OGLRenderQueue.c \ - OGLRenderer.c \ - OGLSurfaceData.c \ - OGLTextRenderer.c \ - OGLVertexCache.c \ - GLXGraphicsConfig.c \ - GLXSurfaceData.c \ - AccelGlyphCache.c \ - CUPSfuncs.c diff --git a/jdk/makefiles/sun/awt/FILES_c_windows.gmk b/jdk/makefiles/sun/awt/FILES_c_windows.gmk deleted file mode 100644 index ec512b73a9d..00000000000 --- a/jdk/makefiles/sun/awt/FILES_c_windows.gmk +++ /dev/null @@ -1,208 +0,0 @@ -# -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - GraphicsPrimitiveMgr.c \ - Blit.c \ - BlitBg.c \ - ScaledBlit.c \ - FillRect.c \ - FillSpans.c \ - FillParallelogram.c \ - DrawParallelogram.c \ - DrawLine.c \ - DrawRect.c \ - DrawPolygons.c \ - DrawPath.c \ - FillPath.c \ - ProcessPath.c \ - MaskBlit.c \ - MaskFill.c \ - TransformHelper.c \ - AlphaMath.c \ - AlphaMacros.c \ - AnyByte.c \ - ByteBinary1Bit.c \ - ByteBinary2Bit.c \ - ByteBinary4Bit.c \ - ByteIndexed.c \ - ByteGray.c \ - Index8Gray.c \ - Index12Gray.c \ - AnyShort.c \ - Ushort555Rgb.c \ - Ushort565Rgb.c \ - Ushort4444Argb.c \ - Ushort555Rgbx.c \ - UshortGray.c \ - UshortIndexed.c \ - Any3Byte.c \ - ThreeByteBgr.c \ - AnyInt.c \ - IntArgb.c \ - IntArgbPre.c \ - IntArgbBm.c \ - IntRgb.c \ - IntBgr.c \ - IntRgbx.c \ - Any4Byte.c \ - FourByteAbgr.c \ - FourByteAbgrPre.c \ - BufferedMaskBlit.c \ - BufferedRenderPipe.c \ - ShapeSpanIterator.c \ - SpanClipRenderer.c \ - SurfaceData.c \ - Region.c \ - DataBufferNative.c \ - BufImgSurfaceData.c \ - Disposer.c \ - Trace.c \ - img_globals.c \ - gifdecoder.c \ - awt_parseImage.c \ - awt_ImageRep.c \ - awt_ImagingLib.c \ - dither.c \ - imageInitIDs.c \ - debug_assert.c \ - debug_mem.c \ - debug_trace.c \ - debug_util.c \ - OGLBlitLoops.c \ - OGLBufImgOps.c \ - OGLContext.c \ - OGLFuncs.c \ - OGLMaskBlit.c \ - OGLMaskFill.c \ - OGLPaints.c \ - OGLRenderQueue.c \ - OGLRenderer.c \ - OGLSurfaceData.c \ - OGLTextRenderer.c \ - OGLVertexCache.c \ - WGLGraphicsConfig.c \ - WGLSurfaceData.c \ - AccelGlyphCache.c \ - rect.c - -FILES_cpp = \ - CmdIDList.cpp \ - Hashtable.cpp \ - GDIHashtable.cpp \ - Devices.cpp \ - ObjectList.cpp \ - GDIBlitLoops.cpp \ - GDIRenderer.cpp \ - GDIWindowSurfaceData.cpp \ - WindowsFlags.cpp \ - WPrinterJob.cpp \ - awt_AWTEvent.cpp \ - awt_BitmapUtil.cpp \ - awt_Brush.cpp \ - awt_Button.cpp \ - awt_Canvas.cpp \ - awt_Checkbox.cpp \ - awt_Choice.cpp \ - awt_Clipboard.cpp \ - awt_Color.cpp \ - awt_Component.cpp \ - awt_Container.cpp \ - awt_Cursor.cpp \ - awt_DataTransferer.cpp \ - awt_Debug.cpp \ - awt_Dimension.cpp \ - awt_Desktop.cpp \ - awt_DesktopProperties.cpp \ - awt_Dialog.cpp \ - awt_DrawingSurface.cpp \ - awt_FileDialog.cpp \ - awt_Event.cpp \ - awt_Font.cpp \ - awt_Frame.cpp \ - awt_GDIObject.cpp \ - awt_IconCursor.cpp \ - awt_InputEvent.cpp \ - awt_InputMethod.cpp \ - awt_InputTextInfor.cpp \ - awt_Insets.cpp \ - awt_KeyEvent.cpp \ - awt_KeyboardFocusManager.cpp \ - awt_Label.cpp \ - awt_List.cpp \ - awt_Menu.cpp \ - awt_MenuBar.cpp \ - awt_MenuItem.cpp \ - awt_MouseEvent.cpp \ - awt_Object.cpp \ - awt_Palette.cpp \ - awt_Panel.cpp \ - awt_PopupMenu.cpp \ - awt_Pen.cpp \ - awt_PrintControl.cpp \ - awt_PrintDialog.cpp \ - awt_PrintJob.cpp \ - awt_Rectangle.cpp \ - awt_Robot.cpp \ - awt_Scrollbar.cpp \ - awt_ScrollPane.cpp \ - awt_TextArea.cpp \ - awt_TextComponent.cpp \ - awt_TextField.cpp \ - awt_Toolkit.cpp \ - awt_Window.cpp \ - awt_Win32GraphicsEnv.cpp \ - awt_Win32GraphicsDevice.cpp \ - awt_Win32GraphicsConfig.cpp \ - awt_DnDDT.cpp \ - awt_DnDDS.cpp \ - awt_Mlib.cpp \ - awt_new.cpp \ - awt_TrayIcon.cpp \ - awt_DCHolder.cpp \ - awt_ole.cpp \ - ShaderList.cpp \ - D3DBlitLoops.cpp \ - D3DBufImgOps.cpp \ - D3DContext.cpp \ - D3DGlyphCache.cpp \ - D3DGraphicsDevice.cpp \ - D3DMaskBlit.cpp \ - D3DMaskCache.cpp \ - D3DMaskFill.cpp \ - D3DPipelineManager.cpp \ - D3DPaints.cpp \ - D3DRenderer.cpp \ - D3DRenderQueue.cpp \ - D3DResourceManager.cpp \ - D3DSurfaceData.cpp \ - D3DTextRenderer.cpp \ - D3DVertexCacher.cpp \ - ShellFolder2.cpp \ - ThemeReader.cpp \ - ComCtl32Util.cpp \ - DllUtil.cpp \ - initIDs.cpp \ - MouseInfo.cpp diff --git a/jdk/makefiles/sun/awt/FILES_export_macosx.gmk b/jdk/makefiles/sun/awt/FILES_export_macosx.gmk deleted file mode 100644 index 8975d6d5fa0..00000000000 --- a/jdk/makefiles/sun/awt/FILES_export_macosx.gmk +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# FILES_export definitions for Mac OS X - -FILES_export += \ - com/apple/resources/MacOSXResourceBundle.java diff --git a/jdk/makefiles/sun/awt/FILES_export_unix.gmk b/jdk/makefiles/sun/awt/FILES_export_unix.gmk deleted file mode 100644 index 5cd8a010007..00000000000 --- a/jdk/makefiles/sun/awt/FILES_export_unix.gmk +++ /dev/null @@ -1,189 +0,0 @@ -# -# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# FILES_export definitions for Solaris and Linux - -FILES_export = \ - sun/font/FontManager.java \ - sun/awt/image/ImageRepresentation.java \ - sun/awt/image/GifImageDecoder.java \ - sun/awt/image/NativeLibLoader.java \ - sun/java2d/loops/Blit.java \ - sun/java2d/loops/BlitBg.java \ - sun/java2d/loops/ScaledBlit.java \ - sun/java2d/loops/TransformBlit.java \ - sun/java2d/loops/FillRect.java \ - sun/java2d/loops/FillSpans.java \ - sun/java2d/loops/FillParallelogram.java \ - sun/java2d/loops/DrawParallelogram.java \ - sun/java2d/loops/DrawGlyphList.java \ - sun/java2d/loops/DrawGlyphListAA.java \ - sun/java2d/loops/DrawGlyphListLCD.java \ - sun/java2d/loops/DrawLine.java \ - sun/java2d/loops/DrawRect.java \ - sun/java2d/loops/DrawPolygons.java \ - sun/java2d/loops/DrawPath.java \ - sun/java2d/loops/FillPath.java \ - sun/java2d/loops/MaskBlit.java \ - sun/java2d/loops/MaskFill.java \ - sun/java2d/loops/TransformHelper.java \ - sun/java2d/loops/GraphicsPrimitiveMgr.java \ - sun/java2d/loops/GraphicsPrimitive.java \ - sun/java2d/pipe/hw/AccelSurface.java \ - sun/java2d/pipe/hw/AccelDeviceEventNotifier.java \ - sun/java2d/pipe/hw/ContextCapabilities.java \ - sun/awt/image/ImagingLib.java \ - sun/java2d/SurfaceData.java \ - sun/java2d/SunGraphics2D.java \ - sun/awt/KeyboardFocusManagerPeerImpl.java \ - sun/awt/image/BufImgSurfaceData.java \ - sun/awt/image/DataBufferNative.java \ - \ - sun/awt/X11InputMethod.java \ - sun/awt/motif/MFontConfiguration.java \ - sun/awt/DebugSettings.java \ - sun/awt/EmbeddedFrame.java \ - sun/awt/PlatformFont.java \ - sun/awt/FontDescriptor.java \ - sun/awt/NativeLibLoader.java \ - sun/awt/X11GraphicsEnvironment.java \ - sun/awt/X11GraphicsDevice.java \ - sun/awt/X11GraphicsConfig.java \ - sun/awt/CharsetString.java \ - sun/awt/UNIXToolkit.java \ - sun/java2d/pipe/BufferedContext.java \ - sun/java2d/pipe/BufferedMaskBlit.java \ - sun/java2d/pipe/BufferedOpCodes.java \ - sun/java2d/pipe/BufferedMaskBlit.java \ - sun/java2d/pipe/BufferedPaints.java \ - sun/java2d/pipe/BufferedRenderPipe.java \ - sun/java2d/pipe/BufferedTextPipe.java \ - sun/java2d/pipe/RenderBuffer.java \ - sun/java2d/pipe/ShapeSpanIterator.java \ - sun/java2d/pipe/SpanClipRenderer.java \ - sun/java2d/pipe/RegionIterator.java \ - sun/awt/image/IntegerComponentRaster.java \ - sun/java2d/cmm/CMSManager.java \ - sun/java2d/cmm/PCMM.java \ - sun/java2d/cmm/ColorTransform.java \ - sun/awt/datatransfer/DataTransferer.java \ - sun/awt/dnd/SunDragSourceContextPeer.java \ - sun/java2d/opengl/OGLBlitLoops.java \ - sun/java2d/opengl/OGLContext.java \ - sun/java2d/opengl/OGLMaskFill.java \ - sun/java2d/opengl/OGLPaints.java \ - sun/java2d/opengl/OGLRenderer.java \ - sun/java2d/opengl/OGLRenderQueue.java \ - sun/java2d/opengl/OGLSurfaceData.java \ - sun/java2d/opengl/OGLTextRenderer.java \ - sun/java2d/opengl/GLXGraphicsConfig.java \ - sun/java2d/opengl/GLXSurfaceData.java \ - sun/java2d/x11/X11PMBlitLoops.java \ - sun/java2d/x11/X11PMBlitBgLoops.java \ - sun/java2d/x11/X11Renderer.java \ - sun/java2d/x11/X11SurfaceData.java \ - com/sun/java/swing/plaf/gtk/GTKEngine.java \ - com/sun/java/swing/plaf/gtk/GTKStyle.java \ - sun/awt/ExtendedKeyCodes.java - - -FILES_export2 = \ - java/awt/AlphaComposite.java \ - java/awt/MouseInfo.java \ - java/awt/Cursor.java \ - java/awt/Graphics.java \ - java/awt/Color.java \ - java/awt/Image.java \ - java/awt/Rectangle.java \ - java/awt/Event.java \ - java/awt/Font.java \ - java/awt/Insets.java \ - java/awt/Point.java \ - java/awt/FontMetrics.java \ - java/awt/Toolkit.java \ - java/awt/Component.java \ - java/awt/Container.java \ - java/awt/Canvas.java \ - java/awt/Button.java \ - java/awt/List.java \ - java/awt/Adjustable.java \ - java/awt/Scrollbar.java \ - java/awt/ScrollPane.java \ - java/awt/ScrollPaneAdjustable.java \ - java/awt/Window.java \ - java/awt/TextField.java \ - java/awt/Label.java \ - java/awt/Choice.java \ - java/awt/TextArea.java \ - java/awt/MenuBar.java \ - java/awt/Menu.java \ - java/awt/MenuComponent.java \ - java/awt/PopupMenu.java \ - java/awt/Dialog.java \ - java/awt/FileDialog.java \ - java/awt/MenuItem.java \ - java/awt/Checkbox.java \ - java/awt/CheckboxMenuItem.java \ - java/awt/CheckboxGroup.java \ - java/awt/Frame.java \ - java/awt/Transparency.java \ - java/awt/AWTException.java \ - java/awt/AWTEvent.java \ - java/awt/AWTKeyStroke.java \ - java/awt/KeyboardFocusManager.java \ - java/awt/Dimension.java \ - java/awt/SystemColor.java \ - java/awt/TrayIcon.java \ - java/awt/DisplayMode.java \ - java/awt/color/ColorSpace.java \ - java/awt/color/ICC_Profile.java \ - java/awt/geom/PathIterator.java \ - java/awt/image/AffineTransformOp.java \ - java/awt/image/ImageConsumer.java \ - java/awt/image/ImageObserver.java \ - java/awt/image/BufferedImage.java \ - java/awt/image/ColorModel.java \ - java/awt/image/ConvolveOp.java \ - java/awt/image/DirectColorModel.java \ - java/awt/image/IndexColorModel.java \ - java/awt/image/DataBuffer.java \ - java/awt/datatransfer/Transferable.java \ - java/awt/datatransfer/DataFlavor.java \ - java/awt/datatransfer/UnsupportedFlavorException.java \ - java/awt/datatransfer/Clipboard.java \ - java/awt/datatransfer/ClipboardOwner.java \ - java/awt/datatransfer/StringSelection.java \ - java/awt/event/AdjustmentEvent.java \ - java/awt/event/KeyEvent.java \ - java/awt/event/MouseEvent.java \ - java/awt/event/MouseWheelEvent.java \ - java/awt/event/FocusEvent.java \ - java/awt/event/InputEvent.java \ - java/awt/event/WindowEvent.java \ - java/awt/event/NativeLibLoader.java \ - java/awt/peer/ComponentPeer.java \ - java/awt/dnd/DnDConstants.java \ - sun/awt/CausedFocusEvent.java - diff --git a/jdk/makefiles/sun/awt/FILES_export_windows.gmk b/jdk/makefiles/sun/awt/FILES_export_windows.gmk deleted file mode 100644 index 81e90e8ba74..00000000000 --- a/jdk/makefiles/sun/awt/FILES_export_windows.gmk +++ /dev/null @@ -1,252 +0,0 @@ -# -# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# FILES_export definitions for Win32 - -FILES_export = \ - java/awt/AlphaComposite.java \ - java/awt/MouseInfo.java \ - java/awt/Graphics.java \ - java/awt/Color.java \ - java/awt/Image.java \ - java/awt/Rectangle.java \ - java/awt/Event.java \ - java/awt/Font.java \ - java/awt/FontMetrics.java \ - java/awt/Toolkit.java \ - java/awt/Component.java \ - java/awt/Container.java \ - java/awt/Canvas.java \ - java/awt/Button.java \ - java/awt/List.java \ - java/awt/Adjustable.java \ - java/awt/Scrollbar.java \ - java/awt/ScrollPane.java \ - java/awt/ScrollPaneAdjustable.java \ - java/awt/Transparency.java \ - java/awt/Window.java \ - java/awt/TextField.java \ - java/awt/Label.java \ - java/awt/Choice.java \ - java/awt/TextComponent.java \ - java/awt/TextArea.java \ - java/awt/MenuBar.java \ - java/awt/Menu.java \ - java/awt/Dialog.java \ - java/awt/FileDialog.java \ - java/awt/MenuItem.java \ - java/awt/MenuComponent.java \ - java/awt/Checkbox.java \ - java/awt/CheckboxGroup.java \ - java/awt/CheckboxMenuItem.java \ - java/awt/Frame.java \ - java/awt/Insets.java \ - java/awt/Cursor.java \ - java/awt/Dimension.java \ - java/awt/PopupMenu.java \ - java/awt/AWTEvent.java \ - java/awt/AWTException.java \ - java/awt/AWTKeyStroke.java \ - java/awt/KeyboardFocusManager.java \ - java/awt/DisplayMode.java \ - java/awt/TrayIcon.java \ - java/awt/datatransfer/StringSelection.java \ - java/awt/datatransfer/Transferable.java \ - java/awt/dnd/DnDConstants.java \ - java/awt/event/ActionEvent.java \ - java/awt/event/AdjustmentEvent.java \ - java/awt/event/ComponentEvent.java \ - java/awt/event/FocusEvent.java \ - java/awt/event/ItemEvent.java \ - java/awt/event/InputEvent.java \ - java/awt/event/InvocationEvent.java \ - java/awt/event/KeyEvent.java \ - java/awt/event/MouseEvent.java \ - java/awt/event/MouseWheelEvent.java \ - java/awt/event/WindowEvent.java \ - java/awt/event/InputMethodEvent.java \ - java/awt/im/InputMethodHighlight.java \ - java/awt/im/spi/InputMethod.java \ - java/awt/font/TextHitInfo.java \ - java/text/AttributedCharacterIterator.java \ - java/text/AttributedString.java \ - java/awt/geom/PathIterator.java \ - java/awt/image/AffineTransformOp.java \ - java/awt/image/ImageConsumer.java \ - java/awt/image/ImageObserver.java \ - java/awt/image/BufferedImage.java \ - java/awt/image/ColorModel.java \ - java/awt/image/ConvolveOp.java \ - java/awt/image/DirectColorModel.java \ - java/awt/image/IndexColorModel.java \ - java/awt/image/Raster.java \ - java/awt/color/ColorSpace.java \ - java/awt/color/ICC_Profile.java \ - java/awt/peer/ComponentPeer.java \ - java/awt/peer/MenuComponentPeer.java \ - java/io/InputStream.java - -FILES_export2 = \ - sun/awt/im/InputMethodContext.java \ - sun/awt/EmbeddedFrame.java \ - sun/awt/KeyboardFocusManagerPeerImpl.java \ - sun/awt/windows/WEmbeddedFrame.java \ - sun/awt/windows/WEmbeddedFramePeer.java \ - sun/awt/Win32FontManager.java \ - sun/awt/Win32GraphicsEnvironment.java \ - sun/awt/Win32GraphicsDevice.java \ - sun/awt/Win32GraphicsConfig.java \ - sun/java2d/SunGraphicsEnvironment.java \ - sun/java2d/SunGraphics2D.java \ - sun/java2d/SurfaceData.java \ - sun/awt/image/IntegerComponentRaster.java \ - sun/awt/image/ImagingLib.java \ - sun/awt/image/BufImgSurfaceData.java \ - sun/awt/image/DataBufferNative.java \ - sun/awt/shell/Win32ShellFolder2.java \ - sun/java2d/windows/GDIBlitLoops.java \ - sun/java2d/windows/GDIRenderer.java \ - sun/java2d/windows/GDIWindowSurfaceData.java \ - sun/java2d/windows/WindowsFlags.java \ - sun/java2d/loops/Blit.java \ - sun/java2d/loops/BlitBg.java \ - sun/java2d/loops/ScaledBlit.java \ - sun/java2d/loops/FillRect.java \ - sun/java2d/loops/FillSpans.java \ - sun/java2d/loops/FillParallelogram.java \ - sun/java2d/loops/DrawParallelogram.java \ - sun/java2d/loops/DrawGlyphList.java \ - sun/java2d/loops/DrawGlyphListAA.java \ - sun/java2d/loops/DrawGlyphListLCD.java \ - sun/java2d/loops/DrawLine.java \ - sun/java2d/loops/DrawRect.java \ - sun/java2d/loops/DrawPolygons.java \ - sun/java2d/loops/DrawPath.java \ - sun/java2d/loops/FillPath.java \ - sun/java2d/loops/MaskBlit.java \ - sun/java2d/loops/MaskFill.java \ - sun/java2d/loops/TransformHelper.java \ - sun/java2d/loops/GraphicsPrimitiveMgr.java \ - sun/java2d/loops/GraphicsPrimitive.java \ - sun/java2d/cmm/CMSManager.java \ - sun/java2d/cmm/PCMM.java \ - sun/java2d/cmm/ColorTransform.java \ - sun/awt/ScrollPaneWheelScroller.java \ - sun/awt/datatransfer/DataTransferer.java \ - sun/awt/datatransfer/SunClipboard.java \ - sun/awt/dnd/SunDragSourceContextPeer.java \ - sun/awt/windows/WToolkitThreadBlockedHandler.java - -FILES_export3 = \ - java/awt/CheckboxMenuItem.java \ - java/awt/Menu.java \ - java/awt/MenuBar.java \ - java/awt/MenuComponent.java \ - java/awt/MenuItem.java \ - sun/awt/PlatformFont.java \ - sun/awt/FontDescriptor.java \ - sun/awt/CharsetString.java \ - java/awt/image/DataBuffer.java \ - sun/awt/image/GifImageDecoder.java \ - sun/awt/image/ImageRepresentation.java \ - sun/awt/windows/WCustomCursor.java \ - sun/awt/windows/WDefaultFontCharset.java \ - sun/awt/windows/WButtonPeer.java \ - sun/awt/windows/WCanvasPeer.java \ - sun/awt/windows/WCheckboxPeer.java \ - sun/awt/windows/WCheckboxMenuItemPeer.java \ - sun/awt/windows/WChoicePeer.java \ - sun/awt/windows/WClipboard.java \ - sun/awt/windows/WColor.java \ - sun/awt/windows/WDataTransferer.java \ - sun/awt/windows/WDesktopPeer.java \ - sun/awt/windows/WDesktopProperties.java \ - sun/awt/windows/WDialogPeer.java \ - sun/awt/windows/WDragSourceContextPeer.java \ - sun/awt/windows/WDropTargetContextPeer.java \ - sun/awt/windows/WFileDialogPeer.java \ - sun/awt/windows/WFontPeer.java \ - sun/awt/windows/WFontMetrics.java \ - sun/awt/windows/WFramePeer.java \ - sun/awt/windows/WGlobalCursorManager.java \ - sun/awt/windows/WInputMethod.java \ - sun/awt/windows/WInputMethodDescriptor.java \ - sun/awt/windows/WComponentPeer.java \ - sun/awt/windows/WLabelPeer.java \ - sun/awt/windows/WListPeer.java \ - sun/awt/windows/WMenuBarPeer.java \ - sun/awt/windows/WMenuItemPeer.java \ - sun/awt/windows/WMenuPeer.java \ - sun/awt/windows/WObjectPeer.java \ - sun/awt/windows/WPopupMenuPeer.java \ - sun/awt/windows/WPrintDialog.java \ - sun/awt/windows/WPrintDialogPeer.java \ - sun/awt/windows/WPrinterJob.java \ - sun/awt/windows/WRobotPeer.java \ - sun/awt/windows/WScrollbarPeer.java \ - sun/awt/windows/WScrollPanePeer.java \ - sun/awt/windows/WTextAreaPeer.java \ - sun/awt/windows/WTextComponentPeer.java \ - sun/awt/windows/WTextFieldPeer.java \ - sun/awt/windows/WPanelPeer.java \ - sun/awt/windows/WToolkit.java \ - sun/awt/windows/WWindowPeer.java \ - sun/awt/windows/ThemeReader.java \ - sun/awt/windows/WBufferStrategy.java \ - sun/awt/windows/WTrayIconPeer.java \ - sun/awt/image/ImagingLib.java \ - sun/awt/ExtendedKeyCodes.java \ - sun/java2d/pipe/hw/AccelSurface.java \ - sun/java2d/pipe/hw/AccelDeviceEventNotifier.java \ - sun/java2d/pipe/hw/ContextCapabilities.java \ - sun/java2d/pipe/BufferedContext.java \ - sun/java2d/pipe/BufferedMaskBlit.java \ - sun/java2d/pipe/BufferedOpCodes.java \ - sun/java2d/pipe/BufferedPaints.java \ - sun/java2d/pipe/BufferedRenderPipe.java \ - sun/java2d/pipe/BufferedTextPipe.java \ - sun/java2d/pipe/RenderBuffer.java \ - sun/java2d/pipe/ShapeSpanIterator.java \ - sun/java2d/pipe/SpanClipRenderer.java \ - sun/java2d/pipe/RegionIterator.java \ - sun/java2d/opengl/OGLBlitLoops.java \ - sun/java2d/opengl/OGLContext.java \ - sun/java2d/opengl/OGLMaskFill.java \ - sun/java2d/opengl/OGLPaints.java \ - sun/java2d/opengl/OGLRenderQueue.java \ - sun/java2d/opengl/OGLRenderer.java \ - sun/java2d/opengl/OGLSurfaceData.java \ - sun/java2d/opengl/OGLTextRenderer.java \ - sun/java2d/opengl/WGLGraphicsConfig.java \ - sun/java2d/opengl/WGLSurfaceData.java \ - sun/java2d/d3d/D3DBlitLoops.java \ - sun/java2d/d3d/D3DGraphicsDevice.java \ - sun/java2d/d3d/D3DSurfaceData.java \ - sun/java2d/d3d/D3DMaskFill.java \ - sun/java2d/d3d/D3DPaints.java \ - sun/java2d/d3d/D3DRenderQueue.java \ - sun/java2d/d3d/D3DRenderer.java \ - sun/java2d/d3d/D3DTextRenderer.java \ - sun/java2d/d3d/D3DContext.java diff --git a/jdk/makefiles/sun/awt/Makefile b/jdk/makefiles/sun/awt/Makefile deleted file mode 100644 index 7703027bcad..00000000000 --- a/jdk/makefiles/sun/awt/Makefile +++ /dev/null @@ -1,568 +0,0 @@ -# -# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PACKAGE = sun.awt -LIBRARY = awt -PRODUCT = sun - -# Tell Defs.gmk that VIS is needed -VIS_NEEDED=true - -# Use highest optimization level -OPTMIZATION_LEVEL = HIGHEST - -include $(BUILDDIR)/common/Defs.gmk -include $(BUILDDIR)/Tools.gmk - -OTHER_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES - -# -# Files -# - -# -# Include all Java source files in sun/awt and sun/java2d, except for: -# sun/awt/resources handled by java/awt/Makefile -# sun/java2d/pisces handled by sun/pisces/Makefile -# -AUTO_FILES_JAVA_DIRS = sun/awt sun/java2d com/sun/awt -AUTO_JAVA_PRUNE = resources pisces - -ifeq ($(PLATFORM), windows) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS - -# -# Files -# -include FILES_c_windows.gmk -include FILES_export_windows.gmk - -# -# Prune files that are currently unused on Windows (but still used on -# Solaris/Linux). -# -AUTO_JAVA_PRUNE += RemoteOffScreenImage.java - -OTHER_CFLAGS += $(GX_OPTION) -DMLIB_NO_LIBSUNMATH -DUNICODE -D_UNICODE -OTHER_CXXFLAGS += $(GX_OPTION) -DUNICODE -D_UNICODE - -ifeq ($(ARCH_DATA_MODEL), 64) - OTHER_CFLAGS += -DMLIB_OS64BIT -endif - -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS -endif # PLATFORM - -ifneq ($(PLATFORM), windows) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX - -# -# Files -# -include FILES_c_unix.gmk -include FILES_export_unix.gmk -# -# Prune the sun/awt/X11 subdirectory, which is handled by sun/xawt/Makefile. -# Also prune files that are currently unused on Solaris/Linux (but still -# used on Windows). -# -AUTO_JAVA_PRUNE += X11 AWTCharset.java - -ifeq ($(PLATFORM), solaris) -FILES_c = $(FILES_2D_c) -FILES_c += awt_LoadLibrary.c -OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL) -ifeq ($(CC_VER), 5.8) - ifndef REMOVE_ALL_WORKAROUNDS - ifeq ($(ARCH_FAMILY), i586) - # If on Solaris 11 (or dlfcn.h has unknown_control_flow pragmas in it) - # we trigger a SS11 bug that causes the compiler to crash (bug 6343678) - # Here we check to see if we need this workaround and change the opt - # settings for this one file. - USE_WORKAROUND:=$(shell $(GREP) unknown_control_flow /usr/include/dlfcn.h) - ifneq ($(USE_WORKAROUND),) - ifeq ($(FASTDEBUG), true) - CFLAGS_DBG/awt_Mlib.o = -xO0 \ - $(warning "WARNING: Using workaround for SS11 bug 6343678, on $@") - endif - # Compiler bug 6343678 need to prevent a SEGV in the compiler - CFLAGS_OPT/awt_Mlib.o = -g \ - $(warning "WARNING: Using workaround for SS11 bug 6343678, on $@") - endif - endif - endif -endif -endif - -ifeq ($(PLATFORM), linux) -FILES_c = $(FILES_2D_c) -FILES_c += awt_LoadLibrary.c -OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH -OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL) -endif - -FILES_c += initIDs.c - -ifeq ($(PLATFORM), macosx) -FILES_c = $(FILES_2D_c) -FILES_c += awt_LoadLibrary.c -OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH -OTHER_LDLIBS = $(JVMLIB) $(LIBM) -endif - -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX -endif # PLATFORM - -ifeq ($(PLATFORM), macosx) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv MAC OS X - -# -# Files -# -include FILES_c_macosx.gmk -include FILES_export_macosx.gmk - -FILES_objc = $(FILES_AWT_objc) -OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) \ - -framework Cocoa \ - -framework OpenGL \ - -framework JavaNativeFoundation \ - -framework JavaRuntimeSupport \ - -framework ApplicationServices \ - -framework AudioToolbox - -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MAC OS X -endif # PLATFORM - -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS-SPARC -# solaris-sparc and solaris-sparcv9 both build 'vis' -ifeq ("$(PLATFORM)-$(ARCH_FAMILY)", "solaris-sparc") - FILES_c += $(FILES_2D_vis) - ASFLAGS += -P - FILES_s += mlib_v_ImageCopy_blk.s - INLINE_VIS = $(PLATFORM_SRC)/native/sun/awt/medialib/vis_$(ARCH_DATA_MODEL).il - CFLAGS_sparcv9 = -DMLIB_OS64BIT - - CFLAGS += $(CFLAGS_$(ARCH)) -DMLIB_ADD_SUFF $(INLINE_VIS) \ - -I$(SHARE_SRC)/native/sun/awt/medialib \ - -I$(PLATFORM_SRC)/native/sun/awt/medialib \ - -I$(PLATFORM_SRC)/native/sun/java2d/loops - -vpath %.c $(PLATFORM_SRC)/native/sun/java2d/loops -vpath %.c $(SHARE_SRC)/native/sun/awt/medialib -vpath %.c $(PLATFORM_SRC)/native/sun/awt/medialib -vpath %.s $(PLATFORM_SRC)/native/sun/awt/medialib - -else - FILES_c += MapAccelFunc.c -endif -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS-SPARC - -# -# Resources -# -LOCALE_SET_DEFINITION = jre -ifeq ($(PLATFORM), windows) - RESOURCE_BUNDLES_COMPILED_PROPERTIES += \ - sun/awt/windows/awtLocalization.properties -endif - -# -# Rules -# -ifeq ($(PLATFORM), linux) - FILES_m = mapfile-vers-linux - # libawt.so on Linux is statically linked with Motif and contains all the - # Xm symbols. Mapfile is disabled so the symbols will remain public. - LDNOMAP=true -endif - -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -COMPILEFONTCONFIG_FLAGS = -ifdef ALT_COMPILEFONTCONFIG_FLAGS - COMPILEFONTCONFIG_FLAGS += $(ALT_COMPILEFONTCONFIG_FLAGS) -endif -build: fontconfigs - - -ifeq ($(PLATFORM), windows) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS -# -# Additional dependencies. -# -# If make.depend is not working correctly, then it can be omitted -# if you always build from a clean workspace. - -include make.depend - -# required additional rules: - -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS -endif # PLATFORM - -ifneq ($(PLATFORM), windows) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX - -ifndef OPENJDK -build: dgalibs -endif -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX -endif # PLATFORM - -clobber clean:: java2d.clean fontconfigs.clean - -ifndef OPENJDK -clobber clean:: dgalib.clean -endif - -java2d.clean: - $(RM) -r $(CLASSBINDIR)/sun/java2d .classes.* - -# -# Add to the ambient vpath to pick up files in subdirectories -# -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/gif -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/cvutils -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/shell -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/medialib -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/debug -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/utility -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe -vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)/image -ifeq ($(PLATFORM), windows) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS -vpath %.cpp $(PLATFORM_SRC)/native/sun/windows -vpath %.cpp $(PLATFORM_SRC)/native/$(PKGDIR) -vpath %.cpp $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/windows -vpath %.cpp $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/d3d -vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../font -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS -endif # PLATFORM - -ifneq (,$(findstring $(PLATFORM), linux bsd)) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl -vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl -vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11 -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../font -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ LINUX -endif # PLATFORM - -ifeq ($(PLATFORM), macosx) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv MAC OS X -vpath %.m $(call NativeSrcDirList,,native/com/apple/resources) -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MAC OS X -endif # PLATFORM - -ifeq ($(PLATFORM), windows) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS -OTHER_LDLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \ - imm32.lib ole32.lib uuid.lib shell32.lib \ - comdlg32.lib winmm.lib comctl32.lib \ - shlwapi.lib delayimp.lib \ - $(JVMLIB) \ - /DELAYLOAD:user32.dll /DELAYLOAD:gdi32.dll \ - /DELAYLOAD:shell32.dll /DELAYLOAD:winmm.dll \ - /DELAYLOAD:winspool.drv /DELAYLOAD:imm32.dll \ - /DELAYLOAD:ole32.dll /DELAYLOAD:comdlg32.dll \ - /DELAYLOAD:comctl32.dll /DELAYLOAD:shlwapi.dll - -clean:: awt.clean - -awt.clean: - $(RM) $(TEMPDIR)/awt.ico - $(RM) $(TEMPDIR)/awt.res - $(RM) $(TEMPDIR)/hand.cur - $(RM) $(TEMPDIR)/check.bmp -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS -endif # PLATFORM - -ifneq ($(PLATFORM), windows) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX - -LIBXTST = -lXtst - -# Use -lXmu for EditRes support -LIBXMU_DBG = -lXmu -LIBXMU_OPT = -LIBXMU = $(LIBXMU_$(VARIANT)) - -# -# Extra C flags. -# - - -ifndef OPENJDK - -# -# Solaris X11 Direct Graphics Access library -# - -_DGALIBS_sparc = \ - libxinerama.so \ - libjdgaSUNWcg6.so \ - libjdgaSUNWffb.so \ - libjdgaSUNWm64.so \ - libjdgaSUNWafb.so - -_DGALIBS_sparcv9 = \ - libxinerama.so \ - libjdgaSUNWcg6.so \ - libjdgaSUNWffb.so \ - libjdgaSUNWm64.so \ - libjdgaSUNWafb.so - -_DGALIBS_i586 = # no i586 library yet - -_DGALIBS_amd64 = # no amd64 library yet - -DGALIBS = $(_DGALIBS_$(ARCH):%=$(LIBDIR)/$(LIBARCH)/%) - -dgalibs: $(DGALIBS) - -$(LIBDIR)/$(LIBARCH)/libxinerama.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libxinerama.so - $(install-file) - $(call chmod-file, a+x) - -$(LIBDIR)/$(LIBARCH)/libjdgaSUNW%.so: $(CLOSED_SRC)/solaris/lib/$(ARCH)/libjdgaSUNW%.so - $(install-file) - $(call chmod-file, a+x) - -$(LIBDIR)/$(LIBARCH)/libjdgaSUNWafb.so: $(LIBDIR)/$(LIBARCH)/libjdgaSUNWffb.so - $(prep-target) - $(call install-sym-link, libjdgaSUNWffb.so) - -clean:: dgalib.clean - -dgalib.clean: - $(RM) $(LIBDIR)/$(LIBARCH)/libjdgaSUNW* $(LIBDIR)/$(LIBARCH)/libxinerama.so -endif - -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX -endif # PLATFORM - -# -# Font configs -# - -ifeq ($(PLATFORM), windows) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS - -FONTCONFIGS_SRC = $(PLATFORM_SRC)/classes/sun/awt/windows -_FONTCONFIGS = \ - fontconfig.properties - -FONTCONFIGS_SRC_PREFIX = - -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS -endif # PLATFORM - -ifeq ($(PLATFORM), linux) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX -ifdef OPENJDK - -FONTCONFIGS_SRC = $(PLATFORM_SRC)/classes/sun/awt/fontconfigs -_FONTCONFIGS = \ - fontconfig.properties \ - fontconfig.SuSE.properties \ - fontconfig.Ubuntu.properties \ - fontconfig.Fedora.properties -else - -FONTCONFIGS_SRC = $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs -_FONTCONFIGS = \ - fontconfig.properties \ - fontconfig.RedHat.5.properties \ - fontconfig.RedHat.6.properties \ - fontconfig.Turbo.properties \ - fontconfig.SuSE.10.properties \ - fontconfig.SuSE.11.properties -endif - -FONTCONFIGS_SRC_PREFIX = $(PLATFORM). - -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ LINUX -endif # PLATFORM - -ifeq ($(PLATFORM), solaris) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS - -FONTCONFIGS_SRC = $(PLATFORM_SRC)/classes/sun/awt/fontconfigs -_FONTCONFIGS = \ - fontconfig.properties - -FONTCONFIGS_SRC_PREFIX = $(PLATFORM). - -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS -endif # PLATFORM - - -ifeq ($(PLATFORM), macosx) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv MAC OS X - -FONTCONFIGS_SRC = $(JDK_TOPDIR)/src/macosx/classes/sun/awt/fontconfigs -_FONTCONFIGS = \ - fontconfig.properties - -FONTCONFIGS_SRC_PREFIX = $(PLATFORM). - -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MAC OS X -endif # PLATFORM - -FONTCONFIGS = $(_FONTCONFIGS:%=$(LIBDIR)/%.src) -BINARYFONTCONFIGS = $(_FONTCONFIGS:%.properties=$(LIBDIR)/%.bfc) - -fontconfigs: $(FONTCONFIGS) $(BINARYFONTCONFIGS) - -$(LIBDIR)/%.src: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)% - $(install-file) - -$(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \ - $(BUILD_TOOLS) - $(prep-target) - $(TOOL_COMPILEFONTCONFIG) $(COMPILEFONTCONFIG_FLAGS) $< $@ - $(call chmod-file, 444) - @$(java-vm-cleanup) - -fontconfigs.clean : - $(RM) $(FONTCONFIGS) - $(RM) $(BINARYFONTCONFIGS) - -ifeq ($(PLATFORM), windows) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS -OTHER_CFLAGS += $(GX_OPTION) -DUNICODE -D_UNICODE - -ifeq ($(MILESTONE), internal) - CPPFLAGS += -DINTERNAL_BUILD -endif - -# -# Useful variables that name parts of the src tree. -# -WINAWT_native = $(PLATFORM_SRC)/native/sun/windows -WINAWT_COMMON_native = $(PLATFORM_SRC)/native/sun/awt_common - -# FIXME: awt shouldn't have to see the VM's private headers. -# FIXME: if you re-order this list, the build breaks, possibly because -# of filename collision. Such a collision, if present, is pure -# evil. Need to investigate this. - -OTHER_INCLUDES += -I$(CLASSHDRDIR)/../../java/jvm \ - -I$(OBJDIR) \ - -I$(SHARE_SRC)/native/common \ - -I$(WINAWT_native) \ - -I$(DXSDK_INCLUDE_PATH) \ - -I$(SHARE_SRC)/native/sun/awt/image/cvutils \ - -I$(SHARE_SRC)/native/sun/awt/image \ - -I$(SHARE_SRC)/native/sun/java2d/loops \ - -I$(SHARE_SRC)/native/sun/java2d \ - -I$(PLATFORM_SRC)/native/sun/java2d \ - -I$(SHARE_SRC)/native/sun/java2d/opengl \ - -I$(PLATFORM_SRC)/native/sun/java2d/d3d \ - -I$(PLATFORM_SRC)/native/sun/java2d/opengl \ - -I$(PLATFORM_SRC)/native/sun/java2d/windows \ - -I$(SHARE_SRC)/native/sun/font \ - -I$(SHARE_SRC)/native/sun/java2d/pipe \ - -I$(SHARE_SRC)/native/sun/dc/path \ - -I$(SHARE_SRC)/native/sun/dc/doe \ - -I$(SHARE_SRC)/native/sun/awt/debug \ - -I$(PLATFORM_SRC)/native/sun/awt -# -I$(WINAWT_COMMON_native) - -# this is only required for compiling )/native/sun/awt/medialib/*.c files -# -OTHER_INCLUDES += -I$(SHARE_SRC)/native/sun/awt/medialib - -# -# .res file construction. -# - -ifdef OPENJDK - RC_FLAGS += -i "$(PLATFORM_SRC)/resource/icons" -else - RC_FLAGS += -i "$(CLOSED_SRC)/windows/native/sun/windows" -endif -VERSIONINFO_RESOURCE = $(WINAWT_native)/awt.rc - -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS -endif # PLATFORM - -ifneq ($(PLATFORM), windows) -# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS/LINUX - -# -# Other extra flags needed for compiling. -# - -ifeq ($(PLATFORM), linux) -CPPFLAGS += -I$(OPENWIN_HOME)/include \ - -I$(OPENWIN_HOME)/include/X11/extensions \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/font -endif -CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \ - -I$(SHARE_SRC)/native/$(PKGDIR)/image \ - -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \ - -I$(SHARE_SRC)/native/$(PKGDIR)/shell \ - -I$(SHARE_SRC)/native/$(PKGDIR)/medialib \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11 \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \ - -I$(PLATFORM_SRC)/native/$(PKGDIR) \ - $(EVENT_MODEL) - -ifeq ($(PLATFORM), linux) -LDFLAGS += -L$(OPENWIN_LIB) -endif - -LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ - $(AWT_RUNPATH) - -# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX -endif # PLATFORM - -CLASSES.export += java.io.InputStream \ - java.lang.Integer \ - java.lang.ThreadGroup - -.PHONY: dgalibs dgalib.clean fontconfigs fontconfigs.clean - diff --git a/jdk/makefiles/sun/awt/README b/jdk/makefiles/sun/awt/README deleted file mode 100644 index 2fe5bb639a6..00000000000 --- a/jdk/makefiles/sun/awt/README +++ /dev/null @@ -1,26 +0,0 @@ -README: - -This directory builds the new version of the Windows AWT. It's been built -successfully with Visual C++ 4.1, but since it uses very little of VC++'s -runtime, it will probably work with other versions of that compiler. - -Included in this project is a generated file, make.depend, which lists -all interdependencies of the source files. This file is generated *on -Solaris or Linux* with the following command: - - % gnumake -f Depend.mak - -This step only needs to be run when new files are added to the project, -or include statements are changed. - -Also, if new CClassHeader dependencies are added for Java class files -that are not built from a Java source file listed in java_awt.jmk or -windows_awt.jmk then you need to update the FILES_java list in the -"else" part of the "ifdef JFILES" branch in Depend.mak. -At some point we should look at a way to share the explicit list of -exported files between Depend.mak and GNUmakefile. - -****NOTE**** - In order to run this command, the executable -/usr/openwin/bin/makedepend is required to be in your $PATH. -****NOTE**** diff --git a/jdk/makefiles/sun/awt/make.depend b/jdk/makefiles/sun/awt/make.depend deleted file mode 100644 index 02b3b1672d1..00000000000 --- a/jdk/makefiles/sun/awt/make.depend +++ /dev/null @@ -1,357 +0,0 @@ -$(OBJDIR)/AccelGlyphCache.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/AlphaMacros.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/AlphaMath.obj:: ../../../src/share/native/sun/java2d/loops/AlphaMath.h - -$(OBJDIR)/Any3Byte.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/Any3Byte.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/Any4Byte.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/Any4Byte.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/AnyByte.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByte.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/AnyInt.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/AnyShort.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/awt_AWTEvent.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_BitmapUtil.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_BitmapUtil.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Brush.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Button.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Button.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WButtonPeer.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Button.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Canvas.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsConfig.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Checkbox.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Checkbox.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WCheckboxPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Checkbox.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Choice.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Choice.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Toolkit.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WChoicePeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Choice.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dimension.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Clipboard.obj:: $(CLASSHDRDIR)/sun_awt_windows_WClipboard.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Clipboard.h ../../../src/windows/native/sun/windows/awt_DataTransferer.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Color.obj:: $(CLASSHDRDIR)/sun_awt_windows_WColor.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Color.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Component.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Color.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_InputMethodEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_MouseWheelEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Insets.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Toolkit.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WInputMethod.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPanelPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jawt.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_BitmapUtil.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Cursor.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dimension.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_InputEvent.h ../../../src/windows/native/sun/windows/awt_InputTextInfor.h ../../../src/windows/native/sun/windows/awt_Insets.h ../../../src/windows/native/sun/windows/awt_KeyEvent.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_MouseEvent.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Container.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Cursor.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Cursor.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WCustomCursor.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WGlobalCursorManager.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Cursor.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_IconCursor.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_DataTransferer.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_TextComponent.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_datatransfer_DataTransferer.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDataTransferer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/common/locale_str.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_DataTransferer.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_TextComponent.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_DCHolder.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_DCHolder.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_ole.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Debug.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Desktop.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_DesktopProperties.obj:: $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_windows_WDesktopProperties.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DesktopProperties.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Dialog.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Dimension.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dimension.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_DnDDS.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_dnd_DnDConstants.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_dnd_SunDragSourceContextPeer.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDragSourceContextPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Cursor.h ../../../src/windows/native/sun/windows/awt_DataTransferer.h ../../../src/windows/native/sun/windows/awt_DCHolder.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DnDDS.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_ole.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_DnDDT.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_dnd_DnDConstants.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDropTargetContextPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_DataTransferer.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DnDDS.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_ole.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_DrawingSurface.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jawt.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jawt_md.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DrawingSurface.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Event.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Event.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_FileDialog.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_FileDialog.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFileDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_FileDialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Font.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDefaultFontCharset.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFontPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/Disposer.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Frame.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/java_lang_Integer.h $(CLASSHDRDIR)/sun_awt_EmbeddedFrame.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WEmbeddedFrame.h $(CLASSHDRDIR)/sun_awt_windows_WEmbeddedFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_IconCursor.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_GDIObject.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_IconCursor.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_IconCursor.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_ImageRep.obj:: $(CLASSHDRDIR)/sun_awt_image_ImageRepresentation.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/image/awt_parseImage.h ../../../src/share/native/sun/awt/image/imageInitIDs.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/awt_ImagingLib.obj:: $(CLASSHDRDIR)/java_awt_color_ColorSpace.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_image_BufferedImage.h $(CLASSHDRDIR)/java_awt_image_ConvolveOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_image_ImagingLib.h $(CLASSHDRDIR)/sun_awt_image_IntegerComponentRaster.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/image/awt_parseImage.h ../../../src/share/native/sun/awt/image/imageInitIDs.h ../../../src/share/native/sun/awt/medialib/awt_ImagingLib.h ../../../src/share/native/sun/awt/medialib/mlib_image_get.h ../../../src/share/native/sun/awt/medialib/mlib_image_types.h ../../../src/share/native/sun/awt/medialib/mlib_status.h ../../../src/share/native/sun/awt/medialib/mlib_types.h ../../../src/share/native/sun/awt/medialib/safe_alloc.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/awt_Mlib.h - -$(OBJDIR)/awt_InputEvent.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_InputEvent.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_InputMethod.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputMethodEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WInputMethod.h $(CLASSHDRDIR)/sun_awt_windows_WInputMethodDescriptor.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/common/locale_str.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_InputTextInfor.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_InputTextInfor.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Insets.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Insets.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_KeyboardFocusManager.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_KeyboardFocusManager.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_KeyEvent.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_KeyEvent.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Label.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Label.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WLabelPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Label.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_List.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_List.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WListPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dimension.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_List.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Menu.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_MenuBar.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_MenuItem.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_CheckboxMenuItem.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Toolkit.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCheckboxMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DesktopProperties.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Mlib.obj:: $(CLASSHDRDIR)/java_awt_image_BufferedImage.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/medialib/awt_ImagingLib.h ../../../src/share/native/sun/awt/medialib/mlib_image_get.h ../../../src/share/native/sun/awt/medialib/mlib_image_types.h ../../../src/share/native/sun/awt/medialib/mlib_status.h ../../../src/share/native/sun/awt/medialib/mlib_types.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt_Mlib.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_MouseEvent.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_MouseEvent.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_new.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_new.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Object.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_ole.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_ole.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Palette.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_CustomPaletteDef.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/img_util_md.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Panel.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Panel.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_parseImage.obj:: $(CLASSHDRDIR)/java_awt_color_ColorSpace.h $(CLASSHDRDIR)/java_awt_image_BufferedImage.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_image_ImagingLib.h $(CLASSHDRDIR)/sun_awt_image_IntegerComponentRaster.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/image/awt_parseImage.h ../../../src/share/native/sun/awt/image/imageInitIDs.h ../../../src/share/native/sun/awt/medialib/awt_ImagingLib.h ../../../src/share/native/sun/awt/medialib/mlib_image_get.h ../../../src/share/native/sun/awt/medialib/mlib_image_types.h ../../../src/share/native/sun/awt/medialib/mlib_status.h ../../../src/share/native/sun/awt/medialib/mlib_types.h ../../../src/share/native/sun/awt/medialib/safe_alloc.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/awt_Mlib.h - -$(OBJDIR)/awt_Pen.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_PopupMenu.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_PopupMenu.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPopupMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Event.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_PopupMenu.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_PrintControl.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_PrintControl.h ../../../src/windows/native/sun/windows/awt_PrintDialog.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_PrintDialog.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPrintDialog.h $(CLASSHDRDIR)/sun_awt_windows_WPrintDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_PrintControl.h ../../../src/windows/native/sun/windows/awt_PrintDialog.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_PrintJob.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPrinterJob.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_PrintControl.h ../../../src/windows/native/sun/windows/awt_PrintDialog.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Rectangle.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Rectangle.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Robot.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WRobotPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Robot.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Scrollbar.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Scrollbar.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WScrollbarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Scrollbar.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_ScrollPane.obj:: $(CLASSHDRDIR)/java_awt_Adjustable.h $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_AdjustmentEvent.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_Insets.h $(CLASSHDRDIR)/java_awt_Scrollbar.h $(CLASSHDRDIR)/java_awt_ScrollPane.h $(CLASSHDRDIR)/java_awt_ScrollPaneAdjustable.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WScrollbarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WScrollPanePeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Insets.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Panel.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Scrollbar.h ../../../src/windows/native/sun/windows/awt_ScrollPane.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_TextArea.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_TextArea.h $(CLASSHDRDIR)/java_awt_TextComponent.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextAreaPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_TextArea.h ../../../src/windows/native/sun/windows/awt_TextComponent.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_TextComponent.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_TextComponent.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_TextComponent.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_TextField.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_TextComponent.h $(CLASSHDRDIR)/java_awt_TextField.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WTextFieldPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_TextComponent.h ../../../src/windows/native/sun/windows/awt_TextField.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Toolkit.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputMethodEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_FileDialog.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_List.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_ComponentPeer.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_PopupMenu.h $(CLASSHDRDIR)/java_awt_Toolkit.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFileDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WListPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WPopupMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jawt.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jawt_md.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Clipboard.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Cursor.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_DesktopProperties.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_DnDDS.h ../../../src/windows/native/sun/windows/awt_DnDDT.h ../../../src/windows/native/sun/windows/awt_DrawingSurface.h ../../../src/windows/native/sun/windows/awt_FileDialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_InputEvent.h ../../../src/windows/native/sun/windows/awt_KeyEvent.h ../../../src/windows/native/sun/windows/awt_List.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_new.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_PopupMenu.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/CmdIDList.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/DllUtil.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_TrayIcon.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_ActionEvent.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_InputEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_TrayIcon.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WTrayIconPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_TrayIcon.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Win32GraphicsConfig.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_image_DataBuffer.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_Win32GraphicsConfig.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsConfig.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Win32GraphicsDevice.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_color_ColorSpace.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_image_DataBuffer.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_Win32GraphicsDevice.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/awt/image/dither.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/img_util_md.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Win32GraphicsEnv.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_Win32FontManager.h $(CLASSHDRDIR)/sun_awt_Win32GraphicsEnvironment.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/java2d/windows/WindowsFlags.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/DllUtil.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/awt_Window.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Container.h $(CLASSHDRDIR)/java_awt_Dialog.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_ComponentEvent.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_FontMetrics.h $(CLASSHDRDIR)/java_awt_Frame.h $(CLASSHDRDIR)/java_awt_Insets.h $(CLASSHDRDIR)/java_awt_Menu.h $(CLASSHDRDIR)/java_awt_MenuBar.h $(CLASSHDRDIR)/java_awt_MenuComponent.h $(CLASSHDRDIR)/java_awt_MenuItem.h $(CLASSHDRDIR)/java_awt_peer_MenuComponentPeer.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WDialogPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WFramePeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuBarPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuItemPeer.h $(CLASSHDRDIR)/sun_awt_windows_WMenuPeer.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_BitmapUtil.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Container.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Dialog.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_Frame.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_IconCursor.h ../../../src/windows/native/sun/windows/awt_Insets.h ../../../src/windows/native/sun/windows/awt_Menu.h ../../../src/windows/native/sun/windows/awt_MenuBar.h ../../../src/windows/native/sun/windows/awt_MenuItem.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Panel.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/Blit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_Blit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/BlitBg.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_BlitBg.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/BufferedMaskBlit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedMaskBlit.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedOpCodes.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntBgr.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/BufferedRenderPipe.obj:: $(CLASSHDRDIR)/sun_java2d_pipe_BufferedOpCodes.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedRenderPipe.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/BufImgSurfaceData.obj:: $(CLASSHDRDIR)/sun_awt_image_BufImgSurfaceData.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/image/BufImgSurfaceData.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/img_util_md.h - -$(OBJDIR)/ByteBinary1Bit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByteBinary.h ../../../src/share/native/sun/java2d/loops/ByteBinary1Bit.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/ByteBinary2Bit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByteBinary.h ../../../src/share/native/sun/java2d/loops/ByteBinary2Bit.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/ByteBinary4Bit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByteBinary.h ../../../src/share/native/sun/java2d/loops/ByteBinary4Bit.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/ByteGray.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/Index8Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/ByteIndexed.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/CmdIDList.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/CmdIDList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/ComCtl32Util.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/ComCtl32Util.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/D3DBlitLoops.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DBlitLoops.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntBgr.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/Ushort555Rgb.h ../../../src/share/native/sun/java2d/loops/Ushort565Rgb.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DBlitLoops.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/D3DBufImgOps.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DBufImgOps.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/D3DContext.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DBufImgOps.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DGlyphCache.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPaints.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DShaders.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DTextRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/D3DGlyphCache.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DGlyphCache.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DTextRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/D3DGraphicsDevice.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DGraphicsDevice.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/D3DMaskBlit.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskBlit.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/D3DMaskCache.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/D3DMaskFill.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DMaskFill.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskFill.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/D3DPaints.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DPaints_MultiGradient.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPaints.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/D3DPipelineManager.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DBadHardware.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/WindowsFlags.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/D3DRenderer.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DRenderer.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedRenderPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/D3DRenderQueue.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DBlitLoops.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedOpCodes.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedRenderPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DBlitLoops.h ../../../src/windows/native/sun/java2d/d3d/D3DBufImgOps.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskBlit.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskFill.h ../../../src/windows/native/sun/java2d/d3d/D3DPaints.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DTextRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/D3DResourceManager.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPaints.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DTextRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/D3DSurfaceData.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/java_awt_Window.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WCanvasPeer.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_awt_windows_WWindowPeer.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_BitmapUtil.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Canvas.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/awt_Window.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/D3DTextRenderer.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DTextRenderer.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DGlyphCache.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DRenderQueue.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DTextRenderer.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/D3DVertexCacher.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPaints.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/DataBufferNative.obj:: $(CLASSHDRDIR)/sun_awt_image_DataBufferNative.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/debug_assert.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/debug_mem.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/debug_trace.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/debug_util.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/Devices.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/java_awt_Transparency.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DContext_D3DContextCaps.h $(CLASSHDRDIR)/sun_java2d_d3d_D3DSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelDeviceEventNotifier.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/ShaderList.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/d3d/D3DContext.h ../../../src/windows/native/sun/java2d/d3d/D3DMaskCache.h ../../../src/windows/native/sun/java2d/d3d/D3DPipeline.h ../../../src/windows/native/sun/java2d/d3d/D3DPipelineManager.h ../../../src/windows/native/sun/java2d/d3d/D3DResourceManager.h ../../../src/windows/native/sun/java2d/d3d/D3DSurfaceData.h ../../../src/windows/native/sun/java2d/d3d/D3DVertexCacher.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/Disposer.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/Disposer.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/dither.obj:: ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/awt/image/dither.h ../../../src/windows/native/sun/windows/colordata.h - -$(OBJDIR)/DllUtil.obj:: ../../../src/windows/native/sun/windows/DllUtil.h - -$(OBJDIR)/DrawLine.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_DrawLine.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/DrawParallelogram.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_DrawParallelogram.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/ParallelogramUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/DrawPath.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_DrawPath.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/DrawPath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/ProcessPath.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/DrawPolygons.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_DrawPolygons.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/DrawRect.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_DrawRect.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/FillParallelogram.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_FillParallelogram.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/ParallelogramUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/FillPath.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_FillPath.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/DrawPath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/ProcessPath.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/FillRect.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_FillRect.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/FillSpans.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_FillSpans.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/FourByteAbgr.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/Any4Byte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/FourByteAbgr.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/FourByteAbgrPre.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/Any4Byte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/FourByteAbgrPre.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/GDIBlitLoops.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_windows_GDIBlitLoops.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/GDIHashtable.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/GDIRenderer.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/java_awt_geom_PathIterator.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_windows_GDIRenderer.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/GDIWindowSurfaceData.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h $(CLASSHDRDIR)/sun_java2d_windows_GDIWindowSurfaceData.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/Disposer.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/java2d/windows/WindowsFlags.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/gifdecoder.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/GraphicsPrimitiveMgr.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_GraphicsPrimitiveMgr.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/Hashtable.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/imageInitIDs.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/image/imageInitIDs.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/img_colors.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/img_globals.obj:: $(CLASSHDRDIR)/java_awt_image_DirectColorModel.h $(CLASSHDRDIR)/java_awt_image_IndexColorModel.h $(CLASSHDRDIR)/java_awt_Transparency.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/windows/javavm/export/jni_md.h - -$(OBJDIR)/Index12Gray.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/Index8Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/Index8Gray.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/Index8Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/initIDs.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/IntArgb.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/IntArgbBm.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/IntArgbPre.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/IntBgr.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/Index8Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntBgr.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/IntRgb.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/IntRgbx.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyInt.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/IntRgbx.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/MaskBlit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_MaskBlit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/MaskFill.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_MaskFill.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/ParallelogramUtils.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/MouseInfo.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/ObjectList.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/OGLBlitLoops.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLBlitLoops.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLBlitLoops.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/OGLBufImgOps.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLBufImgOps.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/OGLContext.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/OGLFuncs.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/OGLMaskBlit.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLMaskBlit.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/OGLMaskFill.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLMaskFill.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLMaskFill.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/opengl/OGLVertexCache.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/OGLPaints.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedPaints.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLPaints.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/OGLRenderer.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLRenderer.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedRenderPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderer.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/OGLRenderQueue.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLBlitLoops.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedOpCodes.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedRenderPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLBlitLoops.h ../../../src/share/native/sun/java2d/opengl/OGLBufImgOps.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLMaskBlit.h ../../../src/share/native/sun/java2d/opengl/OGLMaskFill.h ../../../src/share/native/sun/java2d/opengl/OGLPaints.h ../../../src/share/native/sun/java2d/opengl/OGLRenderer.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/opengl/OGLTextRenderer.h ../../../src/share/native/sun/java2d/opengl/OGLVertexCache.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/OGLSurfaceData.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/OGLTextRenderer.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLTextRenderer.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedTextPipe.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/font/AccelGlyphCache.h ../../../src/share/native/sun/font/fontscalerdefs.h ../../../src/share/native/sun/font/sunfontids.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/opengl/OGLTextRenderer.h ../../../src/share/native/sun/java2d/opengl/OGLVertexCache.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/OGLVertexCache.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h $(CLASSHDRDIR)/sun_java2d_SunGraphics2D.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLPaints.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/opengl/OGLVertexCache.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h - -$(OBJDIR)/ProcessPath.obj:: $(CLASSHDRDIR)/java_awt_geom_PathIterator.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/ProcessPath.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/Region.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h - -$(OBJDIR)/ScaledBlit.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/sun_java2d_loops_ScaledBlit.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/ShapeSpanIterator.obj:: $(CLASSHDRDIR)/java_awt_geom_PathIterator.h $(CLASSHDRDIR)/sun_java2d_pipe_ShapeSpanIterator.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/pipe/PathConsumer2D.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/ShellFolder2.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/SpanClipRenderer.obj:: $(CLASSHDRDIR)/sun_java2d_pipe_RegionIterator.h $(CLASSHDRDIR)/sun_java2d_pipe_SpanClipRenderer.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/SurfaceData.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/Disposer.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/ThemeReader.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_ThemeReader.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/ThreeByteBgr.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/Any3Byte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/Trace.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h - -$(OBJDIR)/TransformHelper.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_loops_TransformHelper.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/pipe/Region.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/awt/utility/rect.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/Ushort4444Argb.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/Ushort4444Argb.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/Ushort555Rgb.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/Ushort555Rgb.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/Ushort555Rgbx.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/Ushort555Rgbx.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/Ushort565Rgb.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/Ushort4444Argb.h ../../../src/share/native/sun/java2d/loops/Ushort565Rgb.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/UshortGray.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyShort.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/UshortIndexed.obj:: $(CLASSHDRDIR)/java_awt_AlphaComposite.h ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/sun/java2d/loops/AlphaMacros.h ../../../src/share/native/sun/java2d/loops/AlphaMath.h ../../../src/share/native/sun/java2d/loops/AnyByte.h ../../../src/share/native/sun/java2d/loops/ByteGray.h ../../../src/share/native/sun/java2d/loops/ByteIndexed.h ../../../src/share/native/sun/java2d/loops/GlyphImageRef.h ../../../src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h ../../../src/share/native/sun/java2d/loops/Index12Gray.h ../../../src/share/native/sun/java2d/loops/IntArgb.h ../../../src/share/native/sun/java2d/loops/IntArgbBm.h ../../../src/share/native/sun/java2d/loops/IntArgbPre.h ../../../src/share/native/sun/java2d/loops/IntDcm.h ../../../src/share/native/sun/java2d/loops/IntRgb.h ../../../src/share/native/sun/java2d/loops/LineUtils.h ../../../src/share/native/sun/java2d/loops/LoopMacros.h ../../../src/share/native/sun/java2d/loops/ThreeByteBgr.h ../../../src/share/native/sun/java2d/loops/UshortGray.h ../../../src/share/native/sun/java2d/loops/UshortIndexed.h ../../../src/share/native/sun/java2d/pipe/SpanIterator.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/sun/java2d/j2d_md.h - -$(OBJDIR)/WGLGraphicsConfig.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_opengl_WGLGraphicsConfig.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h ../../../src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h ../../../src/windows/native/sun/java2d/opengl/WGLSurfaceData.h - -$(OBJDIR)/WGLSurfaceData.obj:: $(CLASSHDRDIR)/java_awt_image_AffineTransformOp.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLContext_OGLContextCaps.h $(CLASSHDRDIR)/sun_java2d_opengl_OGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_opengl_WGLSurfaceData.h $(CLASSHDRDIR)/sun_java2d_pipe_BufferedContext.h $(CLASSHDRDIR)/sun_java2d_pipe_hw_AccelSurface.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/gdefs.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/gl.h ../../../src/share/native/sun/java2d/opengl/J2D_GL/glext.h ../../../src/share/native/sun/java2d/opengl/OGLContext.h ../../../src/share/native/sun/java2d/opengl/OGLFuncMacros.h ../../../src/share/native/sun/java2d/opengl/OGLFuncs.h ../../../src/share/native/sun/java2d/opengl/OGLRenderQueue.h ../../../src/share/native/sun/java2d/opengl/OGLSurfaceData.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/gdefs_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/j2d_md.h ../../../src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h ../../../src/windows/native/sun/java2d/opengl/OGLFuncs_md.h ../../../src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h ../../../src/windows/native/sun/java2d/opengl/WGLSurfaceData.h - -$(OBJDIR)/WindowsFlags.obj:: ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/WindowsFlags.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/stdhdrs.h - -$(OBJDIR)/WPrinterJob.obj:: $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/classfile_constants.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_PrintControl.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/stdhdrs.h diff --git a/jdk/makefiles/sun/awt/mawt.gmk b/jdk/makefiles/sun/awt/mawt.gmk deleted file mode 100644 index e0dd783b256..00000000000 --- a/jdk/makefiles/sun/awt/mawt.gmk +++ /dev/null @@ -1,229 +0,0 @@ -# -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# to create directory: -# -INIT += $(LIB_LOCATION) - -# -# Files -# -# mawt.gmk is just used in building X/Motif native code, so -# this list of java files is no longer included. -#include FILES_java_unix.gmk -include $(BUILDDIR)/sun/awt/FILES_c_unix.gmk - -include $(BUILDDIR)/sun/awt/FILES_export_unix.gmk - -# Check which C files should be built. Headless uses only -# non-motif files. Also, a version-specific motif file is -# compiled based on the motif version. -FILES_c = $(FILES_NO_MOTIF_c) - -ifeq ($(PLATFORM), solaris) - ifneq ($(ARCH), amd64) - FILES_reorder += reorder-$(ARCH) - endif -endif - -# -# Rules -# - -# Class files should be built & clobbered in make/sun/awt -# If removing this line, also reinclude sun_awt.jmk -DONT_CLOBBER_CLASSES = true - - -ifndef HEADLESS -ifeq ($(VARIANT), OPT) -FILES_m = ../awt/mapfile-mawt-vers -endif -endif - -# Since this library will be living in a subdirectory below the other libraries -# we need to add an extra runpath so that libraries in the upper directory -# are found at runtime. -LD_RUNPATH_EXTRAS = .. - -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -$(LIB_LOCATION): - $(MKDIR) -p $@ - -clean:: - -# -# Add to the ambient vpath to pick up files in subdirectories -# -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/alphacomposite -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/gif -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/cvutils -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/shell -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/medialib -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl -vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl -vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11 -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/debug -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../font -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe -vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)/image -vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/robot_child - -# -# Libraries to link in. -# - - -ifeq ($(DEBUG_BINARIES), true) - CFLAGS += -g -endif -ifeq ($(HEADLESS),true) -CFLAGS += -DHEADLESS=$(HEADLESS) -CPPFLAGS += -DHEADLESS=$(HEADLESS) -OTHER_LDLIBS = -else -LIBXTST = -lXtst -ifeq ($(PLATFORM), linux) - ifeq ($(ARCH_DATA_MODEL), 64) - # XXX what about the rest of them? - LIBXT = -lXt - else - # Allows for builds on Debian GNU Linux, X11 is in a different place - LIBXT = $(firstword $(wildcard $(OPENWIN_LIB)/libXt.a) \ - $(wildcard /usr/lib/libXt.a)) - LIBSM = $(firstword $(wildcard $(OPENWIN_LIB)/libSM.a) \ - $(wildcard /usr/lib/libSM.a)) - LIBICE = $(firstword $(wildcard $(OPENWIN_LIB)/libICE.a) \ - $(wildcard /usr/lib/libICE.a)) - LIBXTST = $(firstword $(wildcard $(OPENWIN_LIB)/libXtst.a) \ - $(wildcard /usr/lib/libXtst.a)) - endif -endif - -# Use -lXmu for EditRes support -LIBXMU_DBG = -lXmu -LIBXMU_OPT = -LIBXMU = $(LIBXMU_$(VARIANT)) - -ifeq ($(PLATFORM), solaris) -OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi -endif - -ifneq (,$(findstring $(PLATFORM), linux macosx)) -OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH -# XXX what is this define below? Isn't it motif-related? -OTHER_CFLAGS += -DXMSTRINGDEFINES=1 -OTHER_LDLIBS = $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi -endif - -endif -# !HEADLESS - -OTHER_LDLIBS += $(JVMLIB) $(LIBCXX) \ - -lawt $(LIBM) $(LIBDL) - -# -# Sun CC with -Xa misdefines __STDC__ to 0 (zero). -# The following will force checking of X11 prototypes. -# -ifneq ($(CC_VERSION),gcc) -CPPFLAGS += -DFUNCPROTO=15 -endif - -# -# Other extra flags needed for compiling. -# -CPPFLAGS += $(CUPS_CFLAGS) - -ifndef HEADLESS -CPPFLAGS += -I$(OPENWIN_HOME)/include -LDFLAGS += -L$(OPENWIN_LIB) - -endif # !HEADLESS - -CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \ - -I$(SHARE_SRC)/native/$(PKGDIR)/image \ - -I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \ - -I$(SHARE_SRC)/native/$(PKGDIR)/shell \ - -I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \ - -I$(SHARE_SRC)/native/$(PKGDIR)/medialib \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/x11 \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \ - -I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \ - -I$(PLATFORM_SRC)/native/$(PKGDIR) \ - $(EVENT_MODEL) - -ifeq ($(PLATFORM), macosx) -CPPFLAGS += -I$(CUPS_HEADERS_PATH) - -ifndef HEADLESS -CPPFLAGS += -I$(MOTIF_DIR)/include \ - -I$(OPENWIN_HOME)/include -LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) - -endif # !HEADLESS -endif # PLATFORM - -ifeq ($(PLATFORM), linux) - # Checking for the X11/extensions headers at the additional location - CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \ - $(wildcard /usr/include/X11/extensions)) -endif - -ifeq ($(PLATFORM), macosx) - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ - -I$(OPENWIN_HOME)/include -endif - -ifeq ($(PLATFORM), solaris) - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -endif - -ifeq ($(PLATFORM), macosx) - CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" -endif - -LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ - $(AWT_RUNPATH) - -CLASSES.export += java.io.InputStream \ - java.lang.ThreadGroup - diff --git a/jdk/makefiles/sun/cmm/Makefile b/jdk/makefiles/sun/cmm/Makefile deleted file mode 100644 index 1f611069aba..00000000000 --- a/jdk/makefiles/sun/cmm/Makefile +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -ifdef OPENJDK - SUBDIRS += - ICCPROFILE_SRC_DIR = $(SHARE_SRC)/lib/cmm/lcms -else # !OPENJDK - SUBDIRS += kcms - ICCPROFILE_SRC_DIR = $(CLOSED_SRC)/share/lib/cmm/kcms -endif # OPENJDK - -include $(BUILDDIR)/common/Subdirs.gmk - -# -# ICC Profiles used by the CMM. -# -#ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm - -#iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \ -# $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \ -# $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf - -$(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf - $(install-file) - $(call chmod-file, 444) - -$(ICCPROFILE_DEST_DIR)/GRAY.pf: $(ICCPROFILE_SRC_DIR)/GRAY.pf - $(install-file) - $(call chmod-file, 444) - -$(ICCPROFILE_DEST_DIR)/CIEXYZ.pf: $(ICCPROFILE_SRC_DIR)/CIEXYZ.pf - $(install-file) - $(call chmod-file, 444) - -$(ICCPROFILE_DEST_DIR)/PYCC.pf: $(ICCPROFILE_SRC_DIR)/PYCC.pf - $(install-file) - $(call chmod-file, 444) - -$(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf: $(ICCPROFILE_SRC_DIR)/LINEAR_RGB.pf - $(install-file) - $(call chmod-file, 444) - -iccprofiles.clean: - $(RM) -r $(ICCPROFILE_DEST_DIR) - - -clobber: iccprofiles.clean - $(SUBDIRS-loop) - -clean: iccprofiles.clean - $(SUBDIRS-loop) - -all build:: # iccprofiles - $(SUBDIRS-loop) - -openjdk:: - $(MAKE) OPENJDK=true build - -.PHONY: iccprofiles iccprofiles.clean copy-files openjdk diff --git a/jdk/makefiles/sun/cmm/kcms/FILES_c_unix.gmk b/jdk/makefiles/sun/cmm/kcms/FILES_c_unix.gmk deleted file mode 100644 index cd20c775477..00000000000 --- a/jdk/makefiles/sun/cmm/kcms/FILES_c_unix.gmk +++ /dev/null @@ -1,134 +0,0 @@ -# -# Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - attrmgr.c \ - auxpt.c \ - calc.c \ - calcgtbl.c \ - calcitbl.c \ - calcmtbl.c \ - calcotbl.c \ - chainsu.c \ - chnrules.c \ - cmpsatt.c \ - cmpsattf.c \ - cmyklin.c \ - combine.c \ - compilut.c \ - compitbl.c \ - compose.c \ - compotbl.c \ - convert1.c \ - copy.c \ - crc32.c \ - dispatch.c \ - doevalsw.c \ - eval.c \ - evalth13.c \ - evalth14.c \ - evalth1c.c \ - evalth1g.c \ - f4lex.c \ - filemap.c \ - fmtdata.c \ - futiomem.c \ - futiotbl.c \ - futmft2.c \ - fwdmono.c \ - fwdxform.c \ - fxnull.c \ - invmono.c \ - invxform.c \ - io.c \ - io_swab.c \ - ioencode.c \ - iomf.c \ - iotable.c \ - kcms_io.c \ - kcpmgr.c \ - kcpmgru.c \ - kpfile.c \ - kplib.c \ - kpmd5.c \ - lab2uvl.c \ - lab2xyz.c \ - lensity.c \ - linlab.c \ - logrgb.c \ - loguvl.c \ - malloc.c \ - mat2fut.c \ - matrix.c \ - memory.c \ - moncurv.c \ - new.c \ - outmat.c \ - profile.c \ - profilem.c \ - ptchain.c \ - pteval.c \ - ptinvert.c \ - ptiomem.c \ - pttmgr.c \ - rel2abs.c \ - resize.c \ - share.c \ - solvemat.c \ - spattpr.c \ - spattr.c \ - spattrio.c \ - spcvrt.c \ - speval.c \ - splink.c \ - splut.c \ - sprofile.c \ - sprofpr.c \ - spsave.c \ - spsearch.c \ - spsys.c \ - spsystem.c \ - sptagio.c \ - sptagmgr.c \ - sputilpr.c \ - spxf_gen.c \ - spxfcvrt.c \ - spxfgpr.c \ - spxfmtag.c \ - spxform.c \ - spxfprv.c \ - spxfromr.c \ - sync.c \ - systime.c \ - thread.c \ - thredmem.c \ - ukcpmgr.c \ - unixmem.c \ - util.c \ - uvl2lab.c \ - xfers.c \ - xyz2lab.c \ - xyzmap.c \ - CMM.c diff --git a/jdk/makefiles/sun/cmm/kcms/FILES_c_windows.gmk b/jdk/makefiles/sun/cmm/kcms/FILES_c_windows.gmk deleted file mode 100644 index de1a9298358..00000000000 --- a/jdk/makefiles/sun/cmm/kcms/FILES_c_windows.gmk +++ /dev/null @@ -1,138 +0,0 @@ -# -# Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - attrmgr.c \ - auxpt.c \ - calc.c \ - calcgtbl.c \ - calcitbl.c \ - calcmtbl.c \ - calcotbl.c \ - chainsu.c \ - chnrules.c \ - cmmdll.c \ - cmpsatt.c \ - cmpsattf.c \ - cmyklin.c \ - combine.c \ - compilut.c \ - compitbl.c \ - compose.c \ - compotbl.c \ - convert1.c \ - copy.c \ - crc32.c \ - dispatch.c \ - doevalsw.c \ - eval.c \ - evalth13.c \ - evalth14.c \ - evalth1c.c \ - evalth1g.c \ - f4lex.c \ - filemap.c \ - fmtdata.c \ - futiomem.c \ - futiotbl.c \ - futmft2.c \ - fwdmono.c \ - fwdxform.c \ - fxnull.c \ - invmono.c \ - invxform.c \ - io.c \ - io_swab.c \ - ioencode.c \ - iomf.c \ - iotable.c \ - kcms_io.c \ - kcpmgr.c \ - kcpmgru.c \ - kpfile.c \ - kplib.c \ - kpmd5.c \ - lab2uvl.c \ - lab2xyz.c \ - lensity.c \ - linlab.c \ - logrgb.c \ - loguvl.c \ - malloc.c \ - mat2fut.c \ - matrix.c \ - memory.c \ - moncurv.c \ - new.c \ - outmat.c \ - profile.c \ - profilem.c \ - ptchain.c \ - pteval.c \ - ptinvert.c \ - ptiomem.c \ - pttmgr.c \ - registry.c \ - rel2abs.c \ - resize.c \ - share.c \ - solvemat.c \ - spattpr.c \ - spattr.c \ - spattrio.c \ - spcvrt.c \ - speval.c \ - splink.c \ - splut.c \ - sprofile.c \ - sprofpr.c \ - spsave.c \ - spsearch.c \ - spsys.c \ - spsystem.c \ - sptagio.c \ - sptagmgr.c \ - sputilpr.c \ - spxf_gen.c \ - spxfcvrt.c \ - spxffile.c \ - spxfgpr.c \ - spxfmtag.c \ - spxform.c \ - spxfprv.c \ - spxfromr.c \ - sync.c \ - sysinfo.c \ - systime.c \ - thread.c \ - thredmem.c \ - util.c \ - uvl2lab.c \ - winmem.c \ - wkcpmgr.c \ - xfers.c \ - xyz2lab.c \ - xyzmap.c \ - CMM.c diff --git a/jdk/makefiles/sun/cmm/kcms/Makefile b/jdk/makefiles/sun/cmm/kcms/Makefile deleted file mode 100644 index 50b525671c5..00000000000 --- a/jdk/makefiles/sun/cmm/kcms/Makefile +++ /dev/null @@ -1,108 +0,0 @@ -# -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = sun.java2d.cmm.kcms -LIBRARY = kcms -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -ifeq ($(PLATFORM), windows) -include FILES_c_windows.gmk -else # PLATFORM -include FILES_c_unix.gmk -endif # PLATFORM - -FILES_java = \ - sun/java2d/cmm/kcms/CMM.java - -FILES_export = \ - sun/java2d/cmm/kcms/CMM.java - -ifeq ($(PLATFORM), windows) - # Override the default version info with our own resource file (see 5043594) - VERSIONINFO_RESOURCE = $(CLOSED_SRC)/share/native/sun/java2d/cmm/kcms/cmm.rc -endif - -# Rules -# -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -SERVICEDIR = $(CLASSBINDIR)/META-INF/services - -FILES_copy = \ - $(SERVICEDIR)/sun.java2d.cmm.PCMM - - -build: copy-files - -copy-files: $(FILES_copy) - -$(SERVICEDIR)/%: $(CLOSED_SRC)/share/classes/sun/java2d/cmm/kcms/META-INF/services/% - $(install-file) - -# -# Extra rules -# -ifeq ($(PLATFORM), linux) - LDLIBS += -lpthread - OTHER_CFLAGS += -Wno-missing-field-initializers -endif - -clean clobber:: - $(RM) $(FILES_copy) - -# -# Add to ambient vpath to get files in a subdirectory -# -vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR) - -ifeq ($(PLATFORM), windows) - -OTHER_LDLIBS = user32.lib version.lib - -clean:: res.clean - -res.clean: - $(RM) $(OBJDIR)/cmm.rc - $(RM) $(OBJDIR)/cmm.res - $(RM) $(OBJDIR)/cmm.h - -else # PLATFORM -OTHER_LDLIBS = $(LIBM) - -# Use pic instead of PIC on this library -GLOBAL_KPIC = $(PIC_CODE_SMALL) - -CPPFLAGS += -I$(CLASSHDRDIR) \ - -endif # PLATFORM - -CFLAGS += -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST - diff --git a/jdk/makefiles/sun/dcpr/FILES_c.gmk b/jdk/makefiles/sun/dcpr/FILES_c.gmk deleted file mode 100644 index 898f66e248d..00000000000 --- a/jdk/makefiles/sun/dcpr/FILES_c.gmk +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - CJError.c \ - doeObject.c \ - doeSun.c \ - dcPool.c \ - CJPathConsumer.c \ - CJPathConsumer2D.c \ - dcPathConsumer.c \ - dcPathStore.c \ - dcPathError.c \ - dcPathException.c \ - PathFiller.c \ - PathDasher.c \ - PathStroker.c \ - dcLLFiller.c \ - dcLLFillerH.c \ - dcLLFillerS.c \ - dcPRError.c \ - dcPRException.c \ - dcPathFiller.c \ - dcPathDasher.c \ - dcPathStorage.c \ - dcPathStroker.c \ - affine.c \ - angles.c \ - arcs.c \ diff --git a/jdk/makefiles/sun/dcpr/Makefile b/jdk/makefiles/sun/dcpr/Makefile deleted file mode 100644 index fb22b1d3f72..00000000000 --- a/jdk/makefiles/sun/dcpr/Makefile +++ /dev/null @@ -1,93 +0,0 @@ -# -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PACKAGE = sun.dc -LIBRARY = dcpr -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -include FILES_c.gmk - -FILES_java = \ - sun/dc/DuctusRenderingEngine.java \ - sun/dc/path/FastPathProducer.java \ - sun/dc/path/PathConsumer.java \ - sun/dc/path/PathError.java \ - sun/dc/path/PathException.java \ - sun/dc/pr/PathDasher.java \ - sun/dc/pr/PathFiller.java \ - sun/dc/pr/PathStroker.java \ - sun/dc/pr/PRError.java \ - sun/dc/pr/PRException.java \ - sun/dc/pr/Rasterizer.java - -FILES_export = \ - sun/dc/pr/PathDasher.java \ - sun/dc/pr/PathFiller.java \ - sun/dc/pr/PathStroker.java - -# -# Rules. -# -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -SERVICEDIR = $(CLASSBINDIR)/META-INF/services - -FILES_copy = \ - $(SERVICEDIR)/sun.java2d.pipe.RenderingEngine - -build: copy-files - -copy-files: $(FILES_copy) - -$(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/dc/META-INF/services/% - $(install-file) - -# -# Add to the ambient vpath to pick up files in subdirectories -# -vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)/doe -vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)/path -vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)/pr -vpath %.c $(CLOSED_SRC)/share/native/$(PKGDIR)/util -vpath %.c $(SHARE_SRC)/native/sun/java2d/pipe - -ifneq ($(PLATFORM), windows) - OTHER_LDLIBS = $(LIBM) -endif # PLATFORM - -CPPFLAGS += \ - -I$(CLOSED_SRC)/share/native/$(PKGDIR)/doe \ - -I$(CLOSED_SRC)/share/native/$(PKGDIR)/path \ - -I$(CLOSED_SRC)/share/native/$(PKGDIR)/pr \ - -I$(CLOSED_SRC)/share/native/$(PKGDIR)/util \ - -I$(SHARE_SRC)/native/sun/java2d/pipe \ - -I$(PLATFORM_SRC)/native/sun/java2d - diff --git a/jdk/makefiles/sun/headless/Makefile b/jdk/makefiles/sun/headless/Makefile deleted file mode 100644 index 2b3aae4fd76..00000000000 --- a/jdk/makefiles/sun/headless/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -HEADLESS = true -NO_ROBOT = true -MOTIF_VERSION = none -MOTIF_VERSION_STRING=none - -PACKAGE = sun.awt -LIBRARY = awt_headless -PRODUCT = sun - -include $(BUILDDIR)/common/Defs.gmk - -ifdef BUILD_HEADLESS - include $(BUILDDIR)/sun/awt/mawt.gmk -else - all build clean clobber :: - # do nothing case -endif - diff --git a/jdk/makefiles/sun/image/Makefile b/jdk/makefiles/sun/image/Makefile deleted file mode 100644 index 7056ed97faa..00000000000 --- a/jdk/makefiles/sun/image/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# -# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building the generic and vis versions of medialib -# - -BUILDDIR = ../.. -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -SUBDIRS = generic - -# solaris-sparc and solaris-sparcv9 both build 'vis' -ifeq ($(PLATFORM),solaris) - ifeq ($(ARCH),sparc) - SUBDIRS += vis - endif - ifeq ($(ARCH),sparcv9) - SUBDIRS += vis - endif -endif - -include $(BUILDDIR)/common/Subdirs.gmk - -all build clean clobber:: - $(SUBDIRS-loop) - diff --git a/jdk/makefiles/sun/image/generic/FILES_c.gmk b/jdk/makefiles/sun/image/generic/FILES_c.gmk deleted file mode 100644 index dda8c407976..00000000000 --- a/jdk/makefiles/sun/image/generic/FILES_c.gmk +++ /dev/null @@ -1,96 +0,0 @@ -# -# Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -IMAGE_AFFINE_FILES = \ - mlib_ImageAffine_NN.c \ - mlib_ImageAffine_NN_Bit.c \ - mlib_ImageAffine_BC_S32.c \ - mlib_ImageAffine_BC_D64.c \ - mlib_ImageAffine_BC_F32.c \ - mlib_ImageAffine_BL_S32.c \ - mlib_ImageAffine_BL_D64.c \ - mlib_ImageAffine_BL_F32.c \ - mlib_c_ImageAffine_NN.c \ - mlib_c_ImageAffine_BL.c \ - mlib_c_ImageAffine_BL_S16.c \ - mlib_c_ImageAffine_BL_U16.c \ - mlib_c_ImageAffine_BC.c \ - mlib_c_ImageAffine_BC_S16.c \ - mlib_c_ImageAffine_BC_U16.c \ - mlib_c_ImageAffineIndex_BC.c \ - mlib_c_ImageAffineIndex_BL.c \ - mlib_ImageAffineEdge.c \ - mlib_ImageScanPoly.c \ - mlib_ImageColorTrue2Index.c \ - mlib_ImageDivTables.c \ - mlib_c_ImageThresh1_U8.c \ - mlib_ImageFilters.c \ - -IMAGE_LOOKUP_FILES = \ - mlib_c_ImageLookUp_f.c \ - mlib_ImageLookUp_64.c \ - mlib_ImageLookUp_Bit.c \ - mlib_c_ImageCopy.c \ - -IMAGE_CONV_FILES = \ - mlib_ImageConv_16ext.c \ - mlib_ImageConv_u16ext.c \ - mlib_ImageConvMxN_ext.c \ - mlib_ImageConvMxN_Fp.c \ - mlib_ImageConv_8ext.c \ - mlib_c_ImageConv_f.c \ - mlib_ImageClipping.c \ - mlib_c_ImageConvCopyEdge.c \ - mlib_c_ImageConvClearEdge.c \ - mlib_ImageConv_8nw.c \ - mlib_ImageConv_16nw.c \ - mlib_ImageConv_u16nw.c \ - mlib_ImageConv_32nw.c \ - mlib_ImageConv_F32nw.c \ - mlib_ImageConv_D64nw.c \ - mlib_ImageConv2x2_f.c \ - mlib_ImageConvClearEdge_Fp.c \ - mlib_ImageConvCopyEdge_Bit.c \ - mlib_ImageConvClearEdge_Bit.c \ - mlib_ImageCopy_Bit.c \ - mlib_c_ImageConvVersion.c \ - - -SHARE_SYS_FILES = \ - mlib_sys.c \ - mlib_ImageUtils.c \ - - -FILES_c = \ - mlib_ImageAffine.c \ - mlib_ImageCreate.c \ - mlib_c_ImageLookUp.c \ - mlib_ImageConvMxN.c \ - mlib_ImageConvKernelConvert.c \ - $(IMAGE_AFFINE_FILES) \ - $(IMAGE_LOOKUP_FILES) \ - $(IMAGE_CONV_FILES) \ - $(SHARE_SYS_FILES) \ - diff --git a/jdk/makefiles/sun/image/generic/Makefile b/jdk/makefiles/sun/image/generic/Makefile deleted file mode 100644 index d68eae07971..00000000000 --- a/jdk/makefiles/sun/image/generic/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building the generic version of medialib -# - -BUILDDIR = ../../.. -PACKAGE = sun.awt.medialib -LIBRARY = mlib_image -PRODUCT = sun - -# Use highest level of optimization on this library -OPTIMIZATION_LEVEL = HIGHEST - -include $(BUILDDIR)/common/Defs.gmk - -# -# Use mapfile -# -FILES_m = mapfile-vers -include $(BUILDDIR)/common/Mapfile-vers.gmk - -# -# Files -# -include FILES_c.gmk - -# -# Rules -# -include $(BUILDDIR)/common/Library.gmk - -# -# set compile options for solaris 32- or 64-bit build -# -ifeq ($(ARCH_DATA_MODEL), 64) - CFLAGS += -DMLIB_OS64BIT -endif # ARCH_DATA_MODEL - -ifneq ($(PLATFORM), sparc) - OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH -endif - -CPPFLAGS += \ - -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib - -OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES - -ifneq ($(PLATFORM), windows) - OTHER_LDLIBS = $(LIBM) $(LIBDL) -endif - diff --git a/jdk/makefiles/sun/image/vis/FILES_c.gmk b/jdk/makefiles/sun/image/vis/FILES_c.gmk deleted file mode 100644 index 8f61ba66e6d..00000000000 --- a/jdk/makefiles/sun/image/vis/FILES_c.gmk +++ /dev/null @@ -1,162 +0,0 @@ -# -# Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -REQUIRED_NATIVE_FILES = \ - mlib_v_ImageLookUp.c \ - -REQUIRED_SHARE_FILES = \ - mlib_ImageCreate.c \ - mlib_ImageAffine.c \ - mlib_ImageConvMxN.c \ - mlib_ImageConvKernelConvert.c \ - -SYS_SHARE_FILES = \ - mlib_sys.c \ - -RADIO_SHARE_FILES = \ - mlib_ImageLookUp_64.c \ - mlib_ImageLookUp_Bit.c \ - mlib_ImageColorTrue2Index.c \ - mlib_c_ImageThresh1_U8.c \ - - -RADIO_NATIVE_FILES = \ - mlib_v_ImageLookUpS16S16Func.c \ - mlib_v_ImageLookUpS16S32Func.c \ - mlib_v_ImageLookUpS16U16Func.c \ - mlib_v_ImageLookUpS16U8Func.c \ - mlib_v_ImageLookUpS32S16Func.c \ - mlib_v_ImageLookUpS32S32Func.c \ - mlib_v_ImageLookUpS32U16Func.c \ - mlib_v_ImageLookUpS32U8Func.c \ - mlib_v_ImageLookUpSIS16S16Func.c \ - mlib_v_ImageLookUpSIS16S32Func.c \ - mlib_v_ImageLookUpSIS16U16Func.c \ - mlib_v_ImageLookUpSIS16U8Func.c \ - mlib_v_ImageLookUpSIS32S16Func.c \ - mlib_v_ImageLookUpSIS32S32Func.c \ - mlib_v_ImageLookUpSIS32U16Func.c \ - mlib_v_ImageLookUpSIS32U8Func.c \ - mlib_v_ImageLookUpSIU16S16Func.c \ - mlib_v_ImageLookUpSIU16S32Func.c \ - mlib_v_ImageLookUpSIU16U16Func.c \ - mlib_v_ImageLookUpSIU16U8Func.c \ - mlib_v_ImageLookUpSIU8S16Func.c \ - mlib_v_ImageLookUpSIU8S32Func.c \ - mlib_v_ImageLookUpSIU8U16Func.c \ - mlib_v_ImageLookUpSIU8U8Func.c \ - mlib_v_ImageLookUpU16S16Func.c \ - mlib_v_ImageLookUpU16S32Func.c \ - mlib_v_ImageLookUpU16U16Func.c \ - mlib_v_ImageLookUpU16U8Func.c \ - mlib_v_ImageLookUpU8S16Func.c \ - mlib_v_ImageLookUpU8S32Func.c \ - mlib_v_ImageLookUpU8U16Func.c \ - mlib_v_ImageLookUpU8U8Func.c \ - -GEOM_NATIVE_FILES = \ - mlib_v_ImageAffineIndex_BC.c \ - mlib_v_ImageAffine_BC.c \ - mlib_v_ImageAffine_BC_S16.c \ - mlib_v_ImageAffine_BC_U16.c \ - mlib_v_ImageAffine_BL.c \ - mlib_v_ImageAffine_BL_S16.c \ - mlib_v_ImageAffine_BL_U16.c \ - mlib_v_ImageAffine_NN.c \ - mlib_v_ImageFilters.c \ - -GEOM_SHARE_FILES = \ - mlib_ImageAffineEdge.c \ - mlib_ImageAffine_BC_D64.c \ - mlib_ImageAffine_BC_F32.c \ - mlib_ImageAffine_BC_S32.c \ - mlib_ImageAffine_BL_D64.c \ - mlib_ImageAffine_BL_F32.c \ - mlib_ImageAffine_BL_S32.c \ - mlib_ImageAffine_NN.c \ - mlib_ImageAffine_NN_Bit.c \ - mlib_ImageFilters.c \ - mlib_ImageScanPoly.c \ - -SPATIAL_SHARED_FILES = \ - mlib_ImageConv_8nw.c \ - mlib_ImageConv_8ext.c \ - mlib_ImageConv_16nw.c \ - mlib_ImageConv_16ext.c \ - mlib_ImageConv_u16nw.c \ - mlib_ImageConv_u16ext.c \ - mlib_ImageConv_32nw.c \ - mlib_ImageConv_F32nw.c \ - mlib_ImageConvMxN_Fp.c \ - mlib_ImageConvMxN_ext.c \ - mlib_ImageConv_D64nw.c \ - mlib_ImageClipping.c \ - mlib_ImageConvCopyEdge_Bit.c \ - mlib_ImageConvClearEdge_Bit.c \ - mlib_ImageConv2x2_f.c \ - mlib_ImageConvClearEdge_Fp.c \ - -SPATIAL_NATIVE_FILES = \ - mlib_v_ImageConvMxN_8.c \ - mlib_v_ImageConvClearEdge.c \ - mlib_v_ImageConvCopyEdge.c \ - mlib_v_ImageConvMxN_8ext.c \ - mlib_v_ImageConvVersion.c \ - mlib_v_ImageConv_8nw.c \ - mlib_ImageConvCopyEdge_Fp.c \ - -FORMAT_NATIVE_FILES = \ - mlib_v_ImageChannelInsert_1.c \ - mlib_v_ImageChannelExtract_43.c \ - mlib_v_ImageChannelExtract_1.c \ - -COPY_SHARED_FILES = \ - mlib_ImageCopy_Bit.c \ - -COPY_NATIVE_FILES = \ - mlib_v_ImageCopy_f.c \ - -COMMON_SHARED_FILES = \ - mlib_ImageUtils.c \ - mlib_ImageDivTables.c \ - -NATIVE_FILES = \ - $(REQUIRED_NATIVE_FILES) \ - -FILES_c = \ - $(REQUIRED_NATIVE_FILES) \ - $(REQUIRED_SHARE_FILES) \ - $(RADIO_SHARE_FILES) \ - $(RADIO_NATIVE_FILES) \ - $(GEOM_NATIVE_FILES) \ - $(GEOM_SHARE_FILES) \ - $(SPATIAL_SHARED_FILES) \ - $(SPATIAL_NATIVE_FILES) \ - $(FORMAT_NATIVE_FILES) \ - $(SYS_SHARE_FILES) \ - $(COPY_SHARED_FILES) \ - $(COPY_NATIVE_FILES) \ - $(COMMON_SHARED_FILES) \ - diff --git a/jdk/makefiles/sun/image/vis/Makefile b/jdk/makefiles/sun/image/vis/Makefile deleted file mode 100644 index 6281803723e..00000000000 --- a/jdk/makefiles/sun/image/vis/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building the VIS (solaris-only) version of medialib -# -BUILDDIR = ../../.. -PACKAGE = sun.awt.medialib -LIBRARY = mlib_image_v -PRODUCT = sun - -# Tell Defs.gmk we need VIS instructions -VIS_NEEDED=true - -# Select highest level of optimization for this library -OPTIMIZATION_LEVEL = HIGHEST - -include $(BUILDDIR)/common/Defs.gmk - -# -# Use generic mapfile -# -FILES_m = ../generic/mapfile-vers -include $(BUILDDIR)/common/Mapfile-vers.gmk - -# -# Files -# -include FILES_c.gmk - -# -# Rules -# -include $(BUILDDIR)/common/Library.gmk - -vpath %.s $(PLATFORM_SRC)/native/sun/awt/medialib -vpath %.c $(SHARE_SRC)/native/sun/awt/medialib - -# -# set compile options for solaris 32- or 64-bit build -# -ASFLAGS += -P -CFLAGS_sparcv9 = -DMLIB_OS64BIT -INLINE = $(PLATFORM_SRC)/native/sun/awt/medialib/vis_$(ARCH_DATA_MODEL).il - -CFLAGS += $(CFLAGS_$(ARCH)) $(INLINE) -I$(PLATFORM_SRC)/native/sun/awt/medialib -I$(SHARE_SRC)/native/sun/awt/medialib - -OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES -OTHER_LDLIBS = $(LIBM) $(LIBDL) - diff --git a/jdk/makefiles/sun/jdbc/Makefile b/jdk/makefiles/sun/jdbc/Makefile deleted file mode 100644 index b5751d104c5..00000000000 --- a/jdk/makefiles/sun/jdbc/Makefile +++ /dev/null @@ -1,142 +0,0 @@ -# -# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for JDBC-ODBC Bridge Driver -# -# Note - the native library for the bridge may be linked with the -# shared library for the ODBC driver manager. Or dummy libraries -# may be used to just create libJdbcOdbc.so with a dependency on -# libodbc.so and libodbcinst.so. -# - -BUILDDIR = ../.. -PACKAGE = sun.jdbc.odbc -LIBRARY = JdbcOdbc -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# - -AUTO_FILES_JAVA_DIRS = sun/jdbc/odbc - -FILES_c = \ - JdbcOdbc.c - -FILES_export = \ - sun/jdbc/odbc/JdbcOdbc.java - -# Use fake libraries on Solaris and Linux just so the library we create has -# a dependency on these two library names. (which are not part of the jdk) -ifneq ($(PLATFORM), windows) - # In jdk5 and jdk6, and on Solaris 32bit, we would have required that - # these two libraries exist at: $(ALT_ODBCDIR)/ISLIodbc/2.11/lib - # In jdk7, we just fake them out like we did on Linux in jdk5 and jdk6. - # - # If you wanted to use the real odbc libraries, change the value of - # ODBC_LIBRARY_LOCATION, and delete the variable assignments below. - # - # Tell linker to ignore missing externals when building this shared library. - LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker nodefs - # Define a place to create the fake libraries and their names. - ODBC_LIBRARY_LOCATION = $(TEMPDIR) - ODBC_FAKE_LIBRARIES = $(ODBC_LIBRARY_LOCATION)/libodbcinst.so $(ODBC_LIBRARY_LOCATION)/libodbc.so - # Make sure they get created early. - INIT += $(ODBC_FAKE_LIBRARIES) -endif - -# -# Rules -# -include $(BUILDDIR)/common/Library.gmk - -# -# The UNIX define specifies conditional compilation for UNIX -# -ifeq ($(PLATFORM), windows) - LDLIBS += odbc32.lib odbccp32.lib -else - CFLAGS += -DUNIX - LDFLAGS += -L$(ODBC_LIBRARY_LOCATION) -lodbcinst -lodbc -endif - -# -# The native code for the bridge uses conditional compilation to -# support Solaris, Win95 and Mac PPC. This is the path to the shared C files -# (which unfortunately are in the same directory as shared Java files). -# -vpath %.c $(CLOSED_SHARE_SRC)/classes/sun/jdbc/odbc - -# -# Rules to generate fake libraries -# - -ifdef ODBC_FAKE_LIBRARIES -$(TEMPDIR)/dummyodbc.c: - @$(prep-target) - $(ECHO) "void dummyOdbc(void){}" >> $@ -$(TEMPDIR)/dummyodbc.o: $(TEMPDIR)/dummyodbc.c - @$(prep-target) - $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $< -$(ODBC_FAKE_LIBRARIES): $(TEMPDIR)/dummyodbc.o - @$(prep-target) - $(CC) $(SHARED_LIBRARY_FLAG) $(LDFLAGS_COMMON) -o $@ $< $(EXTRA_LIBS) -clean:: - $(RM) -f $(ODBC_FAKE_LIBRARIES) - $(RM) -f $(TEMPDIR)/dummyodbc.c - $(RM) -f $(TEMPDIR)/dummyodbc.o -endif - -# -# Files that need to be copied -# -SERVICEDIR = $(CLASSBINDIR)/META-INF/services - -FILES_copy = \ - $(SERVICEDIR)/java.sql.Driver - - -FILES_mkdirs = \ - $(CLASSBINDIR)/META-INF \ - $(CLASSBINDIR)/META-INF/services - -FILES_copydirs = \ - $(CLASSBINDIR) \ - $(FILES_mkdirs) - -build: copy-files - -copy-files: $(FILES_copy) - -$(SERVICEDIR)/%: $(CLOSED_SHARE_SRC)/classes/sun/jdbc/odbc/META-INF/services/% - $(install-file) - -clean clobber:: - $(RM) $(FILES_copy) - -.PHONY: copy-files - diff --git a/jdk/makefiles/sun/jdga/Makefile b/jdk/makefiles/sun/jdga/Makefile deleted file mode 100644 index 7c3c2b5ac59..00000000000 --- a/jdk/makefiles/sun/jdga/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - - -BUILDDIR = ../.. -PACKAGE = sun.jdga -LIBRARY = sunwjdga -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -FILES_c = \ - dgalock.c - -# -# Add use of mapfile -# -ifeq ($(ARCH_FAMILY), sparc) -FILES_m = mapfile-vers -include $(BUILDDIR)/common/Mapfile-vers.gmk -endif - -# -# Rules. -# -include $(BUILDDIR)/common/Library.gmk - -# -# Add to the ambient vpath to pick up files in subdirectories -# -vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR) - -ifneq ($(PLATFORM), windows) - LDLIBS = -ldga -lX11 $(LIBDL) -lc - - CPPFLAGS += \ - -I$(SHARE_SRC)/javavm/export \ - -I$(PLATFORM_SRC)/javavm/export \ - -I$(OPENWIN_HOME)/include -endif - -LDFLAGS += -L$(OPENWIN_LIB) -R$(OPENWIN_RUNTIME_LIB) diff --git a/jdk/makefiles/sun/lwawt/FILES_c_macosx.gmk b/jdk/makefiles/sun/lwawt/FILES_c_macosx.gmk deleted file mode 100644 index 05b2d14b921..00000000000 --- a/jdk/makefiles/sun/lwawt/FILES_c_macosx.gmk +++ /dev/null @@ -1,100 +0,0 @@ -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_objc = \ - awt.m \ - ApplicationDelegate.m \ - CFRetainedResource.m \ - CGLGraphicsConfig.m \ - CGLSurfaceData.m \ - CGLLayer.m \ - CGraphicsConfig.m \ - CGraphicsDevice.m \ - CGraphicsEnv.m \ - CCharToGlyphMapper.m \ - CSystemColors.m \ - AWTFont.m \ - CGGlyphOutlines.m \ - CGGlyphImages.m \ - CoreTextSupport.m \ - AWTStrike.m \ - InitIDs.m \ - AWTEvent.m \ - AWTView.m \ - AWTWindow.m \ - AWTSurfaceLayers.m \ - CCursorManager.m \ - CClipboard.m \ - CDataTransferer.m \ - CDragSource.m \ - CDragSourceContextPeer.m \ - CDropTarget.m \ - CDropTargetContextPeer.m \ - CInputMethod.m \ - CDesktopPeer.m \ - OSVersion.m \ - DnDUtilities.m \ - CFileDialog.m \ - CImage.m \ - CMenu.m \ - CMenuBar.m \ - CMenuComponent.m \ - CMenuItem.m \ - CPopupMenu.m \ - CRobot.m \ - CTrayIcon.m \ - CWrapper.m \ - JavaAccessibilityAction.m \ - JavaAccessibilityUtilities.m \ - JavaComponentAccessibility.m \ - JavaTextAccessibility.m \ - LWCToolkit.m \ - GeomUtilities.m \ - CPrinterJob.m \ - PrintModel.m \ - PrinterSurfaceData.m \ - PrinterView.m \ - QuartzSurfaceData.m \ - QuartzRenderer.m \ - CTextPipe.m \ - ImageSurfaceData.m \ - awt_DrawingSurface.m - -FILES_c = \ - OGLBlitLoops.c \ - OGLBufImgOps.c \ - OGLContext.c \ - OGLFuncs.c \ - OGLMaskBlit.c \ - OGLMaskFill.c \ - OGLPaints.c \ - OGLRenderQueue.c \ - OGLRenderer.c \ - OGLSurfaceData.c \ - OGLTextRenderer.c \ - OGLVertexCache.c \ - AccelGlyphCache.c \ - CUPSfuncs.c - diff --git a/jdk/makefiles/sun/lwawt/FILES_export_macosx.gmk b/jdk/makefiles/sun/lwawt/FILES_export_macosx.gmk deleted file mode 100644 index 43710d7dbbb..00000000000 --- a/jdk/makefiles/sun/lwawt/FILES_export_macosx.gmk +++ /dev/null @@ -1,279 +0,0 @@ -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# FILES_export definitions for Mac OS X - -FILES_export = \ - com/apple/eawt/Application.java \ - com/apple/eawt/_AppDockIconHandler.java \ - com/apple/eawt/_AppEventHandler.java \ - com/apple/eawt/_AppEventLegacyHandler.java \ - com/apple/eawt/_AppMenuBarHandler.java \ - com/apple/eawt/_AppMiscHandlers.java \ - com/apple/eawt/event/GestureHandler.java \ - com/apple/eawt/FullScreenAdapter.java \ - com/apple/eawt/FullScreenHandler.java \ - com/apple/eawt/FullScreenListener.java \ - com/apple/eawt/FullScreenUtilities.java \ - sun/font/FontManager.java \ - sun/awt/image/ImageRepresentation.java \ - sun/awt/image/GifImageDecoder.java \ - sun/awt/image/NativeLibLoader.java \ - sun/java2d/CRenderer.java \ - sun/java2d/CompositeCRenderer.java \ - sun/java2d/DataBufferNIOInt.java \ - sun/java2d/IntegerNIORaster.java \ - sun/java2d/OSXSurfaceData.java \ - sun/java2d/OSXOffScreenSurfaceData.java \ - sun/java2d/loops/Blit.java \ - sun/java2d/loops/BlitBg.java \ - sun/java2d/loops/ScaledBlit.java \ - sun/java2d/loops/TransformBlit.java \ - sun/java2d/loops/FillRect.java \ - sun/java2d/loops/FillSpans.java \ - sun/java2d/loops/FillParallelogram.java \ - sun/java2d/loops/DrawParallelogram.java \ - sun/java2d/loops/DrawGlyphList.java \ - sun/java2d/loops/DrawGlyphListAA.java \ - sun/java2d/loops/DrawGlyphListLCD.java \ - sun/java2d/loops/DrawLine.java \ - sun/java2d/loops/DrawRect.java \ - sun/java2d/loops/DrawPolygons.java \ - sun/java2d/loops/DrawPath.java \ - sun/java2d/loops/FillPath.java \ - sun/java2d/loops/MaskBlit.java \ - sun/java2d/loops/MaskFill.java \ - sun/java2d/loops/TransformHelper.java \ - sun/java2d/loops/GraphicsPrimitiveMgr.java \ - sun/java2d/loops/GraphicsPrimitive.java \ - sun/java2d/pipe/hw/AccelSurface.java \ - sun/java2d/pipe/hw/AccelDeviceEventNotifier.java \ - sun/java2d/pipe/hw/ContextCapabilities.java \ - sun/awt/image/ImagingLib.java \ - sun/java2d/SurfaceData.java \ - sun/java2d/SunGraphics2D.java \ - sun/awt/KeyboardFocusManagerPeerImpl.java \ - sun/awt/image/BufImgSurfaceData.java \ - sun/awt/image/DataBufferNative.java \ - \ - sun/awt/CGraphicsConfig.java \ - sun/awt/CGraphicsDevice.java \ - sun/awt/CGraphicsEnvironment.java \ - sun/font/CCharToGlyphMapper.java \ - sun/font/CFont.java \ - sun/font/CFontConfiguration.java \ - sun/font/CFontManager.java \ - sun/font/CStrike.java \ - sun/font/CStrikeDisposer.java \ - sun/java2d/BackBufferCapsProvider.java \ - sun/java2d/MacosxSurfaceManagerFactory.java \ - sun/lwawt/LWButtonPeer.java \ - sun/lwawt/LWCanvasPeer.java \ - sun/lwawt/LWCheckboxPeer.java \ - sun/lwawt/LWChoicePeer.java \ - sun/lwawt/LWComponentPeer.java \ - sun/lwawt/LWContainerPeer.java \ - sun/lwawt/LWCursorManager.java \ - sun/lwawt/LWKeyboardFocusManagerPeer.java \ - sun/lwawt/LWLabelPeer.java \ - sun/lwawt/LWListPeer.java \ - sun/lwawt/LWMouseInfoPeer.java \ - sun/lwawt/LWPanelPeer.java \ - sun/lwawt/LWRepaintArea.java \ - sun/lwawt/LWScrollBarPeer.java \ - sun/lwawt/LWScrollPanePeer.java \ - sun/lwawt/LWTextComponentPeer.java \ - sun/lwawt/LWTextFieldPeer.java \ - sun/lwawt/LWToolkit.java \ - sun/lwawt/LWWindowPeer.java \ - sun/lwawt/PlatformWindow.java \ - sun/lwawt/SelectionClearListener.java \ - sun/lwawt/macosx/CPrinterDevice.java \ - sun/lwawt/macosx/CPrinterDialog.java \ - sun/lwawt/macosx/CPrinterDialogPeer.java \ - sun/lwawt/macosx/CPrinterGraphics.java \ - sun/lwawt/macosx/CPrinterGraphicsConfig.java \ - sun/lwawt/macosx/CPrinterJob.java \ - sun/lwawt/macosx/CPrinterJobDialog.java \ - sun/lwawt/macosx/CPrinterPageDialog.java \ - sun/lwawt/macosx/CPrinterSurfaceData.java \ - sun/lwawt/macosx/CTextPipe.java \ - sun/lwawt/macosx/CDesktopPeer.java \ - sun/java2d/CRenderer.java \ - sun/lwawt/macosx/EventDispatchAccess.java \ - sun/lwawt/macosx/NSPrintInfo.java \ - sun/lwawt/macosx/CAccessibility.java \ - sun/lwawt/macosx/CAccessible.java \ - sun/lwawt/macosx/CFRetainedResource.java \ - sun/lwawt/macosx/CCheckboxMenuItem.java \ - sun/lwawt/macosx/CClipboard.java \ - sun/lwawt/macosx/CDataTransferer.java \ - sun/lwawt/macosx/CDragSourceContextPeer.java \ - sun/lwawt/macosx/CMouseDragGestureRecognizer.java \ - sun/lwawt/macosx/CDropTarget.java \ - sun/lwawt/macosx/CDropTargetContextPeer.java \ - sun/lwawt/macosx/CCursorManager.java \ - sun/lwawt/macosx/CFileDialog.java \ - sun/lwawt/macosx/CImage.java \ - sun/lwawt/macosx/CMenu.java \ - sun/lwawt/macosx/CMenuBar.java \ - sun/lwawt/macosx/CMenuComponent.java \ - sun/lwawt/macosx/CMenuItem.java \ - sun/lwawt/macosx/CMouseInfoPeer.java \ - sun/lwawt/macosx/CPlatformView.java \ - sun/lwawt/macosx/CPlatformWindow.java \ - sun/lwawt/macosx/CPlatformComponent.java \ - sun/lwawt/macosx/CEmbeddedFrame.java \ - sun/lwawt/macosx/CPlatformEmbeddedFrame.java \ - sun/lwawt/macosx/CPlatformResponder.java \ - sun/lwawt/macosx/CPopupMenu.java \ - sun/lwawt/macosx/CRobot.java \ - sun/lwawt/macosx/CSystemTray.java \ - sun/lwawt/macosx/CTrayIcon.java \ - sun/lwawt/macosx/CWrapper.java \ - sun/lwawt/macosx/CocoaConstants.java \ - sun/lwawt/macosx/LWCToolkit.java \ - sun/lwawt/macosx/CInputMethod.java \ - sun/lwawt/macosx/CInputMethodDescriptor.java \ - sun/lwawt/macosx/event/NSEvent.java \ - \ - sun/awt/DebugSettings.java \ - sun/awt/EmbeddedFrame.java \ - sun/awt/PlatformFont.java \ - sun/awt/FontDescriptor.java \ - sun/awt/NativeLibLoader.java \ - sun/awt/CharsetString.java \ - sun/awt/SunHints.java \ - sun/java2d/pipe/BufferedContext.java \ - sun/java2d/pipe/BufferedMaskBlit.java \ - sun/java2d/pipe/BufferedOpCodes.java \ - sun/java2d/pipe/BufferedMaskBlit.java \ - sun/java2d/pipe/BufferedPaints.java \ - sun/java2d/pipe/BufferedRenderPipe.java \ - sun/java2d/pipe/BufferedTextPipe.java \ - sun/java2d/pipe/RenderBuffer.java \ - sun/java2d/pipe/ShapeSpanIterator.java \ - sun/java2d/pipe/SpanClipRenderer.java \ - sun/java2d/pipe/RegionIterator.java \ - sun/awt/image/IntegerComponentRaster.java \ - sun/java2d/cmm/CMSManager.java \ - sun/java2d/cmm/PCMM.java \ - sun/java2d/cmm/ColorTransform.java \ - sun/awt/datatransfer/DataTransferer.java \ - sun/awt/dnd/SunDragSourceContextPeer.java \ - sun/java2d/opengl/OGLBlitLoops.java \ - sun/java2d/opengl/OGLContext.java \ - sun/java2d/opengl/OGLMaskFill.java \ - sun/java2d/opengl/OGLPaints.java \ - sun/java2d/opengl/OGLRenderer.java \ - sun/java2d/opengl/OGLRenderQueue.java \ - sun/java2d/opengl/OGLSurfaceData.java \ - sun/java2d/opengl/OGLTextRenderer.java \ - sun/java2d/opengl/CGLGraphicsConfig.java \ - sun/java2d/opengl/CGLSurfaceData.java \ - sun/java2d/opengl/CGLLayer.java \ - sun/awt/ExtendedKeyCodes.java - -FILES_export2 = \ - java/awt/AlphaComposite.java \ - java/awt/MouseInfo.java \ - java/awt/Cursor.java \ - java/awt/Graphics.java \ - java/awt/Color.java \ - java/awt/Image.java \ - java/awt/Rectangle.java \ - java/awt/Event.java \ - java/awt/Font.java \ - java/awt/Insets.java \ - java/awt/Point.java \ - java/awt/FontMetrics.java \ - java/awt/Toolkit.java \ - java/awt/Component.java \ - java/awt/Container.java \ - java/awt/Canvas.java \ - java/awt/Button.java \ - java/awt/List.java \ - java/awt/Adjustable.java \ - java/awt/Scrollbar.java \ - java/awt/ScrollPane.java \ - java/awt/ScrollPaneAdjustable.java \ - java/awt/Window.java \ - java/awt/TextField.java \ - java/awt/Label.java \ - java/awt/Choice.java \ - java/awt/TextArea.java \ - java/awt/MenuBar.java \ - java/awt/Menu.java \ - java/awt/MenuComponent.java \ - java/awt/PopupMenu.java \ - java/awt/Dialog.java \ - java/awt/FileDialog.java \ - java/awt/MenuItem.java \ - java/awt/Checkbox.java \ - java/awt/CheckboxMenuItem.java \ - java/awt/CheckboxGroup.java \ - java/awt/Frame.java \ - java/awt/Transparency.java \ - java/awt/AWTException.java \ - java/awt/AWTEvent.java \ - java/awt/AWTKeyStroke.java \ - java/awt/KeyboardFocusManager.java \ - java/awt/Dimension.java \ - java/awt/SystemColor.java \ - java/awt/TrayIcon.java \ - java/awt/DisplayMode.java \ - java/awt/color/ColorSpace.java \ - java/awt/color/ICC_Profile.java \ - java/awt/geom/PathIterator.java \ - java/awt/image/AffineTransformOp.java \ - java/awt/image/ImageConsumer.java \ - java/awt/image/ImageObserver.java \ - java/awt/image/BufferedImage.java \ - java/awt/image/ColorModel.java \ - java/awt/image/ConvolveOp.java \ - java/awt/image/DirectColorModel.java \ - java/awt/image/IndexColorModel.java \ - java/awt/image/DataBuffer.java \ - java/awt/datatransfer/Transferable.java \ - java/awt/datatransfer/DataFlavor.java \ - java/awt/datatransfer/UnsupportedFlavorException.java \ - java/awt/datatransfer/Clipboard.java \ - java/awt/datatransfer/ClipboardOwner.java \ - java/awt/datatransfer/StringSelection.java \ - java/awt/event/AdjustmentEvent.java \ - java/awt/event/KeyEvent.java \ - java/awt/event/MouseEvent.java \ - java/awt/event/MouseWheelEvent.java \ - java/awt/event/FocusEvent.java \ - java/awt/event/InputEvent.java \ - java/awt/event/WindowEvent.java \ - java/awt/event/NativeLibLoader.java \ - java/awt/peer/ComponentPeer.java \ - java/awt/dnd/DnDConstants.java \ - sun/awt/CausedFocusEvent.java \ - java/awt/print/PageFormat.java \ - java/awt/print/Pageable.java \ - java/awt/print/Printable.java \ - java/awt/BasicStroke.java diff --git a/jdk/makefiles/sun/lwawt/Makefile b/jdk/makefiles/sun/lwawt/Makefile deleted file mode 100644 index 6c0742fdfef..00000000000 --- a/jdk/makefiles/sun/lwawt/Makefile +++ /dev/null @@ -1,114 +0,0 @@ -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -MODULE = awt -PACKAGE = sun.lwawt -LIBRARY = awt_lwawt -PRODUCT = sun - -LIB_LOCATION = $(LIBDIR) - -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -include FILES_c_macosx.gmk -include FILES_export_macosx.gmk -AUTO_FILES_JAVA_DIRS = sun/awt sun/font sun/lwawt sun/lwawt/macosx sun/java2d sun/java2d/opengl com/apple/eawt - -# -# Rules. -# -# include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -# -# Add to the ambient vpath to pick up files in subdirectories -# -vpath %.c $(SHARE_SRC)/native/sun/awt/debug -vpath %.c $(SHARE_SRC)/native/sun/awt/image -vpath %.c $(SHARE_SRC)/native/sun/awt/image/gif -vpath %.c $(SHARE_SRC)/native/sun/awt/image/cvutils -vpath %.c $(SHARE_SRC)/native/sun/awt/shell -vpath %.c $(SHARE_SRC)/native/sun/java2d -vpath %.c $(SHARE_SRC)/native/sun/java2d/loops -vpath %.c $(SHARE_SRC)/native/sun/java2d/pipe -vpath %.c $(SHARE_SRC)/native/sun/java2d/opengl -vpath %.c $(SHARE_SRC)/native/sun/awt/medialib -vpath %.c $(SHARE_SRC)/native/sun/awt/utility -vpath %.c $(SHARE_SRC)/native/sun/font -vpath %.c $(call NativeSrcDirList,,native/sun/awt) - -vpath %.cpp $(SHARE_SRC)/native/sun/image - -vpath %.m $(call NativeSrcDirList,,native/sun/awt) -vpath %.m $(call NativeSrcDirList,,native/sun/font) -vpath %.m $(call NativeSrcDirList,,native/sun/java2d) -vpath %.m $(call NativeSrcDirList,,native/sun/java2d/opengl) - -OTHER_LDLIBS += \ - -lawt -lmlib_image -losxapp $(JVMLIB) $(LIBM) \ - -framework Accelerate \ - -framework ApplicationServices \ - -framework AudioToolbox \ - -framework Carbon \ - -framework Cocoa \ - -framework Security \ - -framework ExceptionHandling \ - -framework JavaNativeFoundation \ - -framework JavaRuntimeSupport \ - -framework OpenGL \ - -framework QuartzCore -CPPFLAGS += \ - -I$(CLASSHDRDIR) \ - -I$(SHARE_SRC)/native/sun/awt/debug \ - -I$(SHARE_SRC)/native/sun/awt/image/cvutils \ - -I$(SHARE_SRC)/native/sun/java2d \ - -I$(SHARE_SRC)/native/sun/java2d/loops \ - -I$(SHARE_SRC)/native/sun/awt/image/cvutils \ - -I$(SHARE_SRC)/native/sun/awt/image \ - -I$(SHARE_SRC)/native/sun/font \ - -I$(SHARE_SRC)/native/sun/java2d/pipe \ - -I$(SHARE_SRC)/native/sun/java2d/opengl \ - -I$(SHARE_SRC)/native/sun/dc/path \ - -I$(SHARE_SRC)/native/sun/dc/doe \ - -I$(SHARE_SRC)/native/sun/awt/alphacomposite \ - -I$(SHARE_SRC)/native/sun/awt/medialib \ - -I$(SHARE_SRC)/native/sun/awt \ - $(call NativeSrcDirList,-I,/native/sun/awt) \ - $(call NativeSrcDirList,-I,/native/sun/osxapp) \ - $(call NativeSrcDirList,-I,/native/sun/font) \ - $(call NativeSrcDirList,-I,/native/sun/java2d) \ - $(call NativeSrcDirList,-I,/native/sun/java2d/opengl) - -ifeq ($(MILESTONE), internal) - CPPFLAGS += -DINTERNAL_BUILD -endif - -clean clobber:: - -.PHONY: diff --git a/jdk/makefiles/sun/nio/Makefile b/jdk/makefiles/sun/nio/Makefile deleted file mode 100644 index 905deeb1cd4..00000000000 --- a/jdk/makefiles/sun/nio/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PACKAGE = sun.nio -PRODUCT = sun -SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true -SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true -include $(BUILDDIR)/common/Defs.gmk - -SUBDIRS = cs -include $(BUILDDIR)/common/Subdirs.gmk - -all build clean clobber:: - $(SUBDIRS-loop) - diff --git a/jdk/makefiles/sun/nio/cs/FILES_java.gmk b/jdk/makefiles/sun/nio/cs/FILES_java.gmk deleted file mode 100644 index 05d722b1be1..00000000000 --- a/jdk/makefiles/sun/nio/cs/FILES_java.gmk +++ /dev/null @@ -1,133 +0,0 @@ -# -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Character converters for lib/charsets.jar -# -# Core character converters are built from make/java/java. -# - -FILES_gen_extcs = \ - sun/nio/cs/ext/IBM037.java \ - sun/nio/cs/ext/IBM1006.java \ - sun/nio/cs/ext/IBM1025.java \ - sun/nio/cs/ext/IBM1026.java \ - sun/nio/cs/ext/IBM1046.java \ - sun/nio/cs/ext/IBM1047.java \ - sun/nio/cs/ext/IBM1097.java \ - sun/nio/cs/ext/IBM1098.java \ - sun/nio/cs/ext/IBM1112.java \ - sun/nio/cs/ext/IBM1122.java \ - sun/nio/cs/ext/IBM1123.java \ - sun/nio/cs/ext/IBM1124.java \ - sun/nio/cs/ext/IBM1140.java \ - sun/nio/cs/ext/IBM1141.java \ - sun/nio/cs/ext/IBM1142.java \ - sun/nio/cs/ext/IBM1143.java \ - sun/nio/cs/ext/IBM1144.java \ - sun/nio/cs/ext/IBM1145.java \ - sun/nio/cs/ext/IBM1146.java \ - sun/nio/cs/ext/IBM1147.java \ - sun/nio/cs/ext/IBM1148.java \ - sun/nio/cs/ext/IBM1149.java \ - sun/nio/cs/ext/IBM273.java \ - sun/nio/cs/ext/IBM277.java \ - sun/nio/cs/ext/IBM278.java \ - sun/nio/cs/ext/IBM280.java \ - sun/nio/cs/ext/IBM284.java \ - sun/nio/cs/ext/IBM285.java \ - sun/nio/cs/ext/IBM297.java \ - sun/nio/cs/ext/IBM420.java \ - sun/nio/cs/ext/IBM424.java \ - sun/nio/cs/ext/IBM500.java \ - sun/nio/cs/ext/IBM833.java \ - sun/nio/cs/ext/IBM838.java \ - sun/nio/cs/ext/IBM856.java \ - sun/nio/cs/ext/IBM860.java \ - sun/nio/cs/ext/IBM861.java \ - sun/nio/cs/ext/IBM863.java \ - sun/nio/cs/ext/IBM864.java \ - sun/nio/cs/ext/IBM865.java \ - sun/nio/cs/ext/IBM868.java \ - sun/nio/cs/ext/IBM869.java \ - sun/nio/cs/ext/IBM870.java \ - sun/nio/cs/ext/IBM871.java \ - sun/nio/cs/ext/IBM875.java \ - sun/nio/cs/ext/IBM918.java \ - sun/nio/cs/ext/IBM921.java \ - sun/nio/cs/ext/IBM922.java \ - sun/nio/cs/ext/ISO_8859_11.java \ - sun/nio/cs/ext/ISO_8859_3.java \ - sun/nio/cs/ext/ISO_8859_6.java \ - sun/nio/cs/ext/ISO_8859_8.java \ - sun/nio/cs/ext/MS1255.java \ - sun/nio/cs/ext/MS1256.java \ - sun/nio/cs/ext/MS1258.java \ - sun/nio/cs/ext/MS874.java \ - sun/nio/cs/ext/MacArabic.java \ - sun/nio/cs/ext/MacCentralEurope.java \ - sun/nio/cs/ext/MacCroatian.java \ - sun/nio/cs/ext/MacCyrillic.java \ - sun/nio/cs/ext/MacDingbat.java \ - sun/nio/cs/ext/MacGreek.java \ - sun/nio/cs/ext/MacHebrew.java \ - sun/nio/cs/ext/MacIceland.java \ - sun/nio/cs/ext/MacRoman.java \ - sun/nio/cs/ext/MacRomania.java \ - sun/nio/cs/ext/MacSymbol.java \ - sun/nio/cs/ext/MacThai.java \ - sun/nio/cs/ext/MacTurkish.java \ - sun/nio/cs/ext/MacUkraine.java \ - sun/nio/cs/ext/TIS_620.java \ - sun/nio/cs/ext/EUC_TWMapping.java \ - sun/nio/cs/ext/HKSCSMapping.java \ - sun/nio/cs/ext/HKSCS2001Mapping.java \ - sun/nio/cs/ext/HKSCS_XPMapping.java \ - sun/nio/cs/ext/IBM1364.java \ - sun/nio/cs/ext/IBM1381.java \ - sun/nio/cs/ext/IBM1383.java \ - sun/nio/cs/ext/IBM930.java \ - sun/nio/cs/ext/IBM933.java \ - sun/nio/cs/ext/IBM935.java \ - sun/nio/cs/ext/IBM937.java \ - sun/nio/cs/ext/IBM939.java \ - sun/nio/cs/ext/IBM942.java \ - sun/nio/cs/ext/IBM943.java \ - sun/nio/cs/ext/IBM948.java \ - sun/nio/cs/ext/IBM949.java \ - sun/nio/cs/ext/IBM950.java \ - sun/nio/cs/ext/IBM970.java \ - sun/nio/cs/ext/EUC_CN.java \ - sun/nio/cs/ext/EUC_KR.java \ - sun/nio/cs/ext/Johab.java \ - sun/nio/cs/ext/MS932.java \ - sun/nio/cs/ext/MS936.java \ - sun/nio/cs/ext/MS949.java \ - sun/nio/cs/ext/MS950.java \ - sun/nio/cs/ext/GBK.java \ - sun/nio/cs/ext/Big5.java - -FILES_java = $(FILES_src) $(FILES_gen_extcs) - diff --git a/jdk/makefiles/sun/nio/cs/Makefile b/jdk/makefiles/sun/nio/cs/Makefile deleted file mode 100644 index 760b1b178f6..00000000000 --- a/jdk/makefiles/sun/nio/cs/Makefile +++ /dev/null @@ -1,140 +0,0 @@ -# -# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for character converters. -# - -BUILDDIR = ../../.. - -# charsets should be separated from nio module -PACKAGE = sun.nio -PRODUCT = sun - -# This re-directs all the class files to a separate location -CLASSDESTDIR = $(TEMPDIR)/classes - -JAVAC_MAX_WARNINGS = false -JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation -JAVAC_WARNINGS_FATAL = true -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -include FILES_java.gmk -AUTO_FILES_JAVA_DIRS = sun/nio/cs/ext - -# For Cygwin, command line arguments that are paths must be converted to -# windows style paths. These paths cannot be used as targets, however, because -# the ":" in them will interfere with GNU Make rules, generating "multiple -# target pattern" errors. - -# this define is for the rule: -CHARSETS_JAR = $(LIBDIR)/charsets.jar - -# extcs -FILES_genout_extcs = $(FILES_gen_extcs:%.java=$(GENSRCDIR)/%.java) - -# -# These sun.awt charsets use sun/nio/cs/ext charsets that only exist -# in JDK7 charsets.jar, which causes problem when build the symbol -# table for rt.jar in Release.gmk. They are now removed from the -# rt.jar when building jdk/jre image (in Release.gmk), so add them -# into charsets.jar here -# -ifeq ($(PLATFORM), windows) -FILES_src += \ - sun/awt/HKSCS.java -else -# Solaris/Linux -FILES_src += \ - sun/awt/HKSCS.java \ - sun/awt/motif/X11GB2312.java \ - sun/awt/motif/X11GBK.java \ - sun/awt/motif/X11KSC5601.java -endif # PLATFORM - -# -# Rules -# -include $(BUILDDIR)/common/Classes.gmk - -build: $(FILES_genout_extcs) $(CHARSETS_JAR) - -# -# Extra rules to build character converters. - -SERVICE_DESCRIPTION = java.nio.charset.spi.CharsetProvider -SERVICE_DESCRIPTION_PATH = META-INF/services/$(SERVICE_DESCRIPTION) - -GENCSDATASRC = ../../../../make/tools/CharsetMapping -GENCSSRCDIR = ../../../../make/tools/src/build/tools/charsetmapping -GENCSEXT = $(GENSRCDIR)/sun/nio/cs/ext - -FILES_MAP = $(GENCSDATASRC)/sjis0213.map -FILES_DAT = $(CLASSDESTDIR)/sun/nio/cs/ext/sjis0213.dat - -$(FILES_DAT): $(FILES_MAP) - @$(prep-target) - $(TOOL_CHARSETMAPPING) \ - $(FILES_MAP) $(FILES_DAT) sjis0213 - - -$(FILES_genout_extcs): \ - $(GENCSDATASRC)/SingleByte-X.java.template \ - $(GENCSDATASRC)/DoubleByte-X.java.template \ - $(GENCSDATASRC)/extsbcs $(GENCSDATASRC)/dbcs - @$(prep-target) - $(RM) -r $(GENCSEXT) - $(MKDIR) -p $(GENCSEXT) - $(TOOL_CHARSETMAPPING) $(GENCSDATASRC) $(GENCSEXT) extsbcs - $(TOOL_CHARSETMAPPING) $(GENCSDATASRC) $(GENCSEXT) euctw \ - $(GENCSSRCDIR)/EUC_TW.java - $(TOOL_CHARSETMAPPING) $(GENCSDATASRC) $(GENCSEXT) hkscs \ - $(GENCSSRCDIR)/HKSCS.java - $(TOOL_CHARSETMAPPING) $(GENCSDATASRC) $(GENCSEXT) dbcs - -$(CLASSDESTDIR)/$(SERVICE_DESCRIPTION_PATH): \ - $(SHARE_SRC)/classes/sun/nio/cs/ext/$(SERVICE_DESCRIPTION_PATH) - $(install-file) - -# no compression unless requested -ifndef COMPRESS_JARS - CREATE_JAR_OPTS_NOMANIFEST = cf0 -else - CREATE_JAR_OPTS_NOMANIFEST = cf -endif - -$(CHARSETS_JAR): $(FILES_class) $(CLASSDESTDIR)/$(SERVICE_DESCRIPTION_PATH) $(FILES_DAT) - $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS_NOMANIFEST) $(CHARSETS_JAR) \ - -C $(CLASSDESTDIR) sun \ - -C $(CLASSDESTDIR) $(SERVICE_DESCRIPTION_PATH) \ - $(BOOT_JAR_JFLAGS) - @$(java-vm-cleanup) - -clean:: - $(RM) -r $(CLASSDESTDIR) - $(RM) $(CHARSETS_JAR) diff --git a/jdk/makefiles/sun/org/Makefile b/jdk/makefiles/sun/org/Makefile deleted file mode 100644 index a992cde4f32..00000000000 --- a/jdk/makefiles/sun/org/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building Mozilla modules -# - -BUILDDIR = ../.. -PRODUCT = org -include $(BUILDDIR)/common/Defs.gmk - -SUBDIRS = mozilla -include $(BUILDDIR)/common/Subdirs.gmk - -all build clean clobber:: - $(SUBDIRS-loop) - diff --git a/jdk/makefiles/sun/org/mozilla/Makefile b/jdk/makefiles/sun/org/mozilla/Makefile deleted file mode 100644 index 0805da63bda..00000000000 --- a/jdk/makefiles/sun/org/mozilla/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building Mozilla JavaScript modules -# - -BUILDDIR = ../../.. -PRODUCT = org -include $(BUILDDIR)/common/Defs.gmk - -SUBDIRS = javascript -include $(BUILDDIR)/common/Subdirs.gmk - -all build clean clobber:: - $(SUBDIRS-loop) - diff --git a/jdk/makefiles/sun/org/mozilla/javascript/Makefile b/jdk/makefiles/sun/org/mozilla/javascript/Makefile deleted file mode 100644 index f381b94e33c..00000000000 --- a/jdk/makefiles/sun/org/mozilla/javascript/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building all of sun.org.mozilla.javascript.internal.* -# - -BUILDDIR = ../../../.. -PACKAGE = sun.org.mozilla.javascript.internal -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -AUTO_FILES_JAVA_DIRS = sun/org/mozilla/javascript/internal - -RESOURCEDIR = \ - $(CLASSDESTDIR)/sun/org/mozilla/javascript/internal/resources - -FILES_copy = \ - $(RESOURCEDIR)/Messages.properties \ - $(RESOURCEDIR)/Messages_fr.properties - -# -# Rules -# - -include $(BUILDDIR)/common/Classes.gmk - -all: classes copy-files - -# -# Copy resource messages file for Rhino JavaScript interpreter -# - -copy-files: $(FILES_copy) - -$(RESOURCEDIR)/%: $(CLOSED_SRC)/share/classes/sun/org/mozilla/javascript/internal/resources/% - $(install-file) - -.PHONY: copy-files - -clean clobber:: - $(RM) -rf $(CLASSDESTDIR)/sun/org/mozilla/javascript diff --git a/jdk/makefiles/sun/osxapp/Makefile b/jdk/makefiles/sun/osxapp/Makefile deleted file mode 100644 index 7c47edd2d16..00000000000 --- a/jdk/makefiles/sun/osxapp/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -LIBRARY = osxapp -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -FILES_objc = \ - NSApplicationAWT.m \ - QueuingApplicationDelegate.m \ - PropertiesUtilities.m \ - ThreadUtilities.m - -# -# Rules. -# -include $(BUILDDIR)/common/Library.gmk - -# -# Add to the ambient vpath to pick up files in subdirectories -# -vpath %.m $(call NativeSrcDirList,,native/sun/osxapp) - -# TODO: perhaps not all of the below frameworks are required -OTHER_LDLIBS += \ - -framework Accelerate \ - -framework ApplicationServices \ - -framework AudioToolbox \ - -framework Carbon \ - -framework Cocoa \ - -framework Security \ - -framework ExceptionHandling \ - -framework JavaNativeFoundation \ - -framework JavaRuntimeSupport \ - -framework OpenGL \ - -framework IOSurface \ - -framework QuartzCore - -CPPFLAGS += \ - $(call NativeSrcDirList,-I,/native/sun/osxapp) - - -ifeq ($(MILESTONE), internal) - CPPFLAGS += -DINTERNAL_BUILD -endif - -clean clobber:: - -.PHONY: diff --git a/jdk/makefiles/sun/security/Makefile b/jdk/makefiles/sun/security/Makefile deleted file mode 100644 index 14b651d1e1b..00000000000 --- a/jdk/makefiles/sun/security/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# -# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Build classes for security tools: -# -# * keytool -# * jarsigner -# * policytool -# -# Also install wrappers for all of these. -# - -BUILDDIR = ../.. -SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true -# Can't enable -Werror since krb5/Makefile implicitly compiles -# javax/security/auth/kerberos/ServicePermission.java, which contains -# a fallthrough warning. -#SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true -include $(BUILDDIR)/common/Defs.gmk - -# build sun/security/jgss/wrapper on non-windows platform -JGSS_WRAPPER = -ifneq ($(PLATFORM), windows) - JGSS_WRAPPER = jgss/wrapper -endif - -# Build PKCS#11 on all platforms except 64-bit Windows. -# We exclude windows-amd64 because we don't have any -# 64-bit PKCS#11 implementations to test with on that platform. -PKCS11 = pkcs11 -ifeq ($(ARCH_DATA_MODEL), 64) - ifeq ($(PLATFORM), windows) - PKCS11 = - endif -endif - -# Build Microsoft CryptoAPI provider only on Windows platform. -MSCAPI = -ifeq ($(PLATFORM), windows) - MSCAPI = mscapi -endif - -# Build in-tree elliptic curve crypto provider only when -# DISABLE_INTREE_EC is not set -INTREE_EC = ec -ifdef DISABLE_INTREE_EC - INTREE_EC = -endif - -SUBDIRS = $(INTREE_EC) other util krb5 -SUBDIRS_misc = jgss $(PKCS11) $(JGSS_WRAPPER) $(MSCAPI) smartcardio -SUBDIRS_tools = tools -include $(BUILDDIR)/common/Subdirs.gmk - -all build clean clobber:: - $(SUBDIRS-loop) - -clean:: - $(RM) -r $(CLASSBINDIR)/sun/security diff --git a/jdk/makefiles/sun/security/ec/FILES_c.gmk b/jdk/makefiles/sun/security/ec/FILES_c.gmk deleted file mode 100644 index 278cb21a199..00000000000 --- a/jdk/makefiles/sun/security/ec/FILES_c.gmk +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - ec.c \ - ec2_163.c \ - ec2_193.c \ - ec2_233.c \ - ec2_aff.c \ - ec2_mont.c \ - ecdecode.c \ - ecl.c \ - ecl_curve.c \ - ecl_gf.c \ - ecl_mult.c \ - ec_naf.c \ - ecp_192.c \ - ecp_224.c \ - ecp_256.c \ - ecp_384.c \ - ecp_521.c \ - ecp_aff.c \ - ecp_jac.c \ - ecp_jm.c \ - ecp_mont.c \ - mp_gf2m.c \ - mpi.c \ - mplogic.c \ - mpmontg.c \ - oid.c \ - secitem.c - diff --git a/jdk/makefiles/sun/security/jgss/Makefile b/jdk/makefiles/sun/security/jgss/Makefile deleted file mode 100644 index e8dbb6c2046..00000000000 --- a/jdk/makefiles/sun/security/jgss/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = sun.security.jgss -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -AUTO_FILES_JAVA_DIRS = sun/security/jgss - -# -# Rules -# -include $(BUILDDIR)/common/Classes.gmk diff --git a/jdk/makefiles/sun/security/jgss/wrapper/FILES_c.gmk b/jdk/makefiles/sun/security/jgss/wrapper/FILES_c.gmk deleted file mode 100644 index 438168cbfc2..00000000000 --- a/jdk/makefiles/sun/security/jgss/wrapper/FILES_c.gmk +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - NativeUtil.c \ - NativeFunc.c \ - GSSLibStub.c diff --git a/jdk/makefiles/sun/security/jgss/wrapper/Makefile b/jdk/makefiles/sun/security/jgss/wrapper/Makefile deleted file mode 100644 index 91fdf90b475..00000000000 --- a/jdk/makefiles/sun/security/jgss/wrapper/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../../.. -PACKAGE = sun.security.jgss.wrapper -PRODUCT = sun - -LIBRARY = j2gss -# Force name of temp directory (needed due to LIBRARY change below) -LIBRARY_OUTPUT = j2gss - -include $(BUILDDIR)/common/Defs.gmk - -# -# C and Java Files -# -include FILES_c.gmk - -AUTO_FILES_JAVA_DIRS = sun/security/jgss/wrapper - -# -# Java files that define native methods -# -FILES_export = \ - sun/security/jgss/wrapper/GSSLibStub.java - -# -# Find native code -# -vpath %.c \ - $(SHARE_SRC)/native/sun/security/jgss/wrapper \ - $(PLATFORM_SRC)/native/sun/security/jgss/wrapper - -# -# Find include files -# -OTHER_INCLUDES += \ - -I$(SHARE_SRC)/native/sun/security/jgss/wrapper \ - -I$(PLATFORM_SRC)/native/sun/security/jgss/wrapper - -# -# Rules -# -#FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class) - -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -# -# Libraries to link -# -ifneq ($(PLATFORM), windows) - OTHER_LDLIBS = $(LIBDL) -endif - diff --git a/jdk/makefiles/sun/security/krb5/FILES_c_windows.gmk b/jdk/makefiles/sun/security/krb5/FILES_c_windows.gmk deleted file mode 100644 index 82d5b6b85dc..00000000000 --- a/jdk/makefiles/sun/security/krb5/FILES_c_windows.gmk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - NativeCreds.c \ - WindowsDirectory.c diff --git a/jdk/makefiles/sun/security/krb5/Makefile b/jdk/makefiles/sun/security/krb5/Makefile deleted file mode 100644 index 02ac6e99d54..00000000000 --- a/jdk/makefiles/sun/security/krb5/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# -# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = sun.security.krb5 -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Java Files -# -AUTO_FILES_JAVA_DIRS = sun/security/krb5 - -ifeq ($(PLATFORM), macosx) -FILES_export = sun/security/krb5/Credentials.java -FILES_c = nativeccache.c -LIBRARY = osxkrb5 -endif # PLATFORM - -ifeq ($(PLATFORM), windows) -# -# Java files that define native methods -# -FILES_export = \ - sun/security/krb5/Credentials.java \ - sun/security/krb5/Config.java -include FILES_c_windows.gmk -# We need some extra libs for win32 -LIBRARY = w2k_lsa_auth -EXTRA_LIBS += Secur32.lib netapi32.lib\ - kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\ - advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\ - odbccp32.lib wsock32.lib -endif # PLATFORM - -# -# Find native code -# -ifeq ($PLATFORM), macosx) - vpath %.c $(call NativeSrcDirList,,native/sun/security/krb5) -else - vpath %.c \ - $(PLATFORM_SRC)/native/sun/security/krb5 -endif - -JGSS_NATIVE_SRC=$(PLATFORM_SRC)/native/sun/security/krb5 -JGSS_NATIVE_DIR_EXISTS := $(shell if [ -d $(JGSS_NATIVE_SRC) ] ; then echo true; else echo false; fi) - -# -# Rules -# -ifeq ($(PLATFORM), windows) - ifeq ($(JGSS_NATIVE_DIR_EXISTS), true) - include $(BUILDDIR)/common/Library.gmk - endif -else ifeq ($(PLATFORM), macosx) - include $(BUILDDIR)/common/Library.gmk -else -include $(BUILDDIR)/common/Classes.gmk -endif # PLATFORM - -ifneq ($(PLATFORM), windows) - ifeq ($(PLATFORM), macosx) - OTHER_LDLIBS = $(LIBDL) -framework Kerberos - else - OTHER_LDLIBS = $(LIBDL) - endif -endif diff --git a/jdk/makefiles/sun/security/mscapi/FILES_cpp.gmk b/jdk/makefiles/sun/security/mscapi/FILES_cpp.gmk deleted file mode 100644 index 20ee872e460..00000000000 --- a/jdk/makefiles/sun/security/mscapi/FILES_cpp.gmk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_cpp = \ - security.cpp - diff --git a/jdk/makefiles/sun/security/mscapi/Makefile b/jdk/makefiles/sun/security/mscapi/Makefile deleted file mode 100644 index 1cd6024a9c4..00000000000 --- a/jdk/makefiles/sun/security/mscapi/Makefile +++ /dev/null @@ -1,296 +0,0 @@ -# -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# Makefile for building sunmscapi.jar and native libraries. -# -# This file was derived from make/com/sun/crypto/provider/Makefile. -# - -# -# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Sun JDK builds -# respectively.) -# -# JCE builds are very different between OpenJDK and JDK. The OpenJDK JCE -# jar files do not require signing, but those for JDK do. If an unsigned -# jar file is installed into JDK, things will break when the crypto -# routines are called. -# -# This Makefile does the "real" build of the JCE files. For OpenJDK, -# the jar files built here are installed directly into the OpenJDK. -# -# For JDK, the binaries use pre-built/pre-signed binary files stored in -# the closed workspace that are not shipped in the OpenJDK workspaces. -# We still build the JDK files here to verify the files compile, and in -# preparation for possible signing. Developers working on JCE in JDK -# must sign the JCE files before testing. The JCE signing key is kept -# separate from the JDK workspace to prevent its disclosure. -# -# SPECIAL NOTE TO JCE/JDK developers: The source files must eventually -# be built, signed, and then the resulting jar files MUST BE CHECKED -# INTO THE CLOSED PART OF THE WORKSPACE*. This separate step *MUST NOT -# BE FORGOTTEN*, otherwise a bug fixed in the source code will not be -# reflected in the shipped binaries. The "release" target should be -# used to generate the required files. -# -# There are a number of targets to help both JDK/OpenJDK developers. -# -# Main Targets (JDK/OPENJDK): -# -# all/clobber/clean The usual, plus the native libraries. -# If OpenJDK, installs sunmscapi.jar. -# If JDK, installs prebuilt -# sunmscapi.jar. -# -# jar Builds/installs sunmscapi.jar -# If OpenJDK, does not sign. -# If JDK, tries to sign. -# -# Other lesser-used Targets (JDK/OPENJDK): -# -# build-jar Builds sunmscapi.jar -# (does not sign/install) -# -# install-jar Alias for "jar" above. -# -# Other targets (JDK only): -# -# sign Alias for sign-jar -# sign-jar Builds/signs sunmscapi.jar (no install) -# -# release Builds all targets in preparation -# for workspace integration. -# -# install-prebuilt Installs the pre-built jar files -# -# This makefile was written to support parallel target execution. -# - -BUILDDIR = ../../.. -PACKAGE = sun.security.mscapi -LIBRARY = sunmscapi -PRODUCT = sun - -# -# The following is for when we need to do postprocessing -# (signing/obfuscation) against a read-only build. If the OUTPUTDIR -# isn't writable, the build currently crashes out. -# -ifndef OPENJDK - ifdef ALT_JCE_BUILD_DIR - # ===================================================== - # Where to place the output, in case we're building from a read-only - # build area. (e.g. a release engineering build.) - JCE_BUILD_DIR=${ALT_JCE_BUILD_DIR} - IGNORE_WRITABLE_OUTPUTDIR_TEST=true - else - JCE_BUILD_DIR=${TEMPDIR} - endif -endif - -include $(BUILDDIR)/common/Defs.gmk - -CPLUSPLUSLIBRARY=true - -# -# C++ and Java Files -# -include FILES_cpp.gmk - -AUTO_FILES_JAVA_DIRS = sun/security/mscapi - -# -# Java files that define native methods -# -FILES_export = \ - sun/security/mscapi/KeyStore.java \ - sun/security/mscapi/Key.java \ - sun/security/mscapi/PRNG.java \ - sun/security/mscapi/RSACipher.java \ - sun/security/mscapi/RSAPublicKey.java \ - sun/security/mscapi/RSASignature.java \ - sun/security/mscapi/RSAKeyPairGenerator.java - -# -# Find native code -# -vpath %.cpp \ - $(PLATFORM_SRC)/native/sun/security/mscapi - -# -# Find include files -# -OTHER_INCLUDES += \ - -I$(PLATFORM_SRC)/native/sun/security/mscapi - -# -# Rules -# -CLASSDESTDIR = $(TEMPDIR)/classes -JAVAHFLAGS = -bootclasspath \ - "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)$(JCE_PATH)" - -include $(BUILDDIR)/common/Mapfile-vers.gmk - -include $(BUILDDIR)/common/Library.gmk - -# -# Libraries to link -# -ifeq ($(PLATFORM), windows) - OTHER_LDLIBS += Crypt32.Lib -endif - -# -# We use a variety of subdirectories in the $(TEMPDIR) depending on what -# part of the build we're doing. Both OPENJDK/JDK builds are initially -# done in the unsigned area. When files are signed in JDK, -# they will be placed in the appropriate area. -# -UNSIGNED_DIR = $(TEMPDIR)/unsigned - -# -# Rules -# - -ifdef OPENJDK -all: build-jar install-jar -else -all: build-jar install-prebuilt - $(build-warning) -endif - -include $(BUILDDIR)/javax/crypto/Defs-jce.gmk - - -# ===================================================== -# Build the unsigned sunmscapi.jar file. -# - -JAR_DESTFILE = $(EXTDIR)/sunmscapi.jar - -# -# The sunmscapi.jar needs to be in the extension class directory, -# therefore none of its classes can appear in $(CLASSBINDIR). -# Currently no one is using any of the MSCAPI internals, so these files -# should not have been built. -# - -# -# Since the -C option to jar is used below, each directory entry must be -# preceded with the appropriate directory to "cd" into. -# -JAR_DIRS = $(patsubst %, -C $(CLASSDESTDIR) %, $(AUTO_FILES_JAVA_DIRS)) - -build-jar: $(UNSIGNED_DIR)/sunmscapi.jar - -# -# Build sunmscapi.jar. -# -$(UNSIGNED_DIR)/sunmscapi.jar: build - $(prep-target) - $(BOOT_JAR_CMD) cf $@ $(JAR_DIRS) \ - $(BOOT_JAR_JFLAGS) - @$(java-vm-cleanup) - - -ifndef OPENJDK -# ===================================================== -# Sign the provider jar file. Not needed for OpenJDK. -# - -SIGNED_DIR = $(JCE_BUILD_DIR)/signed - -sign: sign-jar - -sign-jar: $(SIGNED_DIR)/sunmscapi.jar - -ifndef ALT_JCE_BUILD_DIR -$(SIGNED_DIR)/sunmscapi.jar: $(UNSIGNED_DIR)/sunmscapi.jar -else -# -# We have to remove the build dependency, otherwise, we'll try to rebuild it -# which we can't do on a read-only filesystem. -# -$(SIGNED_DIR)/sunmscapi.jar: - @if [ ! -r $(UNSIGNED_DIR)/sunmscapi.jar ] ; then \ - $(ECHO) "Couldn't find $(UNSIGNED_DIR)/sunmscapi.jar"; \ - exit 1; \ - fi -endif - $(call sign-file, $(UNSIGNED_DIR)/sunmscapi.jar) - - -# ===================================================== -# Create the Release Engineering files. Signed builds, etc. -# - -release: $(SIGNED_DIR)/sunmscapi.jar - $(RM) $(JCE_BUILD_DIR)/release/sunmscapi.jar - $(MKDIR) -p $(JCE_BUILD_DIR)/release - $(CP) $(SIGNED_DIR)/sunmscapi.jar $(JCE_BUILD_DIR)/release - $(release-warning) - -endif # OPENJDK - - -# ===================================================== -# Install routines. -# - -# -# Install sunmscapi.jar, depending on which type is requested. -# -install-jar jar: $(JAR_DESTFILE) -ifndef OPENJDK - $(release-warning) -endif - -ifdef OPENJDK -$(JAR_DESTFILE): $(UNSIGNED_DIR)/sunmscapi.jar -else -$(JAR_DESTFILE): $(SIGNED_DIR)/sunmscapi.jar -endif - $(install-file) - -ifndef OPENJDK -install-prebuilt: - @$(ECHO) "\n>>>Installing prebuilt SunMSCAPI provider..." - $(RM) $(JAR_DESTFILE) - $(CP) $(PREBUILT_DIR)/mscapi/sunmscapi.jar $(JAR_DESTFILE) -endif - - -# ===================================================== -# Support routines. -# - -clobber clean:: - $(RM) -r $(JAR_DESTFILE) $(TEMPDIR) $(JCE_BUILD_DIR) - -.PHONY: build-jar jar install-jar -ifndef OPENJDK -.PHONY: sign sign-jar release install-prebuilt -endif diff --git a/jdk/makefiles/sun/security/other/Makefile b/jdk/makefiles/sun/security/other/Makefile deleted file mode 100644 index 37293aa9cb0..00000000000 --- a/jdk/makefiles/sun/security/other/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = sun.security.other -PRODUCT = sun -JAVAC_MAX_WARNINGS=true -JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation -JAVAC_WARNINGS_FATAL=true -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -AUTO_FILES_JAVA_DIRS = \ - sun/security/acl \ - sun/security/jca \ - sun/security/pkcs \ - sun/security/pkcs10 \ - sun/security/pkcs12 \ - sun/security/provider \ - sun/security/rsa \ - sun/security/ssl \ - sun/security/ssl/krb5 \ - sun/security/timestamp \ - sun/security/validator \ - sun/security/x509 \ - com/sun/net/ssl/internal/ssl - -# -# EC classes used by the packages above -# -FILES_java += \ - sun/security/ec/ECKeyFactory.java \ - sun/security/ec/ECParameters.java \ - sun/security/ec/ECPrivateKeyImpl.java \ - sun/security/ec/ECPublicKeyImpl.java \ - sun/security/ec/NamedCurve.java - -# -# Rules -# -include $(BUILDDIR)/common/Classes.gmk diff --git a/jdk/makefiles/sun/security/smartcardio/FILES_c.gmk b/jdk/makefiles/sun/security/smartcardio/FILES_c.gmk deleted file mode 100644 index 67b760eefdf..00000000000 --- a/jdk/makefiles/sun/security/smartcardio/FILES_c.gmk +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - pcsc.c \ - pcsc_md.c diff --git a/jdk/makefiles/sun/security/smartcardio/Makefile b/jdk/makefiles/sun/security/smartcardio/Makefile deleted file mode 100644 index c98e97800e6..00000000000 --- a/jdk/makefiles/sun/security/smartcardio/Makefile +++ /dev/null @@ -1,80 +0,0 @@ -# -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = sun.security.smartcardio -LIBRARY = j2pcsc -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# C and Java Files -# -include FILES_c.gmk - -AUTO_FILES_JAVA_DIRS = sun/security/smartcardio - -# -# Java files that define native methods -# -FILES_export = \ - sun/security/smartcardio/PCSC.java \ - sun/security/smartcardio/PlatformPCSC.java - -# -# Find native code -# -vpath %.c \ - $(SHARE_SRC)/native/sun/security/smartcardio \ - $(PLATFORM_SRC)/native/sun/security/smartcardio - -# -# Find include files -# -OTHER_INCLUDES += \ - -I$(SHARE_SRC)/native/sun/security/smartcardio \ - -I$(PLATFORM_SRC)/native/sun/security/smartcardio \ - -I$(PLATFORM_SRC)/native/sun/security/smartcardio/MUSCLE - -# -# Rules -# -#CLASSDESTDIR = $(TMPDIR)/classes - -#FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class) - -include $(BUILDDIR)/common/Mapfile-vers.gmk - -include $(BUILDDIR)/common/Library.gmk - -# -# Libraries to link -# -ifeq ($(PLATFORM), windows) - OTHER_LDLIBS = winscard.lib -else - OTHER_LDLIBS = $(LIBDL) - OTHER_CFLAGS = -D__sun_jdk -endif diff --git a/jdk/makefiles/sun/security/tools/Makefile b/jdk/makefiles/sun/security/tools/Makefile deleted file mode 100644 index 94f692a2324..00000000000 --- a/jdk/makefiles/sun/security/tools/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = sun.security.tools -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -AUTO_FILES_JAVA_DIRS = sun/security/tools - -# -# Resources -# -LOCALE_SET_DEFINITION = jdk -RESOURCE_BUNDLES_JAVA = sun/security/tools/JarSignerResources.java - -# -# Rules -# -include $(BUILDDIR)/common/Classes.gmk - -build: -# $(call make-launcher, keytool, sun.security.tools.KeyTool, , ) -#ifndef BUILD_HEADLESS_ONLY -# $(call make-launcher, policytool, sun.security.tools.policytool.PolicyTool, , ) -#endif - diff --git a/jdk/makefiles/sun/security/util/Makefile b/jdk/makefiles/sun/security/util/Makefile deleted file mode 100644 index be7c7f8be0d..00000000000 --- a/jdk/makefiles/sun/security/util/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../../.. -PACKAGE = sun.security.util -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -AUTO_FILES_JAVA_DIRS = sun/security/util - -# -# Resources -# -LOCALE_SET_DEFINITION = jre -RESOURCE_BUNDLES_JAVA = sun/security/util/Resources.java - -# -# Rules -# -include $(BUILDDIR)/common/Classes.gmk - diff --git a/jdk/makefiles/sun/splashscreen/FILES_c.gmk b/jdk/makefiles/sun/splashscreen/FILES_c.gmk deleted file mode 100644 index f55b8d71539..00000000000 --- a/jdk/makefiles/sun/splashscreen/FILES_c.gmk +++ /dev/null @@ -1,114 +0,0 @@ -# -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -FILES_c = \ - java_awt_SplashScreen.c \ - splashscreen_gfx_impl.c \ - splashscreen_gif.c \ - splashscreen_impl.c \ - splashscreen_jpeg.c \ - splashscreen_png.c \ - splashscreen_sys.c \ - png.c \ - pngerror.c \ - pngget.c \ - pngmem.c \ - pngpread.c \ - pngread.c \ - pngrio.c \ - pngrtran.c \ - pngrutil.c \ - pngset.c \ - pngtrans.c \ - pngwio.c \ - pngwrite.c \ - pngwtran.c \ - pngwutil.c \ - dgif_lib.c \ - gif_err.c \ - gifalloc.c \ - jcomapi.c \ - jdapimin.c \ - jdapistd.c \ - jdcoefct.c \ - jdcolor.c \ - jddctmgr.c \ - jdhuff.c \ - jdinput.c \ - jdmainct.c \ - jdmarker.c \ - jdmaster.c \ - jdmerge.c \ - jdphuff.c \ - jdpostct.c \ - jdsample.c \ - jerror.c \ - jidctflt.c \ - jidctfst.c \ - jidctint.c \ - jidctred.c \ - jmemmgr.c \ - jmemnobs.c \ - jquant1.c \ - jquant2.c \ - jutils.c \ - jcapimin.c \ - jcapistd.c \ - jccoefct.c \ - jccolor.c \ - jcdctmgr.c \ - jchuff.c \ - jcinit.c \ - jcmainct.c \ - jcmarker.c \ - jcmaster.c \ - jcparam.c \ - jcphuff.c \ - jcprepct.c \ - jcsample.c \ - jctrans.c \ - jdtrans.c \ - jfdctflt.c \ - jfdctfst.c \ - jfdctint.c - -ifneq ($(SYSTEM_ZLIB),true) - FILES_c += \ - compress.c \ - deflate.c \ - gzclose.c \ - gzlib.c \ - gzread.c \ - gzwrite.c \ - infback.c \ - inffast.c \ - inflate.c \ - inftrees.c \ - trees.c \ - uncompr.c \ - zadler32.c \ - zcrc32.c \ - zutil.c -endif diff --git a/jdk/makefiles/sun/splashscreen/Makefile b/jdk/makefiles/sun/splashscreen/Makefile deleted file mode 100644 index 8ca6c35e79c..00000000000 --- a/jdk/makefiles/sun/splashscreen/Makefile +++ /dev/null @@ -1,134 +0,0 @@ -# -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PACKAGE = sun.awt -LIBRARY = splashscreen -PRODUCT = sun -include $(BUILDDIR)/common/Defs.gmk - -# -# Files -# -include FILES_c.gmk - -FILES_java = \ - java/awt/SplashScreen.java - -FILES_export = \ - java/awt/SplashScreen.java - - -# -# Rules -# -# FIXME!!!! -#ifeq ($(PLATFORM), solaris) -# ifneq ($(ARCH), amd64) -# FILES_reorder += reorder-$(ARCH) -# endif -#endif -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -JAVALIB= - -# -# C Flags -# - -CFLAGS += -DSPLASHSCREEN - -ifeq ($(PLATFORM), macosx) - CFLAGS += -DWITH_MACOSX - - # CFLAGS and CPPFLAGS are added when linking as well, so we use VARIANT - # instead to specify that we're actually compiling objective-c code here - CFLAGS_$(VARIANT)/java_awt_SplashScreen.o = -x objective-c - CFLAGS_$(VARIANT)/splashscreen_gfx_impl.o = -x objective-c - CFLAGS_$(VARIANT)/splashscreen_gif.o = -x objective-c - CFLAGS_$(VARIANT)/splashscreen_impl.o = -x objective-c - CFLAGS_$(VARIANT)/splashscreen_jpeg.o = -x objective-c - CFLAGS_$(VARIANT)/splashscreen_png.o = -x objective-c - CFLAGS_$(VARIANT)/splashscreen_sys.o = -x objective-c - - OTHER_CFLAGS += -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks - CPPFLAGS += -I/System/Library/Frameworks/AppKit.framework/Versions/C/Headers - OTHER_LDLIBS += $(LIBM) -lpthread -liconv -losxapp \ - -framework ApplicationServices \ - -framework Foundation \ - -framework Cocoa \ - -framework JavaNativeFoundation -else ifneq ($(PLATFORM), windows) - CFLAGS += -DWITH_X11 - ifeq ($(PLATFORM), macosx) - OTHER_LDLIBS += -liconv - CPPFLAGS += -I$(OPENWIN_HOME)/include \ - -I$(OPENWIN_HOME)/include/X11/extensions - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -pthread - else - CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread - endif -else # PLATFORM - CFLAGS += -DWITH_WIN32 - OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll -#$(JVMLIB) $(OBJDIR)/../../jpeg/$(OBJDIRNAME)/jpeg$(SUFFIX).lib -endif # PLATFORM - -# -# Add to ambient vpath to get files in a subdirectory -# -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen -vpath %.c $(SHARE_SRC)/native/$(PKGDIR) -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/giflib -ifneq ($(SYSTEM_ZLIB),true) - vpath %.c $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) -endif -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/libpng -vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -ifneq ($(PLATFORM), macosx) - vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -else - vpath %.m $(call NativeSrcDirList,,native/$(PKGDIR)/splashscreen) -endif - -ifneq ($(PLATFORM), macosx) - CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -else - CPPFLAGS += $(call NativeSrcDirList,-I,native/$(PKGDIR)/splashscreen) - CPPFLAGS += $(call NativeSrcDirList,-I,/native/sun/osxapp) -endif -CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen -CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -ifneq ($(SYSTEM_ZLIB),true) - CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) -else - OTHER_LDLIBS += -lz -endif - -# Shun the less than portable MMX assembly code in pnggccrd.c, -# and use alternative implementations in C. -CPPFLAGS += -DPNG_NO_MMX_CODE diff --git a/jdk/makefiles/sun/xawt/FILES_c_unix.gmk b/jdk/makefiles/sun/xawt/FILES_c_unix.gmk deleted file mode 100644 index 0ce8bdd11f5..00000000000 --- a/jdk/makefiles/sun/xawt/FILES_c_unix.gmk +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# include rules -# - -FILES_c = \ - XlibWrapper.c \ - XWindow.c \ - XToolkit.c \ - X11Color.c \ - X11SurfaceData.c \ - awt_GraphicsEnv.c \ - awt_InputMethod.c \ - robot_common.c \ - awt_Robot.c \ - list.c \ - multiVis.c \ - initIDs.c \ - awt_util.c \ - awt_Desktop.c \ - awt_UNIXToolkit.c \ - X11FontScaler_md.c \ - X11TextRenderer_md.c \ - fontpath.c \ - awt_Insets.c \ - awt_Event.c \ - X11Renderer.c \ - X11PMBlitLoops.c \ - OGLBlitLoops.c \ - OGLBufImgOps.c \ - OGLContext.c \ - OGLFuncs.c \ - OGLMaskBlit.c \ - OGLMaskFill.c \ - OGLPaints.c \ - OGLRenderQueue.c \ - OGLRenderer.c \ - OGLSurfaceData.c \ - OGLTextRenderer.c \ - OGLVertexCache.c \ - GLXGraphicsConfig.c \ - GLXSurfaceData.c \ - AccelGlyphCache.c \ - awt_Font.c \ - multi_font.c \ - awt_AWTEvent.c \ - awt_DrawingSurface.c \ - jawt.c \ - CUPSfuncs.c \ - debug_assert.c \ - debug_mem.c \ - debug_trace.c \ - debug_util.c \ - awt_Plugin.c \ - gtk2_interface.c \ - swing_GTKEngine.c \ - swing_GTKStyle.c \ - rect.c \ - sun_awt_X11_GtkFileDialogPeer.c \ - XRSurfaceData.c \ - XRBackendNative.c diff --git a/jdk/makefiles/sun/xawt/FILES_export_unix.gmk b/jdk/makefiles/sun/xawt/FILES_export_unix.gmk deleted file mode 100644 index 5d8d624dfdb..00000000000 --- a/jdk/makefiles/sun/xawt/FILES_export_unix.gmk +++ /dev/null @@ -1,37 +0,0 @@ -# -# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -# -# include rules -# - -FILES_export = \ - sun/awt/X11/XlibWrapper.java \ - sun/awt/X11/XWindow.java \ - sun/awt/X11/XDesktopPeer.java \ - sun/awt/X11/XToolkit.java \ - sun/awt/X11/XComponentPeer.java \ - sun/awt/X11/XInputMethod.java \ - sun/awt/X11/GtkFileDialogPeer.java diff --git a/jdk/makefiles/sun/xawt/Makefile b/jdk/makefiles/sun/xawt/Makefile deleted file mode 100644 index 14b0651843a..00000000000 --- a/jdk/makefiles/sun/xawt/Makefile +++ /dev/null @@ -1,389 +0,0 @@ -# -# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -BUILDDIR = ../.. -PACKAGE = sun.awt.X11 -LIBRARY = awt_xawt -PRODUCT = sun - -include $(BUILDDIR)/common/Defs.gmk - -GEN_DIR=$(GENSRCDIR)/sun/awt/X11 - -CLASSES_INIT += $(TEMPDIR)/.gen.wrappers $(TEMPDIR)/.gen_icons touch.wrappers - -.PHONY: generated.clean - -# -# Files -# -include FILES_c_unix.gmk -include FILES_export_unix.gmk -AUTO_FILES_JAVA_DIRS = sun/awt/X11 -AUTO_JAVA_PRUNE = WrapperGenerator.java - -LDFLAGS += -L$(OPENWIN_LIB) - -# For Xrender extension. -ifeq ($(PLATFORM), solaris) -LDFLAGS += -L/usr/openwin/sfw/lib$(ISA_DIR) -R/usr/openwin/sfw/lib$(ISA_DIR) -endif - -ifeq ($(PLATFORM), linux) -LDFLAGS += -lpthread -dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) -endif - -ifeq ($(PLATFORM), macosx) -LDFLAGS += -pthread -dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) -endif - -# Since this library will be living in a subdirectory below the other libraries -# we need to add an extra runpath so that libraries in the upper directory -# are found at runtime. -LD_RUNPATH_EXTRAS = .. - -# -# Rules. -# -include $(BUILDDIR)/common/Mapfile-vers.gmk -include $(BUILDDIR)/common/Library.gmk - -# -# Add to the ambient vpath to pick up files in subdirectories -# -vpath %.c $(SHARE_SRC)/native/sunawt/alphacomposite -vpath %.c $(PLATFORM_SRC)/native/sun/xawt -vpath %.c $(PLATFORM_SRC)/native/sun/awt -vpath %.c $(SHARE_SRC)/native/sun/awt/debug -vpath %.c $(SHARE_SRC)/native/sun/awt/image -vpath %.c $(SHARE_SRC)/native/sun/awt/image/gif -vpath %.c $(SHARE_SRC)/native/sun/awt/image/cvutils -vpath %.c $(SHARE_SRC)/native/sun/awt/shell -vpath %.c $(SHARE_SRC)/native/sun/java2d -vpath %.c $(SHARE_SRC)/native/sun/java2d/loops -vpath %.c $(SHARE_SRC)/native/sun/java2d/pipe -vpath %.c $(SHARE_SRC)/native/sun/awt/medialib -vpath %.c $(SHARE_SRC)/native/sun/awt/utility -vpath %.cpp $(SHARE_SRC)/native/sun/image -vpath %.c $(SHARE_SRC)/native/sun/font -vpath %.c $(PLATFORM_SRC)/native/sun/awt/robot_child -vpath %.c $(SHARE_SRC)/native/sun/java2d/opengl -vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl -vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 - -OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) \ - $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi - -ifeq ($(PLATFORM), solaris) -CPPFLAGS += -DFUNCPROTO=15 -dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) -endif - -CPPFLAGS += $(CUPS_CFLAGS) - -CPPFLAGS += -DXAWT -DXAWT_HACK \ - -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ - -I$(PLATFORM_SRC)/native/sun/awt \ - -I$(PLATFORM_SRC)/native/sun/xawt \ - -I$(PLATFORM_SRC)/native/sun/jdga \ - -I$(SHARE_SRC)/native/sun/awt/debug \ - -I$(SHARE_SRC)/native/sun/awt/image/cvutils \ - -I$(SHARE_SRC)/native/sun/java2d \ - -I$(SHARE_SRC)/native/sun/java2d/loops \ - -I$(SHARE_SRC)/native/sun/awt/image/cvutils \ - -I$(SHARE_SRC)/native/sun/awt/image \ - -I$(SHARE_SRC)/native/sun/font \ - -I$(PLATFORM_SRC)/native/sun/java2d \ - -I$(SHARE_SRC)/native/sun/java2d/pipe \ - -I$(SHARE_SRC)/native/sun/java2d/opengl \ - -I$(PLATFORM_SRC)/native/sun/java2d/opengl \ - -I$(PLATFORM_SRC)/native/sun/java2d/x11 \ - -I$(SHARE_SRC)/native/sun/dc/path \ - -I$(SHARE_SRC)/native/sun/dc/doe \ - -I$(SHARE_SRC)/native/sun/awt/alphacomposite \ - -I$(SHARE_SRC)/native/sun/awt/medialib \ - -I$(PLATFORM_SRC)/native/sun/awt/medialib \ - -I$(PLATFORM_SRC)/native/sun/font \ - -I$(SHARE_SRC)/native/sun/awt \ - -I$(PLATFORM_SRC)/native/sun/awt - -ifeq ($(PLATFORM), linux) - ifndef CROSS_COMPILE_ARCH - # Allows for builds on Debian GNU Linux, X11 is in a different place - # This should really be handled at a higher-level so we don't have to - # work-around this when cross-compiling - CPPFLAGS += -I$(SYS_ROOT)/usr/X11R6/include/X11/extensions \ - -I$(SYS_ROOT)/usr/include/X11/extensions \ - -I$(OPENWIN_HOME)/include - else - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ - -I$(OPENWIN_HOME)/include - endif -endif - -# We have some odd logic here because some Solaris 10 updates -# have a render.h file that suggests gradients are supported, but -# the Xrender.h doesn't have the corresponding type definitions. -# Earlier updates have neither. We'd like to know if there's a mismatch. -# Whilst in the C preprocessor we can tell if the render.h define's are set -# we can't tell anything about C declarations. -# A grep of Xrender.h is the only way to know this. If they are absent -# we will set a flag indicating this mismatch and the JDK source file -# will interpret it to resolve the problem. -ifeq ($(PLATFORM), solaris) - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions - OS_VERSION := $(shell uname -r) - XRENDER_H := $(OPENWIN_HOME)/share/include/X11/extensions/Xrender.h - ifeq ($(OS_VERSION),5.10) - LINEARGRADIENT_CNT := $(shell $(EGREP) -c XLinearGradient $(XRENDER_H)) - ifeq ($(LINEARGRADIENT_CNT),0) - CFLAGS+= -DSOLARIS10_NO_XRENDER_STRUCTS - endif - endif -endif - -ifeq ($(PLATFORM), macosx) - CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" -endif - -ifeq ($(MILESTONE), internal) - CPPFLAGS += -DINTERNAL_BUILD -endif - -# -# Generation of wrappers -# -SIZER_DIR=$(GEN_DIR)/generator -SIZER = $(SIZER_DIR)/sizer -SIZER_32_C = $(SIZER).32.c -SIZER_64_C = $(SIZER).64.c -CFLAGS_32=$(CFLAGS) -CFLAGS_64=$(CFLAGS) - -ifeq ($(PLATFORM), solaris) - -isalist:=$(shell $(ISAINFO)) - -ifneq (,$(findstring sparcv9, $(isalist))) -# On sparcv9 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL. -# On sparcv9 CFLAGS already contain $(XARCH_OPTION/64), so to generate 32-bit sizer we need to change this option. -CFLAGS_32=$(subst $(XARCH_OPTION/64),$(XARCH_OPTION/32),$(CFLAGS)) -SIZERS = $(SIZER).32 $(SIZER).64 -SIZERS_C = $(SIZER_32_C) $(SIZER_64_C) -SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64 -CFLAGS_64=$(CFLAGS) $(XARCH_OPTION/64) -else -ifneq (,$(findstring amd64, $(isalist))) -# On amd64 we generate both 32 and 64-bit sizers in spite of ARCH_DATA_MODEL. -# On amd64 CFLAGS already contain $(XARCH_OPTION/64), so to generate 32-bit sizer we need to change this option. -CFLAGS_32=$(subst $(XARCH_OPTION/64),$(XARCH_OPTION/32),$(CFLAGS)) -SIZERS = $(SIZER).32 $(SIZER).64 -SIZERS_C = $(SIZER_32_C) $(SIZER_64_C) -SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64 -CFLAGS_64=$(CFLAGS) $(XARCH_OPTION/64) -else # !sparcv9 : includes (32-bit) sparc, i586 -SIZERS = $(SIZER).32 -SIZERS_C = $(SIZER_32_C) -SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 -endif # amd64 -endif # sparcv9 - -else # !solaris - -ifeq ($(PLATFORM), macosx) -CFLAGS_32=-arch i386 -SIZERS = $(SIZER).32 $(SIZER).64 -SIZERS_C = $(SIZER_32_C) $(SIZER_64_C) -SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64 -CFLAGS_64=-arch x86_64 -else # !macosx -ifeq ($(ARCH_DATA_MODEL), 32) -SIZERS = $(SIZER).32 -SIZERS_C = $(SIZER_32_C) -SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 -ifdef CROSS_COMPILE_ARCH -CFLAGS_32 = -m32 -endif -else # !32 -SIZERS = $(SIZER).64 -SIZERS_C = $(SIZER_64_C) -SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64 -ifdef CROSS_COMPILE_ARCH -CFLAGS_64 = -m64 -endif -endif # 32 -endif # !macosx -endif # solaris - -# XXX Hack for 6185483 - use hard-coded sizes. -# Add the 64-bit platforms that need to be included into 32-bit build -# and have sizes.64-$(PLATFORM)-$(LIBARCH) hardcoded in the workspace -ifeq ($(PLATFORM)-$(LIBARCH), solaris-i386) -# If you define DOHACK=true for some combination of $(PLATFORM)-$(LIBARCH), -# make sure you have sizes.64-$(PLATFORM)-$(LIBARCH) pre-generated in -# $(PLATFORM_SRC)/classes/sun/awt/X11/generator/ -DOHACK=true -endif # Hack - -ifeq ($(DOHACK), true) -PREDEFINED_SIZES_TMPL=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/sizes.64-$(PLATFORM)-$(LIBARCH) -PREDEFINED_SIZES=$(WRAPPER_GENERATOR_DIR)/sizes.64 -SIZES += $(WRAPPER_GENERATOR_DIR)/sizes.64 -endif - -ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64) -DOCOMPARE=true -endif -# 64 bit sizers are generated on platform-libarch (left) for use -# on platform-libarch (right) and stored under the latter name. -# Do compare manually stored and automatically generated pair(s) -# if DOCOMPARE=true, just after the generation. -STORED_SIZES_TMPL_solaris_amd64=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/sizes.64-solaris-i386 - -WRAPPER_GENERATOR_JAVA=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/WrapperGenerator.java -WRAPPER_GENERATOR_DIR=$(GENSRCDIR)/sun/awt/X11/generator -WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator -WRAPPER_GENERATOR_CLASS=$(WRAPPER_GENERATOR_TEMPDIR)/WrapperGenerator.class -XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt - -ifndef CROSS_COMPILE_ARCH -SIZERS_CC = $(CC) -else -SIZERS_CC = $(HOST_CC) -endif - -$(SIZERS): $(SIZERS_C) - $(prep-target) - - $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c - $(SIZERS_CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o - -$(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA) - $(prep-target) - $(BOOT_JAVAC_CMD) -d $(WRAPPER_GENERATOR_TEMPDIR) $(WRAPPER_GENERATOR_JAVA) - -$(SIZERS_C): $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) - $(prep-target) - $(MKDIR) -p $(WRAPPER_GENERATOR_TEMPDIR) - $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ - $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) - -$(SIZES): $(SIZERS) - @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ - $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ - $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ - $(CHMOD) +w $@;\ - else \ - $(ECHO) GENERATING $@; \ - $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ - fi - @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ - $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ - $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ - fi - -$(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) - $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ - $(GEN_DIR) $(XLIBTYPES) "gen" $(WRAPPER_GENERATOR_DIR)/sizes - -touch.wrappers: $(TEMPDIR)/.gen.wrappers - $(MKDIR) -p $(TEMPDIR) - $(TOUCH) $(TEMPDIR)/.gen.wrappers - -generated.clean: - $(RM) -r $(WRAPPER_GENERATOR_TEMPDIR) - $(RM) -r $(WRAPPER_GENERATOR_DIR) - $(RM) -r $(GEN_DIR)/*.java - $(RM) -r $(TEMPDIR)/.gen_icons - -ifdef OPENJDK - ICONS_PATH_PREFIX=$(PLATFORM_SRC) -else - ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris -endif - -ICONS = \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \ - $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png - - -ICONPATH=$(PLATFORM_SRC)/classes/sun/awt/X11 - -ICONS += \ - $(ICONPATH)/security-icon-bw16.png \ - $(ICONPATH)/security-icon-interim16.png \ - $(ICONPATH)/security-icon-yellow16.png \ - $(ICONPATH)/security-icon-bw24.png \ - $(ICONPATH)/security-icon-interim24.png \ - $(ICONPATH)/security-icon-yellow24.png \ - $(ICONPATH)/security-icon-bw32.png \ - $(ICONPATH)/security-icon-interim32.png \ - $(ICONPATH)/security-icon-yellow32.png \ - $(ICONPATH)/security-icon-bw48.png \ - $(ICONPATH)/security-icon-interim48.png \ - $(ICONPATH)/security-icon-yellow48.png - -TEMPDIR_CLASSES = $(TEMPDIR)/classes - -$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java - @$(prep-target) - $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< - -$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS) - $(prep-target) - for i in $(ICONS); do \ - filename=`basename $$i`; \ - name=`$(ECHO) $$filename | $(TR) '\-.' '__'`; \ - classname=$(GEN_DIR)/XAWTIcon32_$$name.java; \ - $(RM) $$classname; \ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \ - $(ECHO) "public static int[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ - sun.awt.X11.ToBin >> $$classname; \ - $(ECHO) "}; }" >> $$classname; \ - classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ - $(RM) $$classname; \ - $(ECHO) "package sun.awt.X11;" >> $$classname ; \ - $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \ - $(ECHO) "public static long[] $$name = { " >> $$classname; \ - $(CAT) $$i | \ - $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ - -Djava.awt.headless=true \ - sun.awt.X11.ToBin >> $$classname; \ - $(ECHO) "}; }" >> $$classname; \ - done - $(TOUCH) $@ - -clean clobber:: generated.clean - -.PHONY: generated.clean robot_child - diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java index ea09bf8a9b7..fca44784938 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java @@ -257,7 +257,7 @@ public class AquaInternalFrameUI extends BasicInternalFrameUI implements SwingCo } public Dimension getPreferredSize(JComponent x) { - Dimension preferredSize = super.getMinimumSize(x); + Dimension preferredSize = super.getPreferredSize(x); Dimension minimumSize = frame.getMinimumSize(); if (preferredSize.width < minimumSize.width) { preferredSize.width = minimumSize.width; diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaScrollPaneUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaScrollPaneUI.java index 1035a3e535e..39eb640e3db 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaScrollPaneUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaScrollPaneUI.java @@ -60,6 +60,10 @@ public class AquaScrollPaneUI extends javax.swing.plaf.basic.BasicScrollPaneUI { if (wasVisible) { vScrollBar.setVisible(true); } + + // Consume the event even when the scrollBar is invisible + // see #7124320 + e.consume(); } } } diff --git a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java index 02f743d3e72..dba798062df 100644 --- a/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java +++ b/jdk/src/macosx/classes/sun/awt/CGraphicsDevice.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,6 +29,7 @@ import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; import java.awt.Window; import java.awt.AWTPermission; +import java.awt.DisplayMode; import sun.java2d.opengl.CGLGraphicsConfig; @@ -178,4 +179,33 @@ public class CGraphicsDevice extends GraphicsDevice { peer.exitFullScreenMode(); } } + + @Override + public boolean isDisplayChangeSupported() { + return true; + } + + @Override + public void setDisplayMode(DisplayMode dm) { + nativeSetDisplayMode(displayID, dm.getWidth(), dm.getHeight(), dm.getBitDepth(), dm.getRefreshRate()); + if (isFullScreenSupported() && getFullScreenWindow() != null) { + getFullScreenWindow().setSize(dm.getWidth(), dm.getHeight()); + } + } + + @Override + public DisplayMode getDisplayMode() { + return nativeGetDisplayMode(displayID); + } + + @Override + public DisplayMode[] getDisplayModes() { + return nativeGetDisplayModes(displayID); + } + + private native void nativeSetDisplayMode(int displayID, int w, int h, int bpp, int refrate); + + private native DisplayMode nativeGetDisplayMode(int displayID); + + private native DisplayMode[] nativeGetDisplayModes(int displayID); } diff --git a/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java b/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java index 8a647d1de36..15ed911dee7 100644 --- a/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java +++ b/jdk/src/macosx/classes/sun/awt/CGraphicsEnvironment.java @@ -181,6 +181,10 @@ public class CGraphicsEnvironment extends SunGraphicsEnvironment { return devices.values().toArray(new CGraphicsDevice[devices.values().size()]); } + public synchronized GraphicsDevice getScreenDevice(int displayID) { + return devices.get(displayID); + } + @Override protected synchronized int getNumScreens() { return devices.size(); diff --git a/jdk/src/macosx/classes/sun/lwawt/LWListPeer.java b/jdk/src/macosx/classes/sun/lwawt/LWListPeer.java index 89a2ce9e12a..df705fd5068 100644 --- a/jdk/src/macosx/classes/sun/lwawt/LWListPeer.java +++ b/jdk/src/macosx/classes/sun/lwawt/LWListPeer.java @@ -245,6 +245,15 @@ final class LWListPeer } } + @Override + public void setFont(Font font) { + super.setFont(font); + if (getView() != null) { + getView().setFont(font); + LWListPeer.this.revalidate(); + } + } + private final class JListDelegate extends JList { JListDelegate() { diff --git a/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java b/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java index f5617772458..13ce5636da1 100644 --- a/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java +++ b/jdk/src/macosx/classes/sun/lwawt/LWWindowPeer.java @@ -68,7 +68,7 @@ public class LWWindowPeer private Insets insets = new Insets(0, 0, 0, 0); - private int screenOn = -1; + private GraphicsDevice graphicsDevice; private GraphicsConfiguration graphicsConfig; private SurfaceData surfaceData; @@ -868,17 +868,6 @@ public class LWWindowPeer return 0; } - private static GraphicsConfiguration getScreenGraphicsConfig(int screen) { - GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); - GraphicsDevice[] gds = ge.getScreenDevices(); - if (screen >= gds.length) { - // This could happen during device addition/removal. Use - // the default screen device in this case - return ge.getDefaultScreenDevice().getDefaultConfiguration(); - } - return gds[screen].getDefaultConfiguration(); - } - /* * This method is called when window's graphics config is changed from * the app code (e.g. when the window is made non-opaque) or when @@ -893,7 +882,7 @@ public class LWWindowPeer } // If window's graphics config is changed from the app code, the // config correspond to the same device as before; when the window - // is moved by user, screenOn is updated in checkIfOnNewScreen(). + // is moved by user, graphicsDevice is updated in checkIfOnNewScreen(). // In either case, there's nothing to do with screenOn here graphicsConfig = gc; } @@ -902,16 +891,17 @@ public class LWWindowPeer } private void checkIfOnNewScreen() { - int windowScreen = platformWindow.getScreenImOn(); + GraphicsDevice newGraphicsDevice = platformWindow.getGraphicsDevice(); synchronized (getStateLock()) { - if (windowScreen == screenOn) { + if (graphicsDevice == newGraphicsDevice) { return; } - screenOn = windowScreen; + graphicsDevice = newGraphicsDevice; } // TODO: DisplayChangedListener stuff - final GraphicsConfiguration newGC = getScreenGraphicsConfig(windowScreen); + final GraphicsConfiguration newGC = newGraphicsDevice.getDefaultConfiguration(); + if (!setGraphicsConfig(newGC)) return; SunToolkit.executeOnEventHandlerThread(getTarget(), new Runnable() { diff --git a/jdk/src/macosx/classes/sun/lwawt/PlatformWindow.java b/jdk/src/macosx/classes/sun/lwawt/PlatformWindow.java index 378dcab0329..92608b8b2c0 100644 --- a/jdk/src/macosx/classes/sun/lwawt/PlatformWindow.java +++ b/jdk/src/macosx/classes/sun/lwawt/PlatformWindow.java @@ -67,9 +67,9 @@ public interface PlatformWindow { public void setBounds(int x, int y, int w, int h); /* - * Returns the screen number where the window is. + * Returns the graphics device where the window is. */ - public int getScreenImOn(); + public GraphicsDevice getGraphicsDevice(); /* * Returns the location of the window. diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java index 5dd1844d938..fd1512f8e1d 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java @@ -26,6 +26,7 @@ package sun.lwawt.macosx; import java.awt.*; +import java.awt.image.BufferedImage; public class CCustomCursor extends Cursor { static Dimension sMaxCursorSize; @@ -36,7 +37,6 @@ public class CCustomCursor extends Cursor { } Image fImage; - private boolean isImageOk = false; Point fHotspot; public CCustomCursor(final Image cursor, final Point hotSpot, final String name) throws IndexOutOfBoundsException, HeadlessException { @@ -61,21 +61,19 @@ public class CCustomCursor extends Cursor { // Fix for bug 4212593 The Toolkit.createCustomCursor does not // check absence of the image of cursor // If the image is invalid, the cursor will be hidden (made completely - // transparent). In this case, getBestCursorSize() will adjust negative w and h, - // but we need to set the hotspot inside the image here. + // transparent). if (tracker.isErrorAny() || width < 0 || height < 0) { fHotspot.x = fHotspot.y = 0; - isImageOk = false; + width = height = 1; + fImage = createTransparentImage(width, height); } else { - isImageOk = true; - } - - // Scale image to nearest supported size - final Dimension nativeSize = toolkit.getBestCursorSize(width, height); - if (nativeSize.width != width || nativeSize.height != height) { - fImage = fImage.getScaledInstance(nativeSize.width, nativeSize.height, Image.SCALE_DEFAULT); - width = nativeSize.width; - height = nativeSize.height; + // Scale image to nearest supported size + final Dimension nativeSize = toolkit.getBestCursorSize(width, height); + if (nativeSize.width != width || nativeSize.height != height) { + fImage = fImage.getScaledInstance(nativeSize.width, nativeSize.height, Image.SCALE_DEFAULT); + width = nativeSize.width; + height = nativeSize.height; + } } // NOTE: this was removed for 3169146, but in 1.5 the JCK tests for an exception and fails if one isn't thrown. @@ -98,6 +96,21 @@ public class CCustomCursor extends Cursor { } } + private static BufferedImage createTransparentImage(int w, int h) { + GraphicsEnvironment ge = + GraphicsEnvironment.getLocalGraphicsEnvironment(); + GraphicsDevice gs = ge.getDefaultScreenDevice(); + GraphicsConfiguration gc = gs.getDefaultConfiguration(); + + BufferedImage img = gc.createCompatibleImage(w, h, Transparency.BITMASK); + Graphics2D g = (Graphics2D)img.getGraphics(); + g.setBackground(new Color(0, 0, 0, 0)); + g.clearRect(0, 0, w, h); + g.dispose(); + + return img; + } + public static Dimension getBestCursorSize(final int preferredWidth, final int preferredHeight) { // With Panther, cursors have no limit on their size. So give the client their // preferred size, but no larger than half the dimensions of the main screen @@ -111,31 +124,26 @@ public class CCustomCursor extends Cursor { } // Called from native when the cursor is set - // Returns long array of [NSImage ptr, x hotspot, y hotspot] CImage fCImage; long getImageData() { if (fCImage != null) { return fCImage.ptr; } - if (isImageOk) { - try { - fCImage = CImage.getCreator().createFromImage(fImage); - - if (fCImage == null) { - isImageOk = false; - return 0L; - } else { - return fCImage.ptr; - } - } catch (IllegalArgumentException iae) { - // Silently return null - we want to hide cursor by providing an empty - // ByteArray or just null + try { + fCImage = CImage.getCreator().createFromImage(fImage); + if (fCImage == null) { + // Something unexpected happened: CCustomCursor constructor + // takes care of invalid cursor images, yet createFromImage() + // failed to do its job. Return null to keep the cursor unchanged. return 0L; + } else { + return fCImage.ptr; } + } catch (IllegalArgumentException iae) { + // see comment above + return 0L; } - - return 0L; } Point getHotSpot() { diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java index cf9c455aba8..815a71822e5 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java @@ -86,11 +86,10 @@ public class CPlatformEmbeddedFrame implements PlatformWindow { } @Override - public int getScreenImOn() { + public GraphicsDevice getGraphicsDevice() { // REMIND: return the main screen for the initial implementation - CGraphicsConfig gc = (CGraphicsConfig)peer.getGraphicsConfiguration(); - CGraphicsDevice device = gc.getDevice(); - return device.getCoreGraphicsScreen(); + GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + return ge.getDefaultScreenDevice(); } @Override diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java index aa5c616b428..059ef01f3c7 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java @@ -109,8 +109,14 @@ final class CPlatformResponder { final long when = System.currentTimeMillis(); final int scrollType = MouseWheelEvent.WHEEL_UNIT_SCROLL; final int scrollAmount = 1; + int wheelRotation = (int) delta; + int signum = (int) Math.signum(delta); + if (signum * delta < 1) { + wheelRotation = signum; + } + // invert the wheelRotation for the peer peer.dispatchMouseWheelEvent(when, x, y, modifiers, scrollType, - scrollAmount, (int) -delta, -delta, null); + scrollAmount, -wheelRotation, -delta, null); } /** diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java index 2d7cfea3941..6a11cb5b9b9 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java @@ -64,7 +64,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo private static native void nativeSetEnabled(long nsWindowPtr, boolean isEnabled); private static native void nativeSynthesizeMouseEnteredExitedEvents(long nsWindowPtr); - private static native int nativeGetScreenNSWindowIsOn_AppKitThread(long nsWindowPtr); + private static native int nativeGetNSWindowDisplayID_AppKitThread(long nsWindowPtr); // Loger to report issues happened during execution but that do not affect functionality private static final PlatformLogger logger = PlatformLogger.getLogger("sun.lwawt.macosx.CPlatformWindow"); @@ -452,13 +452,18 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo return new Point(nativeBounds.x, nativeBounds.y); } - @Override // PlatformWindow - public int getScreenImOn() { - // REMIND: we could also acquire screenID from the - // graphicsConfig.getDevice().getCoreGraphicsScreen() - // which might look a bit less natural but don't - // require new native accessor. - return nativeGetScreenNSWindowIsOn_AppKitThread(getNSWindowPtr()); + @Override + public GraphicsDevice getGraphicsDevice() { + GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + CGraphicsEnvironment cge = (CGraphicsEnvironment)ge; + int displayID = nativeGetNSWindowDisplayID_AppKitThread(getNSWindowPtr()); + GraphicsDevice gd = cge.getScreenDevice(displayID); + if (gd == null) { + // this could possibly happen during device removal + // use the default screen device in this case + gd = ge.getDefaultScreenDevice(); + } + return gd; } @Override // PlatformWindow diff --git a/jdk/src/macosx/native/sun/awt/AWTWindow.h b/jdk/src/macosx/native/sun/awt/AWTWindow.h index b350913196d..991953f0f8f 100644 --- a/jdk/src/macosx/native/sun/awt/AWTWindow.h +++ b/jdk/src/macosx/native/sun/awt/AWTWindow.h @@ -43,6 +43,7 @@ NSSize javaMaxSize; jint styleBits; BOOL isEnabled; + NSWindow *nsWindow; } // An instance of either AWTWindow_Normal or AWTWindow_Panel diff --git a/jdk/src/macosx/native/sun/awt/AWTWindow.m b/jdk/src/macosx/native/sun/awt/AWTWindow.m index 5f570a752cc..759631de8c0 100644 --- a/jdk/src/macosx/native/sun/awt/AWTWindow.m +++ b/jdk/src/macosx/native/sun/awt/AWTWindow.m @@ -1080,38 +1080,28 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMou /* * Class: sun_lwawt_macosx_CPlatformWindow - * Method: nativeGetScreenNSWindowIsOn_AppKitThread + * Method: nativeGetDisplayID_AppKitThread * Signature: (J)I */ -JNIEXPORT jint JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeGetScreenNSWindowIsOn_1AppKitThread +JNIEXPORT jint JNICALL +Java_sun_lwawt_macosx_CPlatformWindow_nativeGetNSWindowDisplayID_1AppKitThread (JNIEnv *env, jclass clazz, jlong windowPtr) { - jint index = -1; + jint ret; // CGDirectDisplayID JNF_COCOA_ENTER(env); AWT_ASSERT_APPKIT_THREAD; - NSWindow *nsWindow = OBJC(windowPtr); - NSScreen* screen = [nsWindow screen]; - - //+++gdb NOTE: This is using a linear search of the screens. If it should - // prove to be a bottleneck, this can definitely be improved. However, - // many screens should prove to be the exception, rather than the rule. - NSArray* screens = [NSScreen screens]; - NSUInteger i; - for (i = 0; i < [screens count]; i++) - { - if ([[screens objectAtIndex:i] isEqualTo:screen]) - { - index = i; - break; - } - } + NSWindow *window = OBJC(windowPtr); + NSScreen *screen = [window screen]; + NSDictionary *deviceDescription = [screen deviceDescription]; + NSNumber *displayID = [deviceDescription objectForKey:@"NSScreenNumber"]; + ret = (jint)[displayID intValue]; JNF_COCOA_EXIT(env); - return 1; -} + return ret; +} /* * Class: sun_lwawt_macosx_CPlatformWindow diff --git a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m b/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m index 0d7846988fc..62034c82514 100644 --- a/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m +++ b/jdk/src/macosx/native/sun/awt/CGraphicsDevice.m @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,84 @@ #include "LWCToolkit.h" +/* + * Convert the mode string to the more convinient bits per pixel value + */ +static int getBPPFromModeString(CFStringRef mode) +{ + if ((CFStringCompare(mode, CFSTR(kIO30BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)) { + // This is a strange mode, where we using 10 bits per RGB component and pack it into 32 bits + // Java is not ready to work with this mode but we have to specify it as supported + return 30; + } + else if (CFStringCompare(mode, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) { + return 32; + } + else if (CFStringCompare(mode, CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) { + return 16; + } + else if (CFStringCompare(mode, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) { + return 8; + } + + return 0; +} + +/* + * Find the best possible match in the list of display modes that we can switch to based on + * the provided parameters. + */ +static CGDisplayModeRef getBestModeForParameters(CFArrayRef allModes, int w, int h, int bpp, int refrate) { + CGDisplayModeRef bestGuess = NULL; + CFIndex numModes = CFArrayGetCount(allModes), n; + int thisBpp = 0; + for(n = 0; n < numModes; n++ ) { + CGDisplayModeRef cRef = (CGDisplayModeRef) CFArrayGetValueAtIndex(allModes, n); + if(cRef == NULL) { + continue; + } + CFStringRef modeString = CGDisplayModeCopyPixelEncoding(cRef); + thisBpp = getBPPFromModeString(modeString); + CFRelease(modeString); + if (thisBpp != bpp || (int)CGDisplayModeGetHeight(cRef) != h || (int)CGDisplayModeGetWidth(cRef) != w) { + // One of the key parameters does not match + continue; + } + // Refresh rate might be 0 in display mode and we ask for specific display rate + // but if we do not find exact match then 0 refresh rate might be just Ok + if (CGDisplayModeGetRefreshRate(cRef) == refrate) { + // Exact match + return cRef; + } + if (CGDisplayModeGetRefreshRate(cRef) == 0) { + // Not exactly what was asked for, but may fit our needs if we don't find an exact match + bestGuess = cRef; + } + } + return bestGuess; +} + +/* + * Create a new java.awt.DisplayMode instance based on provided CGDisplayModeRef + */ +static jobject createJavaDisplayMode(CGDisplayModeRef mode, JNIEnv *env, jint displayID) { + jobject ret = NULL; + jint h, w, bpp, refrate; + JNF_COCOA_ENTER(env); + CFStringRef currentBPP = CGDisplayModeCopyPixelEncoding(mode); + bpp = getBPPFromModeString(currentBPP); + refrate = CGDisplayModeGetRefreshRate(mode); + h = CGDisplayModeGetHeight(mode); + w = CGDisplayModeGetWidth(mode); + CFRelease(currentBPP); + static JNF_CLASS_CACHE(jc_DisplayMode, "java/awt/DisplayMode"); + static JNF_CTOR_CACHE(jc_DisplayMode_ctor, jc_DisplayMode, "(IIII)V"); + ret = JNFNewObject(env, jc_DisplayMode_ctor, w, h, bpp, refrate); + JNF_COCOA_EXIT(env); + return ret; +} + + /* * Class: sun_awt_CGraphicsDevice * Method: nativeGetXResolution @@ -62,3 +140,89 @@ Java_sun_awt_CGraphicsDevice_nativeGetYResolution jfloat dpi = rect.size.height / inches; return dpi; } + +/* + * Class: sun_awt_CGraphicsDevice + * Method: nativeSetDisplayMode + * Signature: (IIIII)V + */ +JNIEXPORT void JNICALL +Java_sun_awt_CGraphicsDevice_nativeSetDisplayMode +(JNIEnv *env, jclass class, jint displayID, jint w, jint h, jint bpp, jint refrate) +{ + JNF_COCOA_ENTER(env); + CFArrayRef allModes = CGDisplayCopyAllDisplayModes(displayID, NULL); + CGDisplayModeRef closestMatch = getBestModeForParameters(allModes, (int)w, (int)h, (int)bpp, (int)refrate); + if (closestMatch != NULL) { + [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){ + CGDisplayConfigRef config; + CGError retCode = CGBeginDisplayConfiguration(&config); + if (retCode == kCGErrorSuccess) { + CGConfigureDisplayWithDisplayMode(config, displayID, closestMatch, NULL); + CGCompleteDisplayConfiguration(config, kCGConfigureForAppOnly); + if (config != NULL) { + CFRelease(config); + } + } + }]; + } + CFRelease(allModes); + JNF_COCOA_EXIT(env); +} + +/* + * Class: sun_awt_CGraphicsDevice + * Method: nativeGetDisplayMode + * Signature: (I)Ljava/awt/DisplayMode + */ +JNIEXPORT jobject JNICALL +Java_sun_awt_CGraphicsDevice_nativeGetDisplayMode +(JNIEnv *env, jclass class, jint displayID) +{ + jobject ret = NULL; + CGDisplayModeRef currentMode = CGDisplayCopyDisplayMode(displayID); + ret = createJavaDisplayMode(currentMode, env, displayID); + CGDisplayModeRelease(currentMode); + return ret; +} + +/* + * Class: sun_awt_CGraphicsDevice + * Method: nativeGetDisplayMode + * Signature: (I)[Ljava/awt/DisplayModes + */ +JNIEXPORT jobjectArray JNICALL +Java_sun_awt_CGraphicsDevice_nativeGetDisplayModes +(JNIEnv *env, jclass class, jint displayID) +{ + jobjectArray jreturnArray = NULL; + JNF_COCOA_ENTER(env); + CFArrayRef allModes = CGDisplayCopyAllDisplayModes(displayID, NULL); + CFIndex numModes = CFArrayGetCount(allModes); + static JNF_CLASS_CACHE(jc_DisplayMode, "java/awt/DisplayMode"); + + jreturnArray = JNFNewObjectArray(env, &jc_DisplayMode, (jsize) numModes); + if (!jreturnArray) { + NSLog(@"CGraphicsDevice can't create java array of DisplayMode objects"); + return nil; + } + + CFIndex n; + for (n=0; n < numModes; n++) { + CGDisplayModeRef cRef = (CGDisplayModeRef) CFArrayGetValueAtIndex(allModes, n); + if (cRef != NULL) { + jobject oneMode = createJavaDisplayMode(cRef, env, displayID); + (*env)->SetObjectArrayElement(env, jreturnArray, n, oneMode); + if ((*env)->ExceptionOccurred(env)) { + (*env)->ExceptionDescribe(env); + (*env)->ExceptionClear(env); + continue; + } + (*env)->DeleteLocalRef(env, oneMode); + } + } + CFRelease(allModes); + JNF_COCOA_EXIT(env); + + return jreturnArray; +} diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java index 5cf2456bdf1..fd644bf759e 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java @@ -653,8 +653,8 @@ class Attribute implements Comparable { return fixups[0]; // return ref-bearing cookie, if any } - public String layoutForPackageMajver(int majver) { - if (majver <= JAVA5_PACKAGE_MAJOR_VERSION) { + public String layoutForClassVersion(Package.Version vers) { + if (vers.lessThan(JAVA6_MAX_CLASS_VERSION)) { // Disallow layout syntax in the oldest protocol version. return expandCaseDashNotation(layout); } diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java index a63491b9a34..f3d5cec8e48 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java @@ -74,30 +74,27 @@ class BandStructure { abstract protected Index getCPIndex(byte tag); - // Local copy of package version. - private int packageMajver = -1; + // Local copy of highest class version. + private Package.Version highestClassVersion = null; /** Call this exactly once, early, to specify the archive major version. */ - public void initPackageMajver(int packageMajver) throws IOException { - assert(packageMajver > 0 && packageMajver < 0x10000); - if (this.packageMajver > 0) { + public void initHighestClassVersion(Package.Version highestClassVersion) throws IOException { + if (this.highestClassVersion != null) { throw new IOException( - "Package majver is already initialized to " + this.packageMajver+ - "; new setting is " + packageMajver); + "Highest class major version is already initialized to " + + this.highestClassVersion + "; new setting is " + highestClassVersion); } - this.packageMajver = packageMajver; - adjustToMajver(); + this.highestClassVersion = highestClassVersion; + adjustToClassVersion(); } - public int getPackageMajver() { - if (packageMajver < 0) { - throw new RuntimeException("Package majver not yet initialized"); - } - return packageMajver; + + public Package.Version getHighestClassVersion() { + return highestClassVersion; } private final boolean isReader = this instanceof PackageReader; - protected BandStructure() { - } + + protected BandStructure() {} final static Coding BYTE1 = Coding.of(1,256); @@ -1866,20 +1863,12 @@ class BandStructure { attrClassFileVersionMask = (1< 0) Utils.log.fine("Legacy package version"); // Revoke definition of pre-1.6 attribute type. undefineAttribute(CODE_ATTR_StackMapTable, ATTR_CONTEXT_CODE); } - if (getPackageMajver() < JAVA7_PACKAGE_MAJOR_VERSION) { - if (testBit(archiveOptions, AO_HAVE_CP_EXTRAS)) - // this bit was reserved for future use in previous versions - throw new IOException("Format bits for Java 7 must be zero in previous releases"); - } - if (testBit(archiveOptions, AO_UNUSED_MBZ)) { - throw new IOException("High archive option bits are reserved and must be zero: "+Integer.toHexString(archiveOptions)); - } } protected void initAttrIndexLimit() { @@ -1942,21 +1931,14 @@ class BandStructure { } } - protected Attribute makeClassFileVersionAttr(int minver, int majver) { - byte[] bytes = { - (byte)(minver >> 8), (byte)minver, - (byte)(majver >> 8), (byte)majver - }; - return attrClassFileVersion.addContent(bytes); + protected Attribute makeClassFileVersionAttr(Package.Version ver) { + return attrClassFileVersion.addContent(ver.asBytes()); } - protected short[] parseClassFileVersionAttr(Attribute attr) { + protected Package.Version parseClassFileVersionAttr(Attribute attr) { assert(attr.layout() == attrClassFileVersion); assert(attr.size() == 4); - byte[] bytes = attr.bytes(); - int minver = ((bytes[0] & 0xFF) << 8) | (bytes[1] & 0xFF); - int majver = ((bytes[2] & 0xFF) << 8) | (bytes[3] & 0xFF); - return new short[]{ (short) minver, (short) majver }; + return Package.Version.of(attr.bytes()); } private boolean assertBandOKForElems(Band[] ab, Attribute.Layout.Element[] elems) { diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java index 545faab9127..2ca2d0926c6 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java @@ -174,27 +174,31 @@ class ClassReader { ("Bad magic number in class file " +Integer.toHexString(cls.magic), ATTR_CONTEXT_CLASS, "magic-number", "pass"); - cls.minver = (short) readUnsignedShort(); - cls.majver = (short) readUnsignedShort(); + int minver = (short) readUnsignedShort(); + int majver = (short) readUnsignedShort(); + cls.version = Package.Version.of(majver, minver); + //System.out.println("ClassFile.version="+cls.majver+"."+cls.minver); - String bad = checkVersion(cls.majver, cls.minver); + String bad = checkVersion(cls.version); if (bad != null) { throw new Attribute.FormatException ("classfile version too "+bad+": " - +cls.majver+"."+cls.minver+" in "+cls.file, + +cls.version+" in "+cls.file, ATTR_CONTEXT_CLASS, "version", "pass"); } } - private String checkVersion(int majver, int minver) { - if (majver < pkg.min_class_majver || - (majver == pkg.min_class_majver && - minver < pkg.min_class_minver)) { + private String checkVersion(Package.Version ver) { + int majver = ver.major; + int minver = ver.minor; + if (majver < pkg.minClassVersion.major || + (majver == pkg.minClassVersion.major && + minver < pkg.minClassVersion.minor)) { return "small"; } - if (majver > pkg.max_class_majver || - (majver == pkg.max_class_majver && - minver > pkg.max_class_minver)) { + if (majver > pkg.maxClassVersion.major || + (majver == pkg.maxClassVersion.major && + minver > pkg.maxClassVersion.minor)) { return "large"; } return null; // OK diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java index dacae44b4d3..deb66252a23 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java @@ -113,8 +113,8 @@ class ClassWriter { void writeMagicNumbers() throws IOException { writeInt(cls.magic); - writeShort(cls.minver); - writeShort(cls.majver); + writeShort(cls.version.minor); + writeShort(cls.version.major); } void writeConstantPool() throws IOException { diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java index c7fa00e0f18..c4c3a8f3abb 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Constants.java @@ -43,30 +43,40 @@ class Constants { 1.0 to 1.3.X 45,3 1.4 to 1.4.X 46,0 1.5 to 1.5.X 49,0 - 1.6 to 1.5.x 50,0 NOTE Assumed for now + 1.6 to 1.5.x 50,0 + 1.7 to 1.6.x 51,0 */ - public final static short JAVA_MIN_CLASS_MAJOR_VERSION = 45; - public final static short JAVA_MIN_CLASS_MINOR_VERSION = 03; + public final static Package.Version JAVA_MIN_CLASS_VERSION = + Package.Version.of(45, 03); - public final static short JAVA5_MAX_CLASS_MAJOR_VERSION = 49; - public final static short JAVA5_MAX_CLASS_MINOR_VERSION = 0; + public final static Package.Version JAVA5_MAX_CLASS_VERSION = + Package.Version.of(49, 00); - public final static short JAVA6_MAX_CLASS_MAJOR_VERSION = 50; - public final static short JAVA6_MAX_CLASS_MINOR_VERSION = 0; + public final static Package.Version JAVA6_MAX_CLASS_VERSION = + Package.Version.of(50, 00); - public final static short JAVA7_MAX_CLASS_MAJOR_VERSION = 51; - public final static short JAVA7_MAX_CLASS_MINOR_VERSION = 0; + public final static Package.Version JAVA7_MAX_CLASS_VERSION = + Package.Version.of(51, 00); public final static int JAVA_PACKAGE_MAGIC = 0xCAFED00D; - public final static int JAVA5_PACKAGE_MAJOR_VERSION = 150; - public final static int JAVA5_PACKAGE_MINOR_VERSION = 7; - public final static int JAVA6_PACKAGE_MAJOR_VERSION = 160; - public final static int JAVA6_PACKAGE_MINOR_VERSION = 1; + public final static Package.Version JAVA5_PACKAGE_VERSION = + Package.Version.of(150, 7); - public final static int JAVA7_PACKAGE_MAJOR_VERSION = 170; - public final static int JAVA7_PACKAGE_MINOR_VERSION = 1; + public final static Package.Version JAVA6_PACKAGE_VERSION = + Package.Version.of(160, 1); + + public final static Package.Version JAVA7_PACKAGE_VERSION = + Package.Version.of(170, 1); + + // upper limit, should point to the latest class version + public final static Package.Version JAVA_MAX_CLASS_VERSION = + JAVA7_MAX_CLASS_VERSION; + + // upper limit should point to the latest package version, for version info!. + public final static Package.Version MAX_PACKAGE_VERSION = + JAVA7_PACKAGE_VERSION; public final static int CONSTANT_POOL_INDEX_LIMIT = 0x10000; public final static int CONSTANT_POOL_NARROW_LIMIT = 0x00100; diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java index fee97f4d964..64f9db5c309 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java @@ -25,6 +25,7 @@ package com.sun.java.util.jar.pack; +import java.util.jar.Pack200; import com.sun.java.util.jar.pack.Attribute.Layout; import com.sun.java.util.jar.pack.ConstantPool.ClassEntry; import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry; @@ -67,46 +68,58 @@ class Package { verbose = pmap.getInteger(Utils.DEBUG_VERBOSE); } - int magic; - int package_minver; - int package_majver; + final int magic = JAVA_PACKAGE_MAGIC; int default_modtime = NO_MODTIME; int default_options = 0; // FO_DEFLATE_HINT - short default_class_majver = -1; // fill in later - short default_class_minver = 0; // fill in later + Version defaultClassVersion = null; // These fields can be adjusted by driver properties. - short min_class_majver = JAVA_MIN_CLASS_MAJOR_VERSION; - short min_class_minver = JAVA_MIN_CLASS_MINOR_VERSION; - short max_class_majver = JAVA7_MAX_CLASS_MAJOR_VERSION; - short max_class_minver = JAVA7_MAX_CLASS_MINOR_VERSION; + final Version minClassVersion; + final Version maxClassVersion; + // null, indicates that consensus rules during package write + final Version packageVersion; + + Version observedHighestClassVersion = null; - short observed_max_class_majver = min_class_majver; - short observed_max_class_minver = min_class_minver; // What constants are used in this unit? ConstantPool.IndexGroup cp = new ConstantPool.IndexGroup(); - Package() { - magic = JAVA_PACKAGE_MAGIC; - package_minver = -1; // fill in later - package_majver = 0; // fill in later + /* + * typically used by the PackageReader to set the defaults, in which + * case we take the defaults. + */ + public Package() { + minClassVersion = JAVA_MIN_CLASS_VERSION; + maxClassVersion = JAVA_MAX_CLASS_VERSION; + packageVersion = null; } - public - void reset() { + + /* + * Typically used by the PackerImpl during before packing, the defaults are + * overridden by the users preferences. + */ + public Package(Version minClassVersion, Version maxClassVersion, Version packageVersion) { + // Fill in permitted range of major/minor version numbers. + this.minClassVersion = minClassVersion == null + ? JAVA_MIN_CLASS_VERSION + : minClassVersion; + this.maxClassVersion = maxClassVersion == null + ? JAVA_MAX_CLASS_VERSION + : maxClassVersion; + this.packageVersion = packageVersion; + } + + + public void reset() { cp = new ConstantPool.IndexGroup(); classes.clear(); files.clear(); BandStructure.nextSeqForDebug = 0; - package_minver = -1; // fill in later - package_majver = 0; // fill in later - } - - int getPackageVersion() { - return (package_majver << 16) + package_minver; + observedHighestClassVersion = null; } // Special empty versions of Code and InnerClasses, used for markers. @@ -128,73 +141,31 @@ class Package { attrDefs = Collections.unmodifiableMap(ad); } - int getDefaultClassVersion() { - return (default_class_majver << 16) + (char)default_class_minver; + Version getDefaultClassVersion() { + return defaultClassVersion; } /** Return the highest version number of all classes, * or 0 if there are no classes. */ - int getHighestClassVersion() { - int res = 0; // initial low value + private void setHighestClassVersion() { + if (observedHighestClassVersion != null) + return; + Version res = JAVA_MIN_CLASS_VERSION; // initial low value for (Class cls : classes) { - int ver = cls.getVersion(); - if (res < ver) res = ver; + Version ver = cls.getVersion(); + if (res.lessThan(ver)) res = ver; } - return res; + observedHighestClassVersion = res; } - /** Convenience function to choose an archive version based - * on the class file versions observed within the archive. - */ - void choosePackageVersion() { - assert(package_majver <= 0); // do not call this twice - int classver = getHighestClassVersion(); - if (classver == 0 || (classver >>> 16) < JAVA6_MAX_CLASS_MAJOR_VERSION) { - // There are only old classfiles in this segment or resources - package_majver = JAVA5_PACKAGE_MAJOR_VERSION; - package_minver = JAVA5_PACKAGE_MINOR_VERSION; - } else if ((classver >>> 16) == JAVA6_MAX_CLASS_MAJOR_VERSION) { - package_majver = JAVA6_PACKAGE_MAJOR_VERSION; - package_minver = JAVA6_PACKAGE_MINOR_VERSION; - } else { - // Normal case. Use the newest archive format, when available - package_majver = JAVA7_PACKAGE_MAJOR_VERSION; - package_minver = JAVA7_PACKAGE_MINOR_VERSION; - } + Version getHighestClassVersion() { + setHighestClassVersion(); + return observedHighestClassVersion; } // What Java classes are in this unit? - // Fixed 6211177, converted to throw IOException - void checkVersion() throws IOException { - if (magic != JAVA_PACKAGE_MAGIC) { - String gotMag = Integer.toHexString(magic); - String expMag = Integer.toHexString(JAVA_PACKAGE_MAGIC); - throw new IOException("Unexpected package magic number: got "+gotMag+"; expected "+expMag); - } - int[] majminFound = null; - for (int[] majmin : new int[][]{ - { JAVA7_PACKAGE_MAJOR_VERSION, JAVA7_PACKAGE_MINOR_VERSION }, - { JAVA6_PACKAGE_MAJOR_VERSION, JAVA6_PACKAGE_MINOR_VERSION }, - { JAVA5_PACKAGE_MAJOR_VERSION, JAVA5_PACKAGE_MINOR_VERSION } - }) { - if (package_majver == majmin[0] && package_minver == majmin[1]) { - majminFound = majmin; - break; - } - } - if (majminFound == null) { - String gotVer = package_majver+"."+package_minver; - String expVer = JAVA7_PACKAGE_MAJOR_VERSION+"."+JAVA7_PACKAGE_MINOR_VERSION+ - " OR "+ - JAVA6_PACKAGE_MAJOR_VERSION+"."+JAVA6_PACKAGE_MINOR_VERSION+ - " OR "+ - JAVA5_PACKAGE_MAJOR_VERSION+"."+JAVA5_PACKAGE_MINOR_VERSION; - throw new IOException("Unexpected package minor version: got "+gotVer+"; expected "+expVer); - } - } - ArrayList classes = new ArrayList<>(); public List getClasses() { @@ -210,7 +181,7 @@ class Package { // File header int magic; - short minver, majver; + Version version; // Local constant pool (one-way mapping of index => package cp). Entry[] cpMap; @@ -231,8 +202,7 @@ class Package { Class(int flags, ClassEntry thisClass, ClassEntry superClass, ClassEntry[] interfaces) { this.magic = JAVA_MAGIC; - this.minver = default_class_minver; - this.majver = default_class_majver; + this.version = defaultClassVersion; this.flags = flags; this.thisClass = thisClass; this.superClass = superClass; @@ -254,11 +224,8 @@ class Package { return thisClass.stringValue(); } - int getVersion() { - return (majver << 16) + (char)minver; - } - String getVersionString() { - return versionStringOf(majver, minver); + Version getVersion() { + return this.version; } // Note: equals and hashCode are identity-based. @@ -1182,13 +1149,6 @@ class Package { } } - public static String versionStringOf(int majver, int minver) { - return majver+"."+minver; - } - public static String versionStringOf(int version) { - return versionStringOf(version >>> 16, (char)version); - } - public void stripConstantFields() { for (Class c : classes) { for (Iterator j = c.fields.iterator(); j.hasNext(); ) { @@ -1342,4 +1302,75 @@ class Package { static final List noFields = Arrays.asList(new Class.Field[0]); static final List noMethods = Arrays.asList(new Class.Method[0]); static final List noInnerClasses = Arrays.asList(new InnerClass[0]); + + protected static final class Version { + + public final short major; + public final short minor; + + private Version(short major, short minor) { + this.major = major; + this.minor = minor; + } + + public String toString() { + return major + "." + minor; + } + + public boolean equals(Object that) { + return that instanceof Version + && major == ((Version)that).major + && minor == ((Version)that).minor; + } + + public int intValue() { + return (major << 16) + minor; + } + + public int hashCode() { + return (major << 16) + 7 + minor; + } + + public static Version of(int major, int minor) { + return new Version((short)major, (short)minor); + } + + public static Version of(byte[] bytes) { + int minor = ((bytes[0] & 0xFF) << 8) | (bytes[1] & 0xFF); + int major = ((bytes[2] & 0xFF) << 8) | (bytes[3] & 0xFF); + return new Version((short)major, (short)minor); + } + + public static Version of(int major_minor) { + short minor = (short)major_minor; + short major = (short)(major_minor >>> 16); + return new Version(major, minor); + } + + public static Version makeVersion(PropMap props, String partialKey) { + int min = props.getInteger(Utils.COM_PREFIX + + partialKey + ".minver", -1); + int maj = props.getInteger(Utils.COM_PREFIX + + partialKey + ".majver", -1); + return min >= 0 && maj >= 0 ? Version.of(maj, min) : null; + } + public byte[] asBytes() { + byte[] bytes = { + (byte) (minor >> 8), (byte) minor, + (byte) (major >> 8), (byte) major + }; + return bytes; + } + public int compareTo(Version that) { + return this.intValue() - that.intValue(); + } + + public boolean lessThan(Version that) { + return compareTo(that) < 0 ; + } + + public boolean greaterThan(Version that) { + return compareTo(that) > 0 ; + } + } } diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java index 8813b5e3f25..26bade85c5d 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java @@ -60,6 +60,7 @@ class PackageReader extends BandStructure { Package pkg; byte[] bytes; LimitedBuffer in; + Package.Version packageVersion; PackageReader(Package pkg, InputStream in) throws IOException { this.pkg = pkg; @@ -220,7 +221,6 @@ class PackageReader extends BandStructure { final static int MAGIC_BYTES = 4; void readArchiveMagic() throws IOException { - // Read a minimum of bytes in the first gulp. in.setReadLimit(MAGIC_BYTES + AH_LENGTH_MIN); @@ -230,10 +230,38 @@ class PackageReader extends BandStructure { archive_magic.readFrom(in); // read and check magic numbers: - pkg.magic = getMagicInt32(); + int magic = getMagicInt32(); + if (pkg.magic != magic) { + throw new IOException("Unexpected package magic number: got " + + magic + "; expected " + pkg.magic); + } archive_magic.doneDisbursing(); } + // Fixed 6211177, converted to throw IOException + void checkArchiveVersion() throws IOException { + Package.Version versionFound = null; + for (Package.Version v : new Package.Version[] { + JAVA7_PACKAGE_VERSION, + JAVA6_PACKAGE_VERSION, + JAVA5_PACKAGE_VERSION + }) { + if (packageVersion.equals(v)) { + versionFound = v; + break; + } + } + if (versionFound == null) { + String expVer = JAVA7_PACKAGE_VERSION.toString() + + " OR " + + JAVA6_PACKAGE_VERSION.toString() + + " OR " + + JAVA5_PACKAGE_VERSION.toString(); + throw new IOException("Unexpected package minor version: got " + + packageVersion.toString() + "; expected " + expVer); + } + } + void readArchiveHeader() throws IOException { // archive_header: // #archive_minver :UNSIGNED5[1] @@ -264,10 +292,11 @@ class PackageReader extends BandStructure { archive_header_0.expectLength(AH_LENGTH_0); archive_header_0.readFrom(in); - pkg.package_minver = archive_header_0.getInt(); - pkg.package_majver = archive_header_0.getInt(); - pkg.checkVersion(); - this.initPackageMajver(pkg.package_majver); + int minver = archive_header_0.getInt(); + int majver = archive_header_0.getInt(); + packageVersion = Package.Version.of(majver, minver); + checkArchiveVersion(); + this.initHighestClassVersion(JAVA7_MAX_CLASS_VERSION); archiveOptions = archive_header_0.getInt(); archive_header_0.doneDisbursing(); @@ -324,8 +353,9 @@ class PackageReader extends BandStructure { numInnerClasses = archive_header_1.getInt(); - pkg.default_class_minver = (short) archive_header_1.getInt(); - pkg.default_class_majver = (short) archive_header_1.getInt(); + minver = (short) archive_header_1.getInt(); + majver = (short) archive_header_1.getInt(); + pkg.defaultClassVersion = Package.Version.of(majver, minver); numClasses = archive_header_1.getInt(); archive_header_1.doneDisbursing(); @@ -414,7 +444,7 @@ class PackageReader extends BandStructure { } void checkLegacy(String bandname) { - if (this.pkg.package_majver < JAVA7_PACKAGE_MAJOR_VERSION) { + if (packageVersion.lessThan(JAVA7_PACKAGE_VERSION)) { throw new RuntimeException("unexpected band " + bandname); } } @@ -947,9 +977,9 @@ class PackageReader extends BandStructure { name.stringValue(), layout.stringValue()); // Check layout string for Java 6 extensions. - String pvLayout = def.layoutForPackageMajver(getPackageMajver()); + String pvLayout = def.layoutForClassVersion(getHighestClassVersion()); if (!pvLayout.equals(def.layout())) { - throw new IOException("Bad attribute layout in version 150 archive: "+def.layout()); + throw new IOException("Bad attribute layout in archive: "+def.layout()); } this.setAttributeLayoutIndex(def, index); if (dump != null) dump.println(index+" "+def); @@ -1140,12 +1170,9 @@ class PackageReader extends BandStructure { Attribute retroVersion = cls.getAttribute(attrClassFileVersion); if (retroVersion != null) { cls.removeAttribute(retroVersion); - short[] minmajver = parseClassFileVersionAttr(retroVersion); - cls.minver = minmajver[0]; - cls.majver = minmajver[1]; + cls.version = parseClassFileVersionAttr(retroVersion); } else { - cls.minver = pkg.default_class_minver; - cls.majver = pkg.default_class_majver; + cls.version = pkg.defaultClassVersion; } // Replace null SourceFile by "obvious" string. diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java index d40a6d3889e..a4a29826135 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java @@ -49,12 +49,13 @@ import static com.sun.java.util.jar.pack.Constants.*; class PackageWriter extends BandStructure { Package pkg; OutputStream finalOut; + Package.Version packageVersion; PackageWriter(Package pkg, OutputStream out) throws IOException { this.pkg = pkg; this.finalOut = out; - // Caller has specified archive version in the package: - initPackageMajver(pkg.package_majver); + // Caller has specified maximum class file version in the package: + initHighestClassVersion(pkg.getHighestClassVersion()); } void write() throws IOException { @@ -118,6 +119,57 @@ class PackageWriter extends BandStructure { collectInnerClasses(); } + /* + * Convenience function to choose an archive version based + * on the class file versions observed within the archive + * or set the user defined version preset via properties. + */ + void chooseDefaultPackageVersion() throws IOException { + if (pkg.packageVersion != null) { + packageVersion = pkg.packageVersion; + if (verbose > 0) { + Utils.log.info("package version overridden with: " + + packageVersion); + } + return; + } + + Package.Version highV = getHighestClassVersion(); + // set the package version now + if (highV.lessThan(JAVA6_MAX_CLASS_VERSION)) { + // There are only old classfiles in this segment or resources + packageVersion = JAVA5_PACKAGE_VERSION; + } else if (highV.equals(JAVA6_MAX_CLASS_VERSION) || + (highV.equals(JAVA7_MAX_CLASS_VERSION) && !pkg.cp.haveExtraTags())) { + // force down the package version if we have jdk7 classes without + // any Indy references, this is because jdk7 class file (52.0) without + // Indy is identical to jdk6 class file (51.0). + packageVersion = JAVA6_PACKAGE_VERSION; + } else { + // Normal case. Use the newest archive format, when available + packageVersion = JAVA7_PACKAGE_VERSION; + } + + if (verbose > 0) { + Utils.log.info("Highest version class file: " + highV + + " package version: " + packageVersion); + } + } + + void checkVersion() throws IOException { + assert(packageVersion != null); + + if (packageVersion.lessThan(JAVA7_PACKAGE_VERSION)) { + // this bit was reserved for future use in previous versions + if (testBit(archiveOptions, AO_HAVE_CP_EXTRAS)) { + throw new IOException("Format bits for Java 7 must be zero in previous releases"); + } + } + if (testBit(archiveOptions, AO_UNUSED_MBZ)) { + throw new IOException("High archive option bits are reserved and must be zero: " + Integer.toHexString(archiveOptions)); + } + } + void setArchiveOptions() { // Decide on some archive options early. // Does not decide on: AO_HAVE_SPECIAL_FORMATS, @@ -168,11 +220,11 @@ class PackageWriter extends BandStructure { } } // Decide on default version number (majority rule). - Map verCounts = new HashMap<>(); + Map verCounts = new HashMap<>(); int bestCount = 0; - int bestVersion = -1; + Package.Version bestVersion = null; for (Class cls : pkg.classes) { - int version = cls.getVersion(); + Package.Version version = cls.getVersion(); int[] var = verCounts.get(version); if (var == null) { var = new int[1]; @@ -186,28 +238,22 @@ class PackageWriter extends BandStructure { } } verCounts.clear(); - if (bestVersion == -1) bestVersion = 0; // degenerate case - int bestMajver = (char)(bestVersion >>> 16); - int bestMinver = (char)(bestVersion); - pkg.default_class_majver = (short) bestMajver; - pkg.default_class_minver = (short) bestMinver; - String bestVerStr = Package.versionStringOf(bestMajver, bestMinver); + if (bestVersion == null) bestVersion = JAVA_MIN_CLASS_VERSION; // degenerate case + pkg.defaultClassVersion = bestVersion; if (verbose > 0) - Utils.log.info("Consensus version number in segment is "+bestVerStr); + Utils.log.info("Consensus version number in segment is " + bestVersion); if (verbose > 0) - Utils.log.info("Highest version number in segment is "+ - Package.versionStringOf(pkg.getHighestClassVersion())); + Utils.log.info("Highest version number in segment is " + + pkg.getHighestClassVersion()); // Now add explicit pseudo-attrs. to classes with odd versions. for (Class cls : pkg.classes) { - if (cls.getVersion() != bestVersion) { - Attribute a = makeClassFileVersionAttr(cls.minver, cls.majver); + if (!cls.getVersion().equals(bestVersion)) { + Attribute a = makeClassFileVersionAttr(cls.getVersion()); if (verbose > 1) { - String clsVer = cls.getVersionString(); - String pkgVer = bestVerStr; - Utils.log.fine("Version "+clsVer+" of "+cls - +" doesn't match package version " - +pkgVer); + Utils.log.fine("Version "+cls.getVersion() + " of " + cls + + " doesn't match package version " + + bestVersion); } // Note: Does not add in "natural" order. (Who cares?) cls.addAttribute(a); @@ -252,7 +298,7 @@ class PackageWriter extends BandStructure { } void writeFileHeader() throws IOException { - pkg.checkVersion(); + chooseDefaultPackageVersion(); writeArchiveMagic(); writeArchiveHeader(); } @@ -322,12 +368,13 @@ class PackageWriter extends BandStructure { if (haveCPExtra) headerSizeForDebug += AH_CP_EXTRA_LEN; - assert(pkg.package_majver > 0); // caller must specify! - archive_header_0.putInt(pkg.package_minver); - archive_header_0.putInt(pkg.package_majver); + // the archiveOptions are all initialized, sanity check now!. + checkVersion(); + + archive_header_0.putInt(packageVersion.minor); + archive_header_0.putInt(packageVersion.major); if (verbose > 0) - Utils.log.info("Package Version for this segment:"+ - Package.versionStringOf(pkg.getPackageVersion())); + Utils.log.info("Package Version for this segment:" + packageVersion); archive_header_0.putInt(archiveOptions); // controls header format assert(archive_header_0.length() == AH_LENGTH_0); @@ -361,8 +408,8 @@ class PackageWriter extends BandStructure { writeConstantPoolCounts(haveNumbers, haveCPExtra); archive_header_1.putInt(pkg.getAllInnerClasses().size()); - archive_header_1.putInt(pkg.default_class_minver); - archive_header_1.putInt(pkg.default_class_majver); + archive_header_1.putInt(pkg.defaultClassVersion.minor); + archive_header_1.putInt(pkg.defaultClassVersion.major); archive_header_1.putInt(pkg.classes.size()); // Sanity: Make sure we came out to 29 (less optional fields): @@ -892,7 +939,7 @@ class PackageWriter extends BandStructure { if (predefIndex == null) { // Make sure the package CP can name the local attribute. Entry ne = ConstantPool.getUtf8Entry(def.name()); - String layout = def.layoutForPackageMajver(getPackageMajver()); + String layout = def.layoutForClassVersion(getHighestClassVersion()); Entry le = ConstantPool.getUtf8Entry(layout); requiredEntries.add(ne); requiredEntries.add(le); @@ -988,7 +1035,7 @@ class PackageWriter extends BandStructure { assert((header & ADH_CONTEXT_MASK) == def.ctype()); attr_definition_headers.putByte(header); attr_definition_name.putRef(ConstantPool.getUtf8Entry(def.name())); - String layout = def.layoutForPackageMajver(getPackageMajver()); + String layout = def.layoutForClassVersion(getHighestClassVersion()); attr_definition_layout.putRef(ConstantPool.getUtf8Entry(layout)); // Check that we are transmitting that correct attribute index: boolean debug = false; @@ -1542,8 +1589,8 @@ class PackageWriter extends BandStructure { break; default: // CONSTANT_MethodHandle, etc. - if (getPackageMajver() < JAVA7_PACKAGE_MAJOR_VERSION) { - throw new IOException("bad package major version for Java 7 ldc"); + if (getHighestClassVersion().lessThan(JAVA7_MAX_CLASS_VERSION)) { + throw new IOException("bad class file major version for Java 7 ldc"); } bc_which = bc_loadablevalueref; switch (bc) { @@ -1581,8 +1628,8 @@ class PackageWriter extends BandStructure { // Make sure the discarded bytes are sane: assert(i.getConstant() == (1+((MemberEntry)ref).descRef.typeRef.computeSize(true)) << 8); } else if (bc == _invokedynamic) { - if (getPackageMajver() < JAVA7_PACKAGE_MAJOR_VERSION) { - throw new IOException("bad package major version for Java 7 invokedynamic"); + if (getHighestClassVersion().lessThan(JAVA7_MAX_CLASS_VERSION)) { + throw new IOException("bad class major version for Java 7 invokedynamic"); } assert(i.getLength() == 5); assert(i.getConstant() == 0); // last 2 bytes MBZ diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java index 93b743bcdc7..c7ef4ee2013 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -164,8 +164,11 @@ public class PackerImpl extends TLGlobals implements Pack200.Packer { if (verbose > 0) Utils.log.info(props.toString()); } - // Here's where the bits are collected before getting packed: - final Package pkg = new Package(); + // Here's where the bits are collected before getting packed, we also + // initialize the version numbers now. + final Package pkg = new Package(Package.Version.makeVersion(props, "min.class"), + Package.Version.makeVersion(props, "max.class"), + Package.Version.makeVersion(props, "package")); final String unknownAttrCommand; { @@ -279,23 +282,6 @@ public class PackerImpl extends TLGlobals implements Pack200.Packer { if (verbose > 0) Utils.log.info("passFiles = " + passFiles); } - { - // Fill in permitted range of major/minor version numbers. - int ver; - if ((ver = props.getInteger(Utils.COM_PREFIX+"min.class.majver")) != 0) - pkg.min_class_majver = (short) ver; - if ((ver = props.getInteger(Utils.COM_PREFIX+"min.class.minver")) != 0) - pkg.min_class_minver = (short) ver; - if ((ver = props.getInteger(Utils.COM_PREFIX+"max.class.majver")) != 0) - pkg.max_class_majver = (short) ver; - if ((ver = props.getInteger(Utils.COM_PREFIX+"max.class.minver")) != 0) - pkg.max_class_minver = (short) ver; - if ((ver = props.getInteger(Utils.COM_PREFIX+"package.minver")) != 0) - pkg.package_minver = (short) ver; - if ((ver = props.getInteger(Utils.COM_PREFIX+"package.majver")) != 0) - pkg.package_majver = (short) ver; - } - { // Hook for testing: Forces use of special archive modes. int opt = props.getInteger(Utils.COM_PREFIX+"archive.options"); @@ -603,9 +589,6 @@ public class PackerImpl extends TLGlobals implements Pack200.Packer { if (props.getBoolean(Utils.COM_PREFIX+"strip.exceptions")) pkg.stripAttributeKind("Exceptions"); if (props.getBoolean(Utils.COM_PREFIX+"strip.innerclasses")) pkg.stripAttributeKind("InnerClasses"); - // Must choose an archive version; PackageWriter does not. - if (pkg.package_majver <= 0) pkg.choosePackageVersion(); - PackageWriter pw = new PackageWriter(pkg, out); pw.archiveNextCount = nextCount; pw.write(); diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java index 07887b9c55b..e1a385546c9 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -193,13 +193,18 @@ final class PropMap implements SortedMap { boolean setBoolean(String s, boolean val) { return toBoolean(setProperty(s, String.valueOf(val))); } - int toInteger(String val) { - if (val == null) return 0; + return toInteger(val, 0); + } + int toInteger(String val, int def) { + if (val == null) return def; if (Pack200.Packer.TRUE.equals(val)) return 1; if (Pack200.Packer.FALSE.equals(val)) return 0; return Integer.parseInt(val); } + int getInteger(String s, int def) { + return toInteger(getProperty(s), def); + } int getInteger(String s) { return toInteger(getProperty(s)); } diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java b/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java index 06ecaef5bbf..5edd73e21cb 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java +++ b/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java @@ -25,12 +25,6 @@ package com.sun.java.util.jar.pack; -import com.sun.java.util.jar.pack.ConstantPool.ClassEntry; -import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry; -import com.sun.java.util.jar.pack.ConstantPool.LiteralEntry; -import com.sun.java.util.jar.pack.ConstantPool.MemberEntry; -import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry; -import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; @@ -38,9 +32,8 @@ import java.io.FilterOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.util.Collections; import java.util.Date; -import java.util.Enumeration; -import java.util.Map; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.jar.JarInputStream; @@ -211,9 +204,7 @@ class Utils { static String getVersionString() { return "Pack200, Vendor: " + System.getProperty("java.vendor") + - ", Version: " + - Constants.JAVA6_PACKAGE_MAJOR_VERSION + "." + - Constants.JAVA6_PACKAGE_MINOR_VERSION; + ", Version: " + Constants.MAX_PACKAGE_VERSION; } static void markJarFile(JarOutputStream out) throws IOException { @@ -240,8 +231,7 @@ class Utils { } static void copyJarFile(JarFile in, JarOutputStream out) throws IOException { byte[] buffer = new byte[1 << 14]; - for (Enumeration e = in.entries(); e.hasMoreElements(); ) { - JarEntry je = e.nextElement(); + for (JarEntry je : Collections.list(in.entries())) { out.putNextEntry(je); InputStream ein = in.getInputStream(je); for (int nr; 0 < (nr = ein.read(buffer)); ) { diff --git a/jdk/src/share/classes/java/awt/KeyboardFocusManager.java b/jdk/src/share/classes/java/awt/KeyboardFocusManager.java index 5e7792a26d8..15fe15356c2 100644 --- a/jdk/src/share/classes/java/awt/KeyboardFocusManager.java +++ b/jdk/src/share/classes/java/awt/KeyboardFocusManager.java @@ -561,7 +561,7 @@ public abstract class KeyboardFocusManager rootAncestor = (Container)focusOwner; } if (rootAncestor != null) { - setGlobalCurrentFocusCycleRoot(rootAncestor); + setGlobalCurrentFocusCycleRootPriv(rootAncestor); } } diff --git a/jdk/src/share/classes/java/lang/IllegalArgumentException.java b/jdk/src/share/classes/java/lang/IllegalArgumentException.java index 13ffbf1a524..c29a9d57414 100644 --- a/jdk/src/share/classes/java/lang/IllegalArgumentException.java +++ b/jdk/src/share/classes/java/lang/IllegalArgumentException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -30,7 +30,6 @@ package java.lang; * inappropriate argument. * * @author unascribed - * @see java.lang.Thread#setPriority(int) * @since JDK1.0 */ public diff --git a/jdk/src/share/classes/java/lang/Integer.java b/jdk/src/share/classes/java/lang/Integer.java index c33e90a5e49..48ef1bbbbfb 100644 --- a/jdk/src/share/classes/java/lang/Integer.java +++ b/jdk/src/share/classes/java/lang/Integer.java @@ -381,7 +381,7 @@ public final class Integer extends Number implements Comparable { int size = (i < 0) ? stringSize(-i) + 1 : stringSize(i); char[] buf = new char[size]; getChars(i, size, buf); - return new String(0, size, buf); + return new String(buf, true); } /** diff --git a/jdk/src/share/classes/java/lang/Long.java b/jdk/src/share/classes/java/lang/Long.java index f4dc32dcdff..55f7b1a7e9d 100644 --- a/jdk/src/share/classes/java/lang/Long.java +++ b/jdk/src/share/classes/java/lang/Long.java @@ -373,7 +373,7 @@ public final class Long extends Number implements Comparable { int size = (i < 0) ? stringSize(-i) + 1 : stringSize(i); char[] buf = new char[size]; getChars(i, size, buf); - return new String(0, size, buf); + return new String(buf, true); } /** diff --git a/jdk/src/share/classes/java/lang/NumberFormatException.java b/jdk/src/share/classes/java/lang/NumberFormatException.java index c1d19de7156..ea1ec9fd771 100644 --- a/jdk/src/share/classes/java/lang/NumberFormatException.java +++ b/jdk/src/share/classes/java/lang/NumberFormatException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,7 +31,7 @@ package java.lang; * have the appropriate format. * * @author unascribed - * @see java.lang.Integer#toString() + * @see java.lang.Integer#parseInt(String) * @since JDK1.0 */ public diff --git a/jdk/src/share/classes/java/lang/String.java b/jdk/src/share/classes/java/lang/String.java index 79c71d119a5..f4f2a1a0388 100644 --- a/jdk/src/share/classes/java/lang/String.java +++ b/jdk/src/share/classes/java/lang/String.java @@ -25,7 +25,6 @@ package java.lang; -import java.io.ObjectStreamClass; import java.io.ObjectStreamField; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; @@ -108,17 +107,10 @@ import java.util.regex.PatternSyntaxException; */ public final class String - implements java.io.Serializable, Comparable, CharSequence -{ + implements java.io.Serializable, Comparable, CharSequence { /** The value is used for character storage. */ private final char value[]; - /** The offset is the first index of the storage that is used. */ - private final int offset; - - /** The count is the number of characters in the String. */ - private final int count; - /** Cache the hash code for the string */ private int hash; // Default to 0 @@ -138,7 +130,7 @@ public final class String * string instance within the stream. */ private static final ObjectStreamField[] serialPersistentFields = - new ObjectStreamField[0]; + new ObjectStreamField[0]; /** * Initializes a newly created {@code String} object so that it represents @@ -146,8 +138,6 @@ public final class String * unnecessary since Strings are immutable. */ public String() { - this.offset = 0; - this.count = 0; this.value = new char[0]; } @@ -162,23 +152,8 @@ public final class String * A {@code String} */ public String(String original) { - int size = original.count; - char[] originalValue = original.value; - char[] v; - if (originalValue.length > size) { - // The array representing the String is bigger than the new - // String itself. Perhaps this constructor is being called - // in order to trim the baggage, so make a copy of the array. - int off = original.offset; - v = Arrays.copyOfRange(originalValue, off, off+size); - } else { - // The array representing the String is the same - // size as the String, so no point in making a copy. - v = originalValue; - } - this.offset = 0; - this.count = size; - this.value = v; + this.value = original.value; + this.hash = original.hash; } /** @@ -191,10 +166,7 @@ public final class String * The initial value of the string */ public String(char value[]) { - int size = value.length; - this.offset = 0; - this.count = size; - this.value = Arrays.copyOf(value, size); + this.value = Arrays.copyOf(value, value.length); } /** @@ -229,8 +201,6 @@ public final class String if (offset > value.length - count) { throw new StringIndexOutOfBoundsException(offset + count); } - this.offset = 0; - this.count = count; this.value = Arrays.copyOfRange(value, offset, offset+count); } @@ -293,14 +263,12 @@ public final class String for (int i = offset, j = 0; i < end; i++, j++) { int c = codePoints[i]; if (Character.isBmpCodePoint(c)) - v[j] = (char) c; + v[j] = (char)c; else Character.toSurrogates(c, v, j++); } - this.value = v; - this.count = n; - this.offset = 0; + this.value = v; } /** @@ -348,17 +316,15 @@ public final class String char value[] = new char[count]; if (hibyte == 0) { - for (int i = count ; i-- > 0 ;) { - value[i] = (char) (ascii[i + offset] & 0xff); + for (int i = count; i-- > 0;) { + value[i] = (char)(ascii[i + offset] & 0xff); } } else { hibyte <<= 8; - for (int i = count ; i-- > 0 ;) { - value[i] = (char) (hibyte | (ascii[i + offset] & 0xff)); + for (int i = count; i-- > 0;) { + value[i] = (char)(hibyte | (ascii[i + offset] & 0xff)); } } - this.offset = 0; - this.count = count; this.value = value; } @@ -444,15 +410,11 @@ public final class String * @since JDK1.1 */ public String(byte bytes[], int offset, int length, String charsetName) - throws UnsupportedEncodingException - { + throws UnsupportedEncodingException { if (charsetName == null) throw new NullPointerException("charsetName"); checkBounds(bytes, offset, length); - char[] v = StringCoding.decode(charsetName, bytes, offset, length); - this.offset = 0; - this.count = v.length; - this.value = v; + this.value = StringCoding.decode(charsetName, bytes, offset, length); } /** @@ -489,10 +451,7 @@ public final class String if (charset == null) throw new NullPointerException("charset"); checkBounds(bytes, offset, length); - char[] v = StringCoding.decode(charset, bytes, offset, length); - this.offset = 0; - this.count = v.length; - this.value = v; + this.value = StringCoding.decode(charset, bytes, offset, length); } /** @@ -519,8 +478,7 @@ public final class String * @since JDK1.1 */ public String(byte bytes[], String charsetName) - throws UnsupportedEncodingException - { + throws UnsupportedEncodingException { this(bytes, 0, bytes.length, charsetName); } @@ -576,10 +534,7 @@ public final class String */ public String(byte bytes[], int offset, int length) { checkBounds(bytes, offset, length); - char[] v = StringCoding.decode(bytes, offset, length); - this.offset = 0; - this.count = v.length; - this.value = v; + this.value = StringCoding.decode(bytes, offset, length); } /** @@ -612,10 +567,9 @@ public final class String * A {@code StringBuffer} */ public String(StringBuffer buffer) { - String result = buffer.toString(); - this.value = result.value; - this.count = result.count; - this.offset = result.offset; + synchronized(buffer) { + this.value = Arrays.copyOf(buffer.getValue(), buffer.length()); + } } /** @@ -634,18 +588,18 @@ public final class String * @since 1.5 */ public String(StringBuilder builder) { - String result = builder.toString(); - this.value = result.value; - this.count = result.count; - this.offset = result.offset; + this.value = Arrays.copyOf(builder.getValue(), builder.length()); } - - // Package private constructor which shares value array for speed. - String(int offset, int count, char value[]) { + /* + * Package private constructor which shares value array for speed. + * this constructor is always expected to be called with share==true. + * a separate constructor is needed because we already have a public + * String(char[]) constructor that makes a copy of the given char[]. + */ + String(char[] value, boolean share) { + // assert share : "unshared not supported"; this.value = value; - this.offset = offset; - this.count = count; } /** @@ -657,7 +611,7 @@ public final class String * object. */ public int length() { - return count; + return value.length; } /** @@ -669,7 +623,7 @@ public final class String * @since 1.6 */ public boolean isEmpty() { - return count == 0; + return value.length == 0; } /** @@ -691,10 +645,10 @@ public final class String * string. */ public char charAt(int index) { - if ((index < 0) || (index >= count)) { + if ((index < 0) || (index >= value.length)) { throw new StringIndexOutOfBoundsException(index); } - return value[index + offset]; + return value[index]; } /** @@ -720,10 +674,10 @@ public final class String * @since 1.5 */ public int codePointAt(int index) { - if ((index < 0) || (index >= count)) { + if ((index < 0) || (index >= value.length)) { throw new StringIndexOutOfBoundsException(index); } - return Character.codePointAtImpl(value, offset + index, offset + count); + return Character.codePointAtImpl(value, index, value.length); } /** @@ -750,10 +704,10 @@ public final class String */ public int codePointBefore(int index) { int i = index - 1; - if ((i < 0) || (i >= count)) { + if ((i < 0) || (i >= value.length)) { throw new StringIndexOutOfBoundsException(index); } - return Character.codePointBeforeImpl(value, offset + index, offset); + return Character.codePointBeforeImpl(value, index, 0); } /** @@ -778,10 +732,10 @@ public final class String * @since 1.5 */ public int codePointCount(int beginIndex, int endIndex) { - if (beginIndex < 0 || endIndex > count || beginIndex > endIndex) { + if (beginIndex < 0 || endIndex > value.length || beginIndex > endIndex) { throw new IndexOutOfBoundsException(); } - return Character.codePointCountImpl(value, offset+beginIndex, endIndex-beginIndex); + return Character.codePointCountImpl(value, beginIndex, endIndex - beginIndex); } /** @@ -805,11 +759,11 @@ public final class String * @since 1.5 */ public int offsetByCodePoints(int index, int codePointOffset) { - if (index < 0 || index > count) { + if (index < 0 || index > value.length) { throw new IndexOutOfBoundsException(); } - return Character.offsetByCodePointsImpl(value, offset, count, - offset+index, codePointOffset) - offset; + return Character.offsetByCodePointsImpl(value, 0, value.length, + index, codePointOffset); } /** @@ -817,7 +771,7 @@ public final class String * This method doesn't perform any range checking. */ void getChars(char dst[], int dstBegin) { - System.arraycopy(value, offset, dst, dstBegin, count); + System.arraycopy(value, 0, dst, dstBegin, value.length); } /** @@ -854,14 +808,13 @@ public final class String if (srcBegin < 0) { throw new StringIndexOutOfBoundsException(srcBegin); } - if (srcEnd > count) { + if (srcEnd > value.length) { throw new StringIndexOutOfBoundsException(srcEnd); } if (srcBegin > srcEnd) { throw new StringIndexOutOfBoundsException(srcEnd - srcBegin); } - System.arraycopy(value, offset + srcBegin, dst, dstBegin, - srcEnd - srcBegin); + System.arraycopy(value, srcBegin, dst, dstBegin, srcEnd - srcBegin); } /** @@ -912,15 +865,15 @@ public final class String if (srcBegin < 0) { throw new StringIndexOutOfBoundsException(srcBegin); } - if (srcEnd > count) { + if (srcEnd > value.length) { throw new StringIndexOutOfBoundsException(srcEnd); } if (srcBegin > srcEnd) { throw new StringIndexOutOfBoundsException(srcEnd - srcBegin); } int j = dstBegin; - int n = offset + srcEnd; - int i = offset + srcBegin; + int n = srcEnd; + int i = srcBegin; char[] val = value; /* avoid getfield opcode */ while (i < n) { @@ -949,10 +902,9 @@ public final class String * @since JDK1.1 */ public byte[] getBytes(String charsetName) - throws UnsupportedEncodingException - { + throws UnsupportedEncodingException { if (charsetName == null) throw new NullPointerException(); - return StringCoding.encode(charsetName, value, offset, count); + return StringCoding.encode(charsetName, value, 0, value.length); } /** @@ -975,7 +927,7 @@ public final class String */ public byte[] getBytes(Charset charset) { if (charset == null) throw new NullPointerException(); - return StringCoding.encode(charset, value, offset, count); + return StringCoding.encode(charset, value, 0, value.length); } /** @@ -992,7 +944,7 @@ public final class String * @since JDK1.1 */ public byte[] getBytes() { - return StringCoding.encode(value, offset, count); + return StringCoding.encode(value, 0, value.length); } /** @@ -1015,16 +967,16 @@ public final class String return true; } if (anObject instanceof String) { - String anotherString = (String)anObject; - int n = count; - if (n == anotherString.count) { + String anotherString = (String) anObject; + int n = value.length; + if (n == anotherString.value.length) { char v1[] = value; char v2[] = anotherString.value; - int i = offset; - int j = anotherString.offset; + int i = 0; while (n-- != 0) { - if (v1[i++] != v2[j++]) - return false; + if (v1[i] != v2[i]) + return false; + i++; } return true; } @@ -1047,8 +999,8 @@ public final class String * @since 1.4 */ public boolean contentEquals(StringBuffer sb) { - synchronized(sb) { - return contentEquals((CharSequence)sb); + synchronized (sb) { + return contentEquals((CharSequence) sb); } } @@ -1067,18 +1019,18 @@ public final class String * @since 1.5 */ public boolean contentEquals(CharSequence cs) { - if (count != cs.length()) + if (value.length != cs.length()) return false; // Argument is a StringBuffer, StringBuilder if (cs instanceof AbstractStringBuilder) { char v1[] = value; - char v2[] = ((AbstractStringBuilder)cs).getValue(); - int i = offset; - int j = 0; - int n = count; + char v2[] = ((AbstractStringBuilder) cs).getValue(); + int i = 0; + int n = value.length; while (n-- != 0) { - if (v1[i++] != v2[j++]) + if (v1[i] != v2[i]) return false; + i++; } return true; } @@ -1087,12 +1039,12 @@ public final class String return true; // Argument is a generic CharSequence char v1[] = value; - int i = offset; - int j = 0; - int n = count; + int i = 0; + int n = value.length; while (n-- != 0) { - if (v1[i++] != cs.charAt(j++)) + if (v1[i] != cs.charAt(i)) return false; + i++; } return true; } @@ -1126,9 +1078,10 @@ public final class String * @see #equals(Object) */ public boolean equalsIgnoreCase(String anotherString) { - return (this == anotherString) ? true : - (anotherString != null) && (anotherString.count == count) && - regionMatches(true, 0, anotherString, 0, count); + return (this == anotherString) ? true + : (anotherString != null) + && (anotherString.value.length == value.length) + && regionMatches(true, 0, anotherString, 0, value.length); } /** @@ -1173,33 +1126,20 @@ public final class String * lexicographically greater than the string argument. */ public int compareTo(String anotherString) { - int len1 = count; - int len2 = anotherString.count; - int n = Math.min(len1, len2); + int len1 = value.length; + int len2 = anotherString.value.length; + int lim = Math.min(len1, len2); char v1[] = value; char v2[] = anotherString.value; - int i = offset; - int j = anotherString.offset; - if (i == j) { - int k = i; - int lim = n + i; - while (k < lim) { - char c1 = v1[k]; - char c2 = v2[k]; - if (c1 != c2) { - return c1 - c2; - } - k++; - } - } else { - while (n-- != 0) { - char c1 = v1[i++]; - char c2 = v2[j++]; - if (c1 != c2) { - return c1 - c2; - } + int k = 0; + while (k < lim) { + char c1 = v1[k]; + char c2 = v2[k]; + if (c1 != c2) { + return c1 - c2; } + k++; } return len1 - len2; } @@ -1219,7 +1159,7 @@ public final class String public static final Comparator CASE_INSENSITIVE_ORDER = new CaseInsensitiveComparator(); private static class CaseInsensitiveComparator - implements Comparator, java.io.Serializable { + implements Comparator, java.io.Serializable { // use serialVersionUID from JDK 1.2.2 for interoperability private static final long serialVersionUID = 8575799808933029326L; @@ -1306,14 +1246,15 @@ public final class String * {@code false} otherwise. */ public boolean regionMatches(int toffset, String other, int ooffset, - int len) { + int len) { char ta[] = value; - int to = offset + toffset; + int to = toffset; char pa[] = other.value; - int po = other.offset + ooffset; + int po = ooffset; // Note: toffset, ooffset, or len might be near -1>>>1. - if ((ooffset < 0) || (toffset < 0) || (toffset > (long)count - len) - || (ooffset > (long)other.count - len)) { + if ((ooffset < 0) || (toffset < 0) + || (toffset > (long)value.length - len) + || (ooffset > (long)other.value.length - len)) { return false; } while (len-- > 0) { @@ -1351,7 +1292,7 @@ public final class String * integer k less than len such that: * 
          * Character.toLowerCase(this.charAt(toffset+k)) !=
-               Character.toLowerCase(other.charAt(ooffset+k))
+     Character.toLowerCase(other.charAt(ooffset+k))
      *
    * and: * 
    @@ -1375,14 +1316,15 @@ public final class String
      *          argument.
      */
     public boolean regionMatches(boolean ignoreCase, int toffset,
-                           String other, int ooffset, int len) {
+            String other, int ooffset, int len) {
         char ta[] = value;
-        int to = offset + toffset;
+        int to = toffset;
         char pa[] = other.value;
-        int po = other.offset + ooffset;
+        int po = ooffset;
         // Note: toffset, ooffset, or len might be near -1>>>1.
-        if ((ooffset < 0) || (toffset < 0) || (toffset > (long)count - len) ||
-                (ooffset > (long)other.count - len)) {
+        if ((ooffset < 0) || (toffset < 0)
+                || (toffset > (long)value.length - len)
+                || (ooffset > (long)other.value.length - len)) {
             return false;
         }
         while (len-- > 0) {
@@ -1433,12 +1375,12 @@ public final class String
      */
     public boolean startsWith(String prefix, int toffset) {
         char ta[] = value;
-        int to = offset + toffset;
+        int to = toffset;
         char pa[] = prefix.value;
-        int po = prefix.offset;
-        int pc = prefix.count;
+        int po = 0;
+        int pc = prefix.value.length;
         // Note: toffset might be near -1>>>1.
-        if ((toffset < 0) || (toffset > count - pc)) {
+        if ((toffset < 0) || (toffset > value.length - pc)) {
             return false;
         }
         while (--pc >= 0) {
@@ -1478,7 +1420,7 @@ public final class String
      *          as determined by the {@link #equals(Object)} method.
      */
     public boolean endsWith(String suffix) {
-        return startsWith(suffix, count - suffix.count);
+        return startsWith(suffix, value.length - suffix.value.length);
     }
 
     /**
@@ -1496,13 +1438,11 @@ public final class String
      */
     public int hashCode() {
         int h = hash;
-        if (h == 0 && count > 0) {
-            int off = offset;
+        if (h == 0 && value.length > 0) {
             char val[] = value;
-            int len = count;
 
-            for (int i = 0; i < len; i++) {
-                h = 31*h + val[off++];
+            for (int i = 0; i < value.length; i++) {
+                h = 31 * h + val[i];
             }
             hash = h;
         }
@@ -1577,9 +1517,10 @@ public final class String
      *          if the character does not occur.
      */
     public int indexOf(int ch, int fromIndex) {
+        final int max = value.length;
         if (fromIndex < 0) {
             fromIndex = 0;
-        } else if (fromIndex >= count) {
+        } else if (fromIndex >= max) {
             // Note: fromIndex might be near -1>>>1.
             return -1;
         }
@@ -1588,11 +1529,9 @@ public final class String
             // handle most cases here (ch is a BMP code point or a
             // negative value (invalid code point))
             final char[] value = this.value;
-            final int offset = this.offset;
-            final int max = offset + count;
-            for (int i = offset + fromIndex; i < max ; i++) {
+            for (int i = fromIndex; i < max; i++) {
                 if (value[i] == ch) {
-                    return i - offset;
+                    return i;
                 }
             }
             return -1;
@@ -1607,13 +1546,12 @@ public final class String
     private int indexOfSupplementary(int ch, int fromIndex) {
         if (Character.isValidCodePoint(ch)) {
             final char[] value = this.value;
-            final int offset = this.offset;
             final char hi = Character.highSurrogate(ch);
             final char lo = Character.lowSurrogate(ch);
-            final int max = offset + count - 1;
-            for (int i = offset + fromIndex; i < max; i++) {
-                if (value[i] == hi && value[i+1] == lo) {
-                    return i - offset;
+            final int max = value.length - 1;
+            for (int i = fromIndex; i < max; i++) {
+                if (value[i] == hi && value[i + 1] == lo) {
+                    return i;
                 }
             }
         }
@@ -1644,7 +1582,7 @@ public final class String
      *          {@code -1} if the character does not occur.
      */
     public int lastIndexOf(int ch) {
-        return lastIndexOf(ch, count - 1);
+        return lastIndexOf(ch, value.length - 1);
     }
 
     /**
@@ -1686,11 +1624,10 @@ public final class String
             // handle most cases here (ch is a BMP code point or a
             // negative value (invalid code point))
             final char[] value = this.value;
-            final int offset = this.offset;
-            int i = offset + Math.min(fromIndex, count - 1);
-            for (; i >= offset ; i--) {
+            int i = Math.min(fromIndex, value.length - 1);
+            for (; i >= 0; i--) {
                 if (value[i] == ch) {
-                    return i - offset;
+                    return i;
                 }
             }
             return -1;
@@ -1705,13 +1642,12 @@ public final class String
     private int lastIndexOfSupplementary(int ch, int fromIndex) {
         if (Character.isValidCodePoint(ch)) {
             final char[] value = this.value;
-            final int offset = this.offset;
             char hi = Character.highSurrogate(ch);
             char lo = Character.lowSurrogate(ch);
-            int i = offset + Math.min(fromIndex, count - 2);
-            for (; i >= offset; i--) {
-                if (value[i] == hi && value[i+1] == lo) {
-                    return i - offset;
+            int i = Math.min(fromIndex, value.length - 2);
+            for (; i >= 0; i--) {
+                if (value[i] == hi && value[i + 1] == lo) {
+                    return i;
                 }
             }
         }
@@ -1753,8 +1689,8 @@ public final class String
      *          or {@code -1} if there is no such occurrence.
      */
     public int indexOf(String str, int fromIndex) {
-        return indexOf(value, offset, count,
-                       str.value, str.offset, str.count, fromIndex);
+        return indexOf(value, 0, value.length,
+                str.value, 0, str.value.length, fromIndex);
     }
 
     /**
@@ -1771,8 +1707,8 @@ public final class String
      * @param   fromIndex    the index to begin searching from.
      */
     static int indexOf(char[] source, int sourceOffset, int sourceCount,
-                       char[] target, int targetOffset, int targetCount,
-                       int fromIndex) {
+            char[] target, int targetOffset, int targetCount,
+            int fromIndex) {
         if (fromIndex >= sourceCount) {
             return (targetCount == 0 ? sourceCount : -1);
         }
@@ -1783,7 +1719,7 @@ public final class String
             return fromIndex;
         }
 
-        char first  = target[targetOffset];
+        char first = target[targetOffset];
         int max = sourceOffset + (sourceCount - targetCount);
 
         for (int i = sourceOffset + fromIndex; i <= max; i++) {
@@ -1796,8 +1732,8 @@ public final class String
             if (i <= max) {
                 int j = i + 1;
                 int end = j + targetCount - 1;
-                for (int k = targetOffset + 1; j < end && source[j] ==
-                         target[k]; j++, k++);
+                for (int k = targetOffset + 1; j < end && source[j]
+                        == target[k]; j++, k++);
 
                 if (j == end) {
                     /* Found whole string. */
@@ -1824,7 +1760,7 @@ public final class String
      *          or {@code -1} if there is no such occurrence.
      */
     public int lastIndexOf(String str) {
-        return lastIndexOf(str, count);
+        return lastIndexOf(str, value.length);
     }
 
     /**
@@ -1844,8 +1780,8 @@ public final class String
      *          or {@code -1} if there is no such occurrence.
      */
     public int lastIndexOf(String str, int fromIndex) {
-        return lastIndexOf(value, offset, count,
-                           str.value, str.offset, str.count, fromIndex);
+        return lastIndexOf(value, 0, value.length,
+                str.value, 0, str.value.length, fromIndex);
     }
 
     /**
@@ -1862,8 +1798,8 @@ public final class String
      * @param   fromIndex    the index to begin searching from.
      */
     static int lastIndexOf(char[] source, int sourceOffset, int sourceCount,
-                           char[] target, int targetOffset, int targetCount,
-                           int fromIndex) {
+            char[] target, int targetOffset, int targetCount,
+            int fromIndex) {
         /*
          * Check arguments; return immediately where possible. For
          * consistency, don't check for null str.
@@ -1885,7 +1821,7 @@ public final class String
         int min = sourceOffset + targetCount - 1;
         int i = min + fromIndex;
 
-    startSearchForLastChar:
+        startSearchForLastChar:
         while (true) {
             while (i >= min && source[i] != strLastChar) {
                 i--;
@@ -1925,7 +1861,14 @@ public final class String
      *             length of this {@code String} object.
      */
     public String substring(int beginIndex) {
-        return substring(beginIndex, count);
+        if (beginIndex < 0) {
+            throw new StringIndexOutOfBoundsException(beginIndex);
+        }
+        int subLen = value.length - beginIndex;
+        if (subLen < 0) {
+            throw new StringIndexOutOfBoundsException(subLen);
+        }
+        return (beginIndex == 0) ? this : new String(value, beginIndex, subLen);
     }
 
     /**
@@ -1954,14 +1897,15 @@ public final class String
         if (beginIndex < 0) {
             throw new StringIndexOutOfBoundsException(beginIndex);
         }
-        if (endIndex > count) {
+        if (endIndex > value.length) {
             throw new StringIndexOutOfBoundsException(endIndex);
         }
-        if (beginIndex > endIndex) {
-            throw new StringIndexOutOfBoundsException(endIndex - beginIndex);
+        int subLen = endIndex - beginIndex;
+        if (subLen < 0) {
+            throw new StringIndexOutOfBoundsException(subLen);
         }
-        return ((beginIndex == 0) && (endIndex == count)) ? this :
-            new String(offset + beginIndex, endIndex - beginIndex, value);
+        return ((beginIndex == 0) && (endIndex == value.length)) ? this
+                : new String(value, beginIndex, subLen);
     }
 
     /**
@@ -2021,10 +1965,10 @@ public final class String
         if (otherLen == 0) {
             return this;
         }
-        char buf[] = new char[count + otherLen];
-        getChars(0, count, buf, 0);
-        str.getChars(0, otherLen, buf, count);
-        return new String(0, count + otherLen, buf);
+        int len = value.length;
+        char buf[] = Arrays.copyOf(value, len + otherLen);
+        str.getChars(buf, len);
+        return new String(buf, true);
     }
 
     /**
@@ -2058,27 +2002,26 @@ public final class String
      */
     public String replace(char oldChar, char newChar) {
         if (oldChar != newChar) {
-            int len = count;
+            int len = value.length;
             int i = -1;
             char[] val = value; /* avoid getfield opcode */
-            int off = offset;   /* avoid getfield opcode */
 
             while (++i < len) {
-                if (val[off + i] == oldChar) {
+                if (val[i] == oldChar) {
                     break;
                 }
             }
             if (i < len) {
                 char buf[] = new char[len];
-                for (int j = 0 ; j < i ; j++) {
-                    buf[j] = val[off+j];
+                for (int j = 0; j < i; j++) {
+                    buf[j] = val[j];
                 }
                 while (i < len) {
-                    char c = val[off + i];
+                    char c = val[i];
                     buf[i] = (c == oldChar) ? newChar : c;
                     i++;
                 }
-                return new String(0, len, buf);
+                return new String(buf, true);
             }
         }
         return this;
@@ -2229,7 +2172,7 @@ public final class String
      */
     public String replace(CharSequence target, CharSequence replacement) {
         return Pattern.compile(target.toString(), Pattern.LITERAL).matcher(
-            this).replaceAll(Matcher.quoteReplacement(replacement.toString()));
+                this).replaceAll(Matcher.quoteReplacement(replacement.toString()));
     }
 
     /**
@@ -2314,13 +2257,13 @@ public final class String
      */
     public String[] split(String regex, int limit) {
         /* fastpath if the regex is a
-           (1)one-char String and this character is not one of the
-              RegEx's meta characters ".$|()[{^?*+\\", or
-           (2)two-char String and the first char is the backslash and
-              the second is not the ascii digit or ascii letter.
-        */
+         (1)one-char String and this character is not one of the
+            RegEx's meta characters ".$|()[{^?*+\\", or
+         (2)two-char String and the first char is the backslash and
+            the second is not the ascii digit or ascii letter.
+         */
         char ch = 0;
-        if (((regex.count == 1 &&
+        if (((regex.value.length == 1 &&
              ".$|()[{^?*+\\".indexOf(ch = regex.charAt(0)) == -1) ||
              (regex.length() == 2 &&
               regex.charAt(0) == '\\' &&
@@ -2340,23 +2283,23 @@ public final class String
                     off = next + 1;
                 } else {    // last one
                     //assert (list.size() == limit - 1);
-                    list.add(substring(off, count));
-                    off = count;
+                    list.add(substring(off, value.length));
+                    off = value.length;
                     break;
                 }
             }
             // If no match was found, return this
             if (off == 0)
-                return new String[] { this };
+                return new String[]{this};
 
             // Add remaining segment
             if (!limited || list.size() < limit)
-                list.add(substring(off, count));
+                list.add(substring(off, value.length));
 
             // Construct result
             int resultSize = list.size();
             if (limit == 0)
-                while (resultSize > 0 && list.get(resultSize-1).length() == 0)
+                while (resultSize > 0 && list.get(resultSize - 1).length() == 0)
                     resultSize--;
             String[] result = new String[resultSize];
             return list.subList(0, resultSize).toArray(result);
@@ -2463,14 +2406,15 @@ public final class String
             throw new NullPointerException();
         }
 
-        int     firstUpper;
+        int firstUpper;
+        final int len = value.length;
 
         /* Now check if there are any characters that need to be changed. */
         scan: {
-            for (firstUpper = 0 ; firstUpper < count; ) {
-                char c = value[offset+firstUpper];
-                if ((c >= Character.MIN_HIGH_SURROGATE) &&
-                    (c <= Character.MAX_HIGH_SURROGATE)) {
+            for (firstUpper = 0 ; firstUpper < len; ) {
+                char c = value[firstUpper];
+                if ((c >= Character.MIN_HIGH_SURROGATE)
+                        && (c <= Character.MAX_HIGH_SURROGATE)) {
                     int supplChar = codePointAt(firstUpper);
                     if (supplChar != Character.toLowerCase(supplChar)) {
                         break scan;
@@ -2486,24 +2430,24 @@ public final class String
             return this;
         }
 
-        char[]  result = new char[count];
-        int     resultOffset = 0;  /* result may grow, so i+resultOffset
-                                    * is the write location in result */
+        char[] result = new char[len];
+        int resultOffset = 0;  /* result may grow, so i+resultOffset
+                                * is the write location in result */
 
         /* Just copy the first few lowerCase characters. */
-        System.arraycopy(value, offset, result, 0, firstUpper);
+        System.arraycopy(value, 0, result, 0, firstUpper);
 
         String lang = locale.getLanguage();
         boolean localeDependent =
-            (lang == "tr" || lang == "az" || lang == "lt");
+                (lang == "tr" || lang == "az" || lang == "lt");
         char[] lowerCharArray;
         int lowerChar;
         int srcChar;
         int srcCount;
-        for (int i = firstUpper; i < count; i += srcCount) {
-            srcChar = (int)value[offset+i];
-            if ((char)srcChar >= Character.MIN_HIGH_SURROGATE &&
-                (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
+        for (int i = firstUpper; i < len; i += srcCount) {
+            srcChar = (int)value[i];
+            if ((char)srcChar >= Character.MIN_HIGH_SURROGATE
+                    && (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
                 srcChar = codePointAt(i);
                 srcCount = Character.charCount(srcChar);
             } else {
@@ -2516,16 +2460,16 @@ public final class String
             } else {
                 lowerChar = Character.toLowerCase(srcChar);
             }
-            if ((lowerChar == Character.ERROR) ||
-                (lowerChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
+            if ((lowerChar == Character.ERROR)
+                    || (lowerChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
                 if (lowerChar == Character.ERROR) {
-                     if (!localeDependent && srcChar == '\u0130') {
-                         lowerCharArray =
-                             ConditionalSpecialCasing.toLowerCaseCharArray(this, i, Locale.ENGLISH);
-                     } else {
+                    if (!localeDependent && srcChar == '\u0130') {
                         lowerCharArray =
-                            ConditionalSpecialCasing.toLowerCaseCharArray(this, i, locale);
-                     }
+                                ConditionalSpecialCasing.toLowerCaseCharArray(this, i, Locale.ENGLISH);
+                    } else {
+                        lowerCharArray =
+                                ConditionalSpecialCasing.toLowerCaseCharArray(this, i, locale);
+                    }
                 } else if (srcCount == 2) {
                     resultOffset += Character.toChars(lowerChar, result, i + resultOffset) - srcCount;
                     continue;
@@ -2537,19 +2481,18 @@ public final class String
                 int mapLen = lowerCharArray.length;
                 if (mapLen > srcCount) {
                     char[] result2 = new char[result.length + mapLen - srcCount];
-                    System.arraycopy(result, 0, result2, 0,
-                        i + resultOffset);
+                    System.arraycopy(result, 0, result2, 0, i + resultOffset);
                     result = result2;
                 }
-                for (int x=0; x= Character.MIN_HIGH_SURROGATE) &&
-                    (c <= Character.MAX_HIGH_SURROGATE)) {
+                if ((c >= Character.MIN_HIGH_SURROGATE)
+                        && (c <= Character.MAX_HIGH_SURROGATE)) {
                     c = codePointAt(firstLower);
                     srcCount = Character.charCount(c);
                 } else {
                     srcCount = 1;
                 }
                 int upperCaseChar = Character.toUpperCaseEx(c);
-                if ((upperCaseChar == Character.ERROR) ||
-                    (c != upperCaseChar)) {
+                if ((upperCaseChar == Character.ERROR)
+                        || (c != upperCaseChar)) {
                     break scan;
                 }
                 firstLower += srcCount;
@@ -2652,22 +2596,22 @@ public final class String
             return this;
         }
 
-        char[]  result       = new char[count]; /* may grow */
-        int     resultOffset = 0;  /* result may grow, so i+resultOffset
-                                    * is the write location in result */
+        char[] result = new char[len]; /* may grow */
+        int resultOffset = 0;  /* result may grow, so i+resultOffset
+         * is the write location in result */
 
         /* Just copy the first few upperCase characters. */
-        System.arraycopy(value, offset, result, 0, firstLower);
+        System.arraycopy(value, 0, result, 0, firstLower);
 
         String lang = locale.getLanguage();
         boolean localeDependent =
-            (lang == "tr" || lang == "az" || lang == "lt");
+                (lang == "tr" || lang == "az" || lang == "lt");
         char[] upperCharArray;
         int upperChar;
         int srcChar;
         int srcCount;
-        for (int i = firstLower; i < count; i += srcCount) {
-            srcChar = (int)value[offset+i];
+        for (int i = firstLower; i < len; i += srcCount) {
+            srcChar = (int)value[i];
             if ((char)srcChar >= Character.MIN_HIGH_SURROGATE &&
                 (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
                 srcChar = codePointAt(i);
@@ -2680,12 +2624,12 @@ public final class String
             } else {
                 upperChar = Character.toUpperCaseEx(srcChar);
             }
-            if ((upperChar == Character.ERROR) ||
-                (upperChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
+            if ((upperChar == Character.ERROR)
+                    || (upperChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
                 if (upperChar == Character.ERROR) {
                     if (localeDependent) {
                         upperCharArray =
-                            ConditionalSpecialCasing.toUpperCaseCharArray(this, i, locale);
+                                ConditionalSpecialCasing.toUpperCaseCharArray(this, i, locale);
                     } else {
                         upperCharArray = Character.toUpperCaseCharArray(srcChar);
                     }
@@ -2700,19 +2644,18 @@ public final class String
                 int mapLen = upperCharArray.length;
                 if (mapLen > srcCount) {
                     char[] result2 = new char[result.length + mapLen - srcCount];
-                    System.arraycopy(result, 0, result2, 0,
-                        i + resultOffset);
+                    System.arraycopy(result, 0, result2, 0, i + resultOffset);
                     result = result2;
                 }
-                for (int x=0; x 0) || (len < count)) ? substring(st, len) : this;
+        return ((st > 0) || (len < value.length)) ? substring(st, len) : this;
     }
 
     /**
@@ -2801,8 +2743,9 @@ public final class String
      *          the character sequence represented by this string.
      */
     public char[] toCharArray() {
-        char result[] = new char[count];
-        getChars(0, count, result, 0);
+        // Cannot use Arrays.copyOf because of class initialization order issues
+        char result[] = new char[value.length];
+        System.arraycopy(value, 0, result, 0, value.length);
         return result;
     }
 
@@ -2844,7 +2787,7 @@ public final class String
      * @see  java.util.Formatter
      * @since  1.5
      */
-    public static String format(String format, Object ... args) {
+    public static String format(String format, Object... args) {
         return new Formatter().format(format, args).toString();
     }
 
@@ -2888,7 +2831,7 @@ public final class String
      * @see  java.util.Formatter
      * @since  1.5
      */
-    public static String format(Locale l, String format, Object ... args) {
+    public static String format(Locale l, String format, Object... args) {
         return new Formatter(l).format(format, args).toString();
     }
 
@@ -2968,7 +2911,7 @@ public final class String
      *          character array.
      */
     public static String copyValueOf(char data[]) {
-        return copyValueOf(data, 0, data.length);
+        return new String(data);
     }
 
     /**
@@ -2993,7 +2936,7 @@ public final class String
      */
     public static String valueOf(char c) {
         char data[] = {c};
-        return new String(0, 1, data);
+        return new String(data, true);
     }
 
     /**
@@ -3077,4 +3020,100 @@ public final class String
      */
     public native String intern();
 
+    /**
+     * Seed value used for each alternative hash calculated.
+     */
+    private static final int HASHING_SEED;
+
+    static {
+        long nanos = System.nanoTime();
+        long now = System.currentTimeMillis();
+        int SEED_MATERIAL[] = {
+                System.identityHashCode(String.class),
+                System.identityHashCode(System.class),
+                (int) (nanos >>> 32),
+                (int) nanos,
+                (int) (now >>> 32),
+                (int) now,
+                (int) (System.nanoTime() >>> 2)
+        };
+
+        // Use murmur3 to scramble the seeding material.
+        // Inline implementation to avoid loading classes
+        int h1 = 0;
+
+        // body
+        for(int k1 : SEED_MATERIAL) {
+            k1 *= 0xcc9e2d51;
+            k1 = (k1 << 15) | (k1 >>> 17);
+            k1 *= 0x1b873593;
+
+            h1 ^= k1;
+            h1 = (h1 << 13) | (h1 >>> 19);
+            h1 = h1 * 5 + 0xe6546b64;
+        }
+
+        // tail (always empty, as body is always 32-bit chunks)
+
+        // finalization
+
+        h1 ^= SEED_MATERIAL.length * 4;
+
+        // finalization mix force all bits of a hash block to avalanche
+        h1 ^= h1 >>> 16;
+        h1 *= 0x85ebca6b;
+        h1 ^= h1 >>> 13;
+        h1 *= 0xc2b2ae35;
+        h1 ^= h1 >>> 16;
+
+        HASHING_SEED = h1;
+    }
+
+    /**
+     * Cached value of the hashing algorithm result
+     */
+    private transient int hash32 = 0;
+
+    /**
+    * Return a 32-bit hash code value for this object.
+    * 
    
+    * The general contract of {@code hash32} is:
+    * 
      
+    * 
    • Whenever it is invoked on the same object more than once during
+    *     an execution of a Java application, the {@code hash32} method
+    *     must consistently return the same integer, provided no information
+    *     used in {@code equals} comparisons on the object is modified.
+    *     This integer need not remain consistent from one execution of an
+    *     application to another execution of the same application.
+    * 
    • If two objects are equal according to the {@code equals(Object)}
+    *     method, then calling the {@code hash32} method on each of
+    *     the two objects must produce the same integer result.
+    * 
    • It is not required that if two objects are unequal
+    *     according to the {@link java.lang.Object#equals(java.lang.Object)}
+    *     method, then calling the {@code hash32} method on each of the
+    *     two objects must produce distinct integer results.  However, the
+    *     programmer should be aware that producing distinct integer results
+    *     for unequal objects may improve the performance of hash tables.
+    * 
    
+    * 
    
+     * The hash value will never be zero.
+    *
+    * @return  a hash code value for this object.
+    * @see     java.lang.Object#equals(java.lang.Object)
+    */
+    public int hash32() {
+        int h = hash32;
+        if (0 == h) {
+           // harmless data race on hash32 here.
+           h = sun.misc.Hashing.murmur3_32(HASHING_SEED, value, 0, value.length);
+
+           // ensure result is not zero to avoid recalcing
+           h = (0 != h) ? h : 1;
+
+           hash32 = h;
+        }
+
+        return h;
+    }
+
 }
diff --git a/jdk/src/share/classes/java/lang/StringCoding.java b/jdk/src/share/classes/java/lang/StringCoding.java
index 95fb45ab659..2c08a0d0bb5 100644
--- a/jdk/src/share/classes/java/lang/StringCoding.java
+++ b/jdk/src/share/classes/java/lang/StringCoding.java
@@ -250,6 +250,7 @@ class StringCoding {
     static char[] decode(byte[] ba, int off, int len) {
         String csn = Charset.defaultCharset().name();
         try {
+            // use charset name decode() variant which provides caching.
             return decode(csn, ba, off, len);
         } catch (UnsupportedEncodingException x) {
             warnUnsupportedCharset(csn);
@@ -382,6 +383,7 @@ class StringCoding {
     static byte[] encode(char[] ca, int off, int len) {
         String csn = Charset.defaultCharset().name();
         try {
+            // use charset name encode() variant which provides caching.
             return encode(csn, ca, off, len);
         } catch (UnsupportedEncodingException x) {
             warnUnsupportedCharset(csn);
diff --git a/jdk/src/share/classes/java/security/Signature.java b/jdk/src/share/classes/java/security/Signature.java
index 72d2b0883c3..cf9e6d6cf0c 100644
--- a/jdk/src/share/classes/java/security/Signature.java
+++ b/jdk/src/share/classes/java/security/Signature.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -658,7 +658,7 @@ public abstract class Signature extends SignatureSpi {
         throws SignatureException {
         if (state == VERIFY) {
             if ((signature == null) || (offset < 0) || (length < 0) ||
-                (offset + length > signature.length)) {
+                (length > signature.length - offset)) {
                 throw new IllegalArgumentException("Bad arguments");
             }
 
diff --git a/jdk/src/share/classes/java/security/cert/CertPathBuilder.java b/jdk/src/share/classes/java/security/cert/CertPathBuilder.java
index 95988d4a3aa..096627d6188 100644
--- a/jdk/src/share/classes/java/security/cert/CertPathBuilder.java
+++ b/jdk/src/share/classes/java/security/cert/CertPathBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -45,15 +45,28 @@ import sun.security.jca.GetInstance.Instance;
  * one of the static getInstance methods, passing in the
  * algorithm name of the CertPathBuilder desired and optionally
  * the name of the provider desired.
- * 
    
- * Once a CertPathBuilder object has been created, certification
+ *
+ * 
    Once a CertPathBuilder object has been created, certification
  * paths can be constructed by calling the {@link #build build} method and
  * passing it an algorithm-specific set of parameters. If successful, the
  * result (including the CertPath that was built) is returned
  * in an object that implements the CertPathBuilderResult
  * interface.
  *
- * 
     Every implementation of the Java platform is required to support the
+ * 
    The {@link #getRevocationChecker} method allows an application to specify
+ * additional algorithm-specific parameters and options used by the
+ * {@code CertPathBuilder} when checking the revocation status of certificates.
+ * Here is an example demonstrating how it is used with the PKIX algorithm:
+ *
+ * 
    + * CertPathBuilder cpb = CertPathBuilder.getInstance("PKIX");
+ * PKIXRevocationChecker rc = (PKIXRevocationChecker)cpb.getRevocationChecker();
+ * rc.setOptions(EnumSet.of(Option.PREFER_CRLS));
+ * params.addCertPathChecker(rc);
+ * CertPathBuilderResult cpbr = cpb.build(params);
+ * 
    
+ *
+ * 
    Every implementation of the Java platform is required to support the
  * following standard CertPathBuilder algorithm:
  * 
      
  * 
    • PKIX
      • 
@@ -96,10 +109,9 @@ public class CertPathBuilder {
      *
    */ private static final String CPB_TYPE = "certpathbuilder.type"; - private static final Debug debug = Debug.getInstance("certpath"); - private CertPathBuilderSpi builderSpi; - private Provider provider; - private String algorithm; + private final CertPathBuilderSpi builderSpi; + private final Provider provider; + private final String algorithm; /** * Creates a CertPathBuilder object of the given algorithm, @@ -290,15 +302,30 @@ public class CertPathBuilder { * if no such property exists. */ public final static String getDefaultType() { - String cpbtype; - cpbtype = AccessController.doPrivileged(new PrivilegedAction() { - public String run() { - return Security.getProperty(CPB_TYPE); - } - }); - if (cpbtype == null) { - cpbtype = "PKIX"; - } - return cpbtype; + String cpbtype = + AccessController.doPrivileged(new PrivilegedAction() { + public String run() { + return Security.getProperty(CPB_TYPE); + } + }); + return (cpbtype == null) ? "PKIX" : cpbtype; + } + + /** + * Returns a {@code CertPathChecker} that the encapsulated + * {@code CertPathBuilderSpi} implementation uses to check the revocation + * status of certificates. A PKIX implementation returns objects of + * type {@code PKIXRevocationChecker}. + * + *

    The primary purpose of this method is to allow callers to specify + * additional input parameters and options specific to revocation checking. + * See the class description for an example. + * + * @throws UnsupportedOperationException if the service provider does not + * support this method + * @since 1.8 + */ + public final CertPathChecker getRevocationChecker() { + return builderSpi.engineGetRevocationChecker(); } } diff --git a/jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java b/jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java index 0c10a4d40da..49a35b36e90 100644 --- a/jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java +++ b/jdk/src/share/classes/java/security/cert/CertPathBuilderSpi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -72,4 +72,25 @@ public abstract class CertPathBuilderSpi { */ public abstract CertPathBuilderResult engineBuild(CertPathParameters params) throws CertPathBuilderException, InvalidAlgorithmParameterException; + + /** + * Returns a {@code CertPathChecker} that this implementation uses to + * check the revocation status of certificates. A PKIX implementation + * returns objects of type {@code PKIXRevocationChecker}. + * + *

    The primary purpose of this method is to allow callers to specify + * additional input parameters and options specific to revocation checking. + * See the class description of {@code CertPathBuilder} for an example. + * + *

    This method was added to version 1.8 of the Java Platform Standard + * Edition. In order to maintain backwards compatibility with existing + * service providers, this method cannot be abstract and by default throws + * an {@code UnsupportedOperationException}. + * + * @throws UnsupportedOperationException if this method is not supported + * @since 1.8 + */ + public CertPathChecker engineGetRevocationChecker() { + throw new UnsupportedOperationException(); + } } diff --git a/jdk/src/share/classes/java/security/cert/CertPathChecker.java b/jdk/src/share/classes/java/security/cert/CertPathChecker.java new file mode 100644 index 00000000000..c40a65b6354 --- /dev/null +++ b/jdk/src/share/classes/java/security/cert/CertPathChecker.java @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package java.security.cert; + +/** + *

    Performs one or more checks on each {@code Certificate} of a + * {@code CertPath}. + * + *

    A {@code CertPathChecker} implementation is typically created to extend + * a certification path validation algorithm. For example, an implementation + * may check for and process a critical private extension of each certificate + * in a certification path. + * + * @since 1.8 + */ +public interface CertPathChecker { + + /** + * Initializes the internal state of this {@code CertPathChecker}. + * + *

    The {@code forward} flag specifies the order that certificates will + * be passed to the {@link #check check} method (forward or reverse). + * + * @param forward the order that certificates are presented to the + * {@code check} method. If {@code true}, certificates are + * presented from target to trust anchor (forward); if + * {@code false}, from trust anchor to target (reverse). + * @throws CertPathValidatorException if this {@code CertPathChecker} is + * unable to check certificates in the specified order + */ + void init(boolean forward) throws CertPathValidatorException; + + /** + * Indicates if forward checking is supported. Forward checking refers + * to the ability of the {@code CertPathChecker} to perform its checks + * when certificates are presented to the {@code check} method in the + * forward direction (from target to trust anchor). + * + * @return {@code true} if forward checking is supported, {@code false} + * otherwise + */ + boolean isForwardCheckingSupported(); + + /** + * Performs the check(s) on the specified certificate using its internal + * state. The certificates are presented in the order specified by the + * {@code init} method. + * + * @param cert the {@code Certificate} to be checked + * @throws CertPathValidatorException if the specified certificate does + * not pass the check + */ + void check(Certificate cert) throws CertPathValidatorException; +} diff --git a/jdk/src/share/classes/java/security/cert/CertPathValidator.java b/jdk/src/share/classes/java/security/cert/CertPathValidator.java index ddeea9951a6..9d912acdabd 100644 --- a/jdk/src/share/classes/java/security/cert/CertPathValidator.java +++ b/jdk/src/share/classes/java/security/cert/CertPathValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -46,15 +46,29 @@ import sun.security.jca.GetInstance.Instance; * call one of the static getInstance methods, passing in the * algorithm name of the CertPathValidator desired and * optionally the name of the provider desired. - *

    - * Once a CertPathValidator object has been created, it can + * + *

    Once a CertPathValidator object has been created, it can * be used to validate certification paths by calling the {@link #validate * validate} method and passing it the CertPath to be validated * and an algorithm-specific set of parameters. If successful, the result is * returned in an object that implements the * CertPathValidatorResult interface. * - *

    Every implementation of the Java platform is required to support the + *

    The {@link #getRevocationChecker} method allows an application to specify + * additional algorithm-specific parameters and options used by the + * {@code CertPathValidator} when checking the revocation status of + * certificates. Here is an example demonstrating how it is used with the PKIX + * algorithm: + * + * 

    + * CertPathValidator cpv = CertPathValidator.getInstance("PKIX");
+ * PKIXRevocationChecker rc = (PKIXRevocationChecker)cpv.getRevocationChecker();
+ * rc.setOptions(EnumSet.of(Option.SOFT_FAIL));
+ * params.addCertPathChecker(rc);
+ * CertPathValidatorResult cpvr = cpv.validate(path, params);
+ *
    + * + *

    Every implementation of the Java platform is required to support the * following standard CertPathValidator algorithm: *

      *
    • PKIX
      • @@ -96,10 +110,9 @@ public class CertPathValidator { * */ private static final String CPV_TYPE = "certpathvalidator.type"; - private static final Debug debug = Debug.getInstance("certpath"); - private CertPathValidatorSpi validatorSpi; - private Provider provider; - private String algorithm; + private final CertPathValidatorSpi validatorSpi; + private final Provider provider; + private final String algorithm; /** * Creates a CertPathValidator object of the given algorithm, @@ -301,15 +314,30 @@ public class CertPathValidator { * if no such property exists. */ public final static String getDefaultType() { - String cpvtype; - cpvtype = AccessController.doPrivileged(new PrivilegedAction() { - public String run() { - return Security.getProperty(CPV_TYPE); - } - }); - if (cpvtype == null) { - cpvtype = "PKIX"; - } - return cpvtype; + String cpvtype = + AccessController.doPrivileged(new PrivilegedAction() { + public String run() { + return Security.getProperty(CPV_TYPE); + } + }); + return (cpvtype == null) ? "PKIX" : cpvtype; + } + + /** + * Returns a {@code CertPathChecker} that the encapsulated + * {@code CertPathValidatorSpi} implementation uses to check the revocation + * status of certificates. A PKIX implementation returns objects of + * type {@code PKIXRevocationChecker}. + * + *

      The primary purpose of this method is to allow callers to specify + * additional input parameters and options specific to revocation checking. + * See the class description for an example. + * + * @throws UnsupportedOperationException if the service provider does not + * support this method + * @since 1.8 + */ + public final CertPathChecker getRevocationChecker() { + return validatorSpi.engineGetRevocationChecker(); } } diff --git a/jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java b/jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java index 6dd4143ba04..6d3bd8c9968 100644 --- a/jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java +++ b/jdk/src/share/classes/java/security/cert/CertPathValidatorSpi.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -82,4 +82,25 @@ public abstract class CertPathValidatorSpi { public abstract CertPathValidatorResult engineValidate(CertPath certPath, CertPathParameters params) throws CertPathValidatorException, InvalidAlgorithmParameterException; + + /** + * Returns a {@code CertPathChecker} that this implementation uses to + * check the revocation status of certificates. A PKIX implementation + * returns objects of type {@code PKIXRevocationChecker}. + * + *

      The primary purpose of this method is to allow callers to specify + * additional input parameters and options specific to revocation checking. + * See the class description of {@code CertPathValidator} for an example. + * + *

      This method was added to version 1.8 of the Java Platform Standard + * Edition. In order to maintain backwards compatibility with existing + * service providers, this method cannot be abstract and by default throws + * an {@code UnsupportedOperationException}. + * + * @throws UnsupportedOperationException if this method is not supported + * @since 1.8 + */ + public CertPathChecker engineGetRevocationChecker() { + throw new UnsupportedOperationException(); + } } diff --git a/jdk/src/share/classes/java/security/cert/PKIXCertPathChecker.java b/jdk/src/share/classes/java/security/cert/PKIXCertPathChecker.java index 656a51706fd..30b44c37f74 100644 --- a/jdk/src/share/classes/java/security/cert/PKIXCertPathChecker.java +++ b/jdk/src/share/classes/java/security/cert/PKIXCertPathChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -87,7 +87,8 @@ import java.util.Set; * @author Yassir Elley * @author Sean Mullan */ -public abstract class PKIXCertPathChecker implements Cloneable { +public abstract class PKIXCertPathChecker + implements CertPathChecker, Cloneable { /** * Default constructor. @@ -111,6 +112,7 @@ public abstract class PKIXCertPathChecker implements Cloneable { * the specified order; it should never be thrown if the forward flag * is false since reverse checking must be supported */ + @Override public abstract void init(boolean forward) throws CertPathValidatorException; @@ -123,6 +125,7 @@ public abstract class PKIXCertPathChecker implements Cloneable { * @return true if forward checking is supported, * false otherwise */ + @Override public abstract boolean isForwardCheckingSupported(); /** @@ -162,6 +165,17 @@ public abstract class PKIXCertPathChecker implements Cloneable { Collection unresolvedCritExts) throws CertPathValidatorException; + /** + * {@inheritDoc} + * + *

      This implementation calls + * {@code check(cert, java.util.Collections.emptySet())}. + */ + @Override + public void check(Certificate cert) throws CertPathValidatorException { + check(cert, java.util.Collections.emptySet()); + } + /** * Returns a clone of this object. Calls the Object.clone() * method. @@ -170,6 +184,7 @@ public abstract class PKIXCertPathChecker implements Cloneable { * * @return a copy of this PKIXCertPathChecker */ + @Override public Object clone() { try { return super.clone(); diff --git a/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java b/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java new file mode 100644 index 00000000000..a97f834c372 --- /dev/null +++ b/jdk/src/share/classes/java/security/cert/PKIXRevocationChecker.java @@ -0,0 +1,271 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package java.security.cert; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +/** + * A {@code PKIXCertPathChecker} for checking the revocation status of + * certificates with the PKIX algorithm. + * + *

      A {@code PKIXRevocationChecker} checks the revocation status of + * certificates with the Online Certificate Status Protocol (OCSP) or + * Certificate Revocation Lists (CRLs). OCSP is described in RFC 2560 and + * is a network protocol for determining the status of a certificate. A CRL + * is a time-stamped list identifying revoked certificates, and RFC 5280 + * describes an algorithm for determining the revocation status of certificates + * using CRLs. + * + *

      Each {@code PKIXRevocationChecker} must be able to check the revocation + * status of certificates with OCSP and CRLs. By default, OCSP is the + * preferred mechanism for checking revocation status, with CRLs as the + * fallback mechanism. However, this preference can be switched to CRLs with + * the {@link Option.PREFER_CRLS} option. + * + *

      A {@code PKIXRevocationChecker} is obtained by calling the + * {@link CertPathValidator#getRevocationChecker getRevocationChecker} method + * of a PKIX {@code CertPathValidator}. Additional parameters and options + * specific to revocation can be set (by calling {@link #setOCSPResponder} + * method for instance). The {@code PKIXRevocationChecker} is added to + * a {@code PKIXParameters} object using the + * {@link PKIXParameters#addCertPathChecker addCertPathChecker} + * or {@link PKIXParameters#setCertPathCheckers setCertPathCheckers} method, + * and then the {@code PKIXParameters} is passed along with the {@code CertPath} + * to be validated to the {@link CertPathValidator#validate validate} method + * of a PKIX {@code CertPathValidator}. When supplying a revocation checker in + * this manner, do not enable the default revocation checking mechanism (by + * calling {@link PKIXParameters#setRevocationEnabled}. + * + *

      Note that when a {@code PKIXRevocationChecker} is added to + * {@code PKIXParameters}, it clones the {@code PKIXRevocationChecker}; + * thus any subsequent modifications to the {@code PKIXRevocationChecker} + * have no effect. + * + *

      Any parameter that is not set (or is set to {@code null}) will be set to + * the default value for that parameter. + * + *

      Concurrent Access + * + *

      Unless otherwise specified, the methods defined in this class are not + * thread-safe. Multiple threads that need to access a single object + * concurrently should synchronize amongst themselves and provide the + * necessary locking. Multiple threads each manipulating separate objects + * need not synchronize. + * + * @since 1.8 + */ +public abstract class PKIXRevocationChecker extends PKIXCertPathChecker { + private URI ocspResponder; + private X509Certificate ocspResponderCert; + private List ocspExtensions = Collections.emptyList(); + private Map ocspStapled = Collections.emptyMap(); + private Set