--- a/jdk/make/Bundles.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/Bundles.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -35,7 +35,7 @@
# JDK_BUNDLE_DIR and JRE_BUNDLE_DIR are defined in SPEC.
- MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/bundle
+ MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/data/bundle
# All these OPENJDK checks are needed since there is no coherency between
# these values in open and closed. Should probably be fixed.
--- a/jdk/make/CompileDemos.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/CompileDemos.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -29,9 +29,7 @@
include MakeBase.gmk
include JavaCompilation.gmk
include NativeCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
# Prepare the find cache.
$(eval $(call FillCacheFind, $(JDK_TOPDIR)/src))
--- a/jdk/make/CompileInterimRmic.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/CompileInterimRmic.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -28,7 +28,7 @@
include $(SPEC)
include MakeBase.gmk
include JavaCompilation.gmk
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
##########################################################################################
--- a/jdk/make/CopyIntoClasses.gmk Thu Aug 21 18:48:12 2014 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +0,0 @@
-#
-# Copyright (c) 2011, 2013, 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.
-#
-
-# Copy icu and _dict files used by the text break iterator
-
-COPY_PATTERNS := .icu _dict .dat _options .js aliasmap .spp .wav .css \
- .png .gif .xml .dtd .txt oqlhelp.html content-types.properties
-
-# These directories should not be copied at all
-EXCLUDES += \
- java/awt/doc-files \
- java/lang/doc-files \
- javax/swing/doc-files \
- javax/swing/text/doc-files \
- javax/swing/plaf/synth/doc-files \
- javax/swing/undo/doc-files \
- sun/awt/X11/doc-files \
- sun/util/cldr/resources \
- #
-
-# These files should never be included
-EXFILES += build.xml README.txt version.txt
-
-# These icons are handled in GensrcIcons.gmk
-EXFILES += \
- sun/awt/X11/java-icon16.png \
- sun/awt/X11/java-icon24.png \
- sun/awt/X11/java-icon32.png \
- sun/awt/X11/java-icon48.png \
- $(wildcard $(JDK_TOPDIR)/src/share/classes/sun/awt/resources/*.png) \
- #
-
-ifndef OPENJDK
- # Theses icons have closed replacements
- SWING_PLAF_MOTIF_RESOURCES_DIR := $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif
- EXFILES += \
- $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png \
- $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png \
- $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \
- $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png) \
- #
-
- EXFILES += mib_core.txt
-endif
-
-ifeq ($(ENABLE_JFR), true)
- JFR_CONFIGURATION_DIR_CLOSED := $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
- COPY_FILES += \
- $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
-endif
-
-SWING_BEANINFO_RESOURCES_SRC_DIR = $(JDK_TOPDIR)/make/data/swingbeaninfo/images
-SWING_BEANINFO_RESOURCES_SRC = $(wildcard $(SWING_BEANINFO_RESOURCES_SRC_DIR)/*.gif)
-OUT_BEANINFO_RESOURCES = $(patsubst $(SWING_BEANINFO_RESOURCES_SRC_DIR)%, \
- $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%, \
- $(SWING_BEANINFO_RESOURCES_SRC))
-
-COPY_EXTRA += $(OUT_BEANINFO_RESOURCES)
-
-# 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/data/swingbeaninfo/images/%.gif
- $(call install-file)
-
-##########################################################################################
-#
-# Copy the META-INF/services configuration files that are scattered around the source tree
-# into classes/META-INF/services. Be aware that META-INF directories that are located at a
-# source root (.../classes/META-INF) are automatically copied verbatim by the
-# SetupJavaCompilation macro.
-#
-# Any other META-INF/services configuration file is found here and platform specific comments
-# are uncommented and the configuration file is stored in the output META-INF directory.
-
-# Make sure the output directory is created.
-$(eval $(call MakeDir, $(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_targetapi := $(shell $(FIND) $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes -type d -a -name META-INF)
-# Platform specific overrides shared
-ifneq ($(ALL_META-INF_DIRS_targetapi), )
- ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_targetapi) \
- $(filter-out %$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes%,%,$(ALL_META-INF_DIRS_targetapi)), \
- $(ALL_META-INF_DIRS_share))
-else
- ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share)
-endif
-
-SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS)))
-
-# 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)/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)/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/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/*)
-OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \
- $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/%, %, \
- $(SRC_SERVICES_FILES_PRINT)))
-OUT_SERVICES_FILES_PRINT_COLON = $(addsuffix :, $(OUT_SERVICES_FILES_PRINT))
-RULES_SERVICES_PRINT = $(join $(OUT_SERVICES_FILES_PRINT_COLON), $(SRC_SERVICES_FILES_PRINT))
-
-# Now setup the dependency rules to generate a META-INF/services/... from the correct source.
-META-INF_RULES_SERVICES := $(RULES_SERVICES_PRINT) $(join $(OUT_SERVICES_FILES_COLON), $(SRC_SERVICES_FILES))
-# Eval the newly created rules to incorporate them into the make tree.
-define addto_meta-inf_services
- $1
- echo $(LOG_INFO) Installing META-INF/services/$$(@F)
- $(CAT) $$< | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $$@
-endef
-$(foreach i, $(META-INF_RULES_SERVICES), $(eval $(call addto_meta-inf_services, $i)))
-# Here is the generic rule, whose receipt the above rules will trigger.
-
-COPY_EXTRA += $(OUT_SERVICES_FILES)
-COPY_EXTRA += $(OUT_SERVICES_FILES_PRINT)
-
-################################################################################
-
-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 \
- javax.sound.sampled.spi.MixerProvider
-
-COPY_EXTRA += $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, $(JAVAX_SOUND_SRC_FILES))
-
-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)))
-
-################################################################################
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
- OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES = $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/datatransfer/resources/flavormap.properties
-else
- OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES = $(JDK_TOPDIR)/src/java.desktop/macosx/classes/sun/datatransfer/resources/flavormap.properties
-endif
-
-$(JDK_OUTPUTDIR)/classes/sun/datatransfer/resources/flavormap.properties: $(OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES)
- $(install-file)
-
-COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/sun/datatransfer/resources/flavormap.properties
-
-################################################################################
-
-CLEAN_FILES := $(wildcard \
- $(JDK_TOPDIR)/src/share/classes/com/sun/imageio/plugins/common/*.properties \
- $(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/*.properties \
- $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties \
- $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties \
- $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource/*.properties \
- $(JDK_TOPDIR)/src/share/classes/com/sun/rowset/*.properties \
- $(JDK_TOPDIR)/src/share/classes/com/sun/tools/script/shell/*.properties \
- $(JDK_TOPDIR)/src/share/classes/javax/sql/rowset/*.properties \
- $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources/*.properties \
- $(JDK_TOPDIR)/src/share/classes/sun/rmi/rmic/resources/*.properties \
- $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources/*.properties \
- $(JDK_TOPDIR)/src/share/classes/sun/tools/javac/resources/*.properties \
- $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources/*.properties \
- $(JDK_TOPDIR)/src/share/classes/sun/tools/serialver/resources/*.properties \
- )
-
-# Copy zh_HK files from zh_TW
-
-$(JDK_OUTPUTDIR)/classes/%_zh_HK.properties: $(JDK_OUTPUTDIR)/classes/%_zh_TW.properties
- $(install-file)
-
-COPY_EXTRA += $(patsubst $(JDK_TOPDIR)/src/share/classes/%, $(JDK_OUTPUTDIR)/classes/%, \
- $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $(CLEAN_FILES))))
--- a/jdk/make/CreateJars.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/CreateJars.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -524,7 +524,6 @@
EXCLUDES := $(TOOLS_JAR_EXCLUDES), \
EXTRA_FILES := \
$(JDK_OUTPUTDIR)/modules/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector \
- $(JDK_OUTPUTDIR)/classes/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 \
--- a/jdk/make/CreateSecurityJars.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/CreateSecurityJars.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -32,8 +32,6 @@
# The jars created in this file are required for the exploded jdk image to function and
# cannot wait to be built in the images target.
-SECURITY_CLASSES_SUBDIR := modules
-
##########################################################################################
# Create manifest for security jars
#
@@ -67,7 +65,7 @@
SUNPKCS11_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/jce/unsigned/sunpkcs11.jar
$(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.pkcs11, \
+ SRCS := $(JDK_OUTPUTDIR)/modules/jdk.crypto.pkcs11, \
SUFFIXES := .class, \
INCLUDES := sun/security/pkcs11, \
JAR := $(SUNPKCS11_JAR_UNSIGNED), \
@@ -94,7 +92,7 @@
SUNEC_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/jce/unsigned/sunec.jar
$(eval $(call SetupArchive,BUILD_SUNEC_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.ec, \
+ SRCS := $(JDK_OUTPUTDIR)/modules/jdk.crypto.ec, \
SUFFIXES := .class, \
INCLUDES := sun/security/ec, \
JAR := $(SUNEC_JAR_UNSIGNED), \
@@ -122,7 +120,7 @@
ifneq ($(BUILD_CRYPTO), no)
$(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/java.base, \
+ SRCS := $(JDK_OUTPUTDIR)/modules/java.base, \
SUFFIXES := .class, \
INCLUDES := com/sun/crypto/provider, \
JAR := $(SUNJCE_PROVIDER_JAR_UNSIGNED), \
@@ -153,7 +151,7 @@
ifneq ($(BUILD_CRYPTO), no)
$(eval $(call SetupArchive,BUILD_JCE_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/java.base, \
+ SRCS := $(JDK_OUTPUTDIR)/modules/java.base, \
SUFFIXES := .class, \
INCLUDES := javax/crypto sun/security/internal, \
JAR := $(JCE_JAR_UNSIGNED), \
@@ -185,7 +183,7 @@
SUNMSCAPI_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/jce/unsigned/sunmscapi.jar
$(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.mscapi, \
+ SRCS := $(JDK_OUTPUTDIR)/modules/jdk.crypto.mscapi, \
SUFFIXES := .class, \
INCLUDES := sun/security/mscapi, \
JAR := $(SUNMSCAPI_JAR_UNSIGNED), \
@@ -218,7 +216,7 @@
UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
$(eval $(call SetupArchive,BUILD_UCRYPTO_JAR, , \
- SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.ucrypto, \
+ SRCS := $(JDK_OUTPUTDIR)/modules/jdk.crypto.ucrypto, \
SUFFIXES := .class, \
INCLUDES := com/oracle/security/ucrypto, \
JAR := $(UCRYPTO_JAR_UNSIGNED), \
--- a/jdk/make/Tools.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/Tools.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -32,10 +32,7 @@
include MakeBase.gmk
include JavaCompilation.gmk
include NativeCompilation.gmk
-include SetupJava.gmk
-
-# Cache all finds needed for this file.
-$(eval $(call FillCacheFind, $(JDK_TOPDIR)/make/src/classes))
+include SetupJavaCompilers.gmk
# The exception handling of swing beaninfo which have the own tool directory
ifeq (, $(BUILD_TOOLS_JDK))
--- a/jdk/make/bundle/JDK-Info.plist Thu Aug 21 18:48:12 2014 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>libjli.dylib</string>
- <key>CFBundleGetInfoString</key>
- <string>@@INFO@@</string>
- <key>CFBundleIdentifier</key>
- <string>@@ID@@</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>7.0</string>
- <key>CFBundleName</key>
- <string>@@NAME@@</string>
- <key>CFBundlePackageType</key>
- <string>BNDL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>@@VERSION@@</string>
- <key>JavaVM</key>
- <dict>
- <key>JVMCapabilities</key>
- <array>
- <string>CommandLine</string>
- </array>
- <key>JVMMinimumFrameworkVersion</key>
- <string>13.2.9</string>
- <key>JVMMinimumSystemVersion</key>
- <string>10.6.0</string>
- <key>JVMPlatformVersion</key>
- <string>@@PLATFORM_VERSION@@</string>
- <key>JVMVendor</key>
- <string>@@VENDOR@@</string>
- <key>JVMVersion</key>
- <string>@@VERSION@@</string>
- </dict>
-</dict>
-</plist>
--- a/jdk/make/bundle/JRE-Info.plist Thu Aug 21 18:48:12 2014 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>libjli.dylib</string>
- <key>CFBundleGetInfoString</key>
- <string>@@INFO@@</string>
- <key>CFBundleIdentifier</key>
- <string>@@ID@@</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>7.0</string>
- <key>CFBundleName</key>
- <string>@@NAME@@</string>
- <key>CFBundlePackageType</key>
- <string>BNDL</string>
- <key>CFBundleShortVersionString</key>
- <string>1.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>@@VERSION@@</string>
- <key>JavaVM</key>
- <dict>
- <key>JVMMinimumFrameworkVersion</key>
- <string>13.2.9</string>
- <key>JVMMinimumSystemVersion</key>
- <string>10.6.0</string>
- <key>JVMPlatformVersion</key>
- <string>@@PLATFORM_VERSION@@</string>
- <key>JVMVendor</key>
- <string>@@VENDOR@@</string>
- <key>JVMVersion</key>
- <string>@@VERSION@@</string>
- </dict>
-</dict>
-</plist>
--- a/jdk/make/copy/Copy-java.base.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/copy/Copy-java.base.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -32,17 +32,17 @@
# Copy exported header files to outputdir.
#
JAVA_BASE_HEADERS := \
- $(INCLUDEDIR)/jni.h \
- $(INCLUDEDIR)/jvmti.h \
- $(INCLUDEDIR)/jvmticmlr.h \
- $(INCLUDEDIR)/classfile_constants.h \
- $(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \
+ $(INCLUDE_DST_DIR)/jni.h \
+ $(INCLUDE_DST_DIR)/jvmti.h \
+ $(INCLUDE_DST_DIR)/jvmticmlr.h \
+ $(INCLUDE_DST_DIR)/classfile_constants.h \
+ $(INCLUDE_DST_OS_DIR)/jni_md.h \
#
-$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/java.base/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/java.base/share/native/include/%.h
$(call install-file)
-$(OPENJDK_TARGET_OS_INCLUDE)/%.h: \
+$(INCLUDE_DST_OS_DIR)/%.h: \
$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
$(call install-file)
@@ -50,17 +50,17 @@
CALENDARS_SRC := $(JDK_TOPDIR)/src/java.base/share/conf
-$(LIBDIR)/calendars.properties: $(CALENDARS_SRC)/calendars.properties
+$(LIB_DST_DIR)/calendars.properties: $(CALENDARS_SRC)/calendars.properties
$(call install-file)
-BASE_CONF_FILES += $(LIBDIR)/calendars.properties
+BASE_CONF_FILES += $(LIB_DST_DIR)/calendars.properties
-$(LIBDIR)/hijrah-config-umalqura.properties: $(CALENDARS_SRC)/hijrah-config-umalqura.properties
+$(LIB_DST_DIR)/hijrah-config-umalqura.properties: $(CALENDARS_SRC)/hijrah-config-umalqura.properties
$(MKDIR) -p $(@D)
$(RM) $@
$(CP) $< $@
-BASE_CONF_FILES += $(LIBDIR)/hijrah-config-umalqura.properties
+BASE_CONF_FILES += $(LIB_DST_DIR)/hijrah-config-umalqura.properties
################################################################################
@@ -68,10 +68,10 @@
TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf
- $(LIBDIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings
+ $(LIB_DST_DIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings
$(call install-file)
- BASE_CONF_FILES += $(LIBDIR)/tzmappings
+ BASE_CONF_FILES += $(LIB_DST_DIR)/tzmappings
endif
--- a/jdk/make/copy/Copy-java.desktop.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/copy/Copy-java.desktop.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -30,20 +30,20 @@
################################################################################
JAVA_DESKTOP_HEADERS := \
- $(INCLUDEDIR)/jawt.h \
- $(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h \
+ $(INCLUDE_DST_DIR)/jawt.h \
+ $(INCLUDE_DST_OS_DIR)/jawt_md.h \
#
-$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/java.desktop/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/java.desktop/share/native/include/%.h
$(call install-file)
-$(OPENJDK_TARGET_OS_INCLUDE)/%.h: \
+$(INCLUDE_DST_OS_DIR)/%.h: \
$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
$(call install-file)
################################################################################
-ICCPROFILE_DEST_DIR := $(LIBDIR)/cmm
+ICCPROFILE_DEST_DIR := $(LIB_DST_DIR)/cmm
ifdef OPENJDK
ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/java.desktop/share/conf/cmm/lcms
@@ -102,20 +102,20 @@
################################################################################
#
-# Copy property files from sun/print to LIBDIR
+# Copy property files from sun/print to LIB_DST_DIR
#
PSFONTPROPFILE_SRC_DIR := $(JDK_TOPDIR)/src/java.desktop/share/conf
PSFONTPROPFILE_SRCS := $(wildcard $(PSFONTPROPFILE_SRC_DIR)/psfont*.properties*)
-PSFONTPROPFILE_TARGET_FILES := $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIBDIR),$(PSFONTPROPFILE_SRCS))
+PSFONTPROPFILE_TARGET_FILES := $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIB_DST_DIR),$(PSFONTPROPFILE_SRCS))
-$(LIBDIR)/%: $(PSFONTPROPFILE_SRC_DIR)/%
+$(LIB_DST_DIR)/%: $(PSFONTPROPFILE_SRC_DIR)/%
$(call install-file)
DESKTOP_CONF_FILES += $(PSFONTPROPFILE_TARGET_FILES)
################################################################################
#
-# Copy cursor.properties and cursors gif files to LIBDIR
+# Copy cursor.properties and cursors gif files to LIB_DST_DIR
#
ifneq ($(OPENJDK_TARGET_OS), macosx)
OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf
@@ -123,7 +123,7 @@
OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/conf
endif
-CURSORS_DEST_DIR := $(LIBDIR)/images/cursors
+CURSORS_DEST_DIR := $(LIB_DST_DIR)/images/cursors
CURSORS_OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf/images/cursors
$(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_OPENJDK_TARGET_OS_LIB_SRC)/cursors.properties
--- a/jdk/make/copy/Copy-java.logging.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/copy/Copy-java.logging.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -29,10 +29,10 @@
LOGGING_LIB_SRC := $(JDK_TOPDIR)/src/java.logging/share/conf
-$(LIBDIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties
+$(LIB_DST_DIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties
$(call install-file)
-LOGGING_CONF_FILES := $(LIBDIR)/logging.properties
+LOGGING_CONF_FILES := $(LIB_DST_DIR)/logging.properties
################################################################################
--- a/jdk/make/copy/Copy-java.management.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/copy/Copy-java.management.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -27,7 +27,7 @@
################################################################################
-MGMT_LIBDIR := $(LIBDIR)/management
+MGMT_LIBDIR := $(LIB_DST_DIR)/management
MGMT_LIB_SRC := $(JDK_TOPDIR)/src/java.management/share/conf
MGMT_SRC_FILES := $(wildcard $(MGMT_LIB_SRC)/*)
MGMT_TARGET_FILES := $(subst $(MGMT_LIB_SRC),$(MGMT_LIBDIR),$(MGMT_SRC_FILES))
--- a/jdk/make/copy/Copy-jdk.hprof.agent.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/copy/Copy-jdk.hprof.agent.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -29,10 +29,10 @@
HPROF_SRC := $(JDK_TOPDIR)/src/demo/share/jvmti/hprof/jvm.hprof.txt
-$(LIBDIR)/jvm.hprof.txt: $(HPROF_SRC)
+$(LIB_DST_DIR)/jvm.hprof.txt: $(HPROF_SRC)
$(call install-file)
-HPROF_CONF_FILES := $(LIBDIR)/jvm.hprof.txt
+HPROF_CONF_FILES := $(LIB_DST_DIR)/jvm.hprof.txt
################################################################################
--- a/jdk/make/copy/Copy-jdk.jdwp.agent.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/copy/Copy-jdk.jdwp.agent.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -28,9 +28,9 @@
################################################################################
-JDK_DEBUG_AGENT_HEADERS := $(INCLUDEDIR)/jdwpTransport.h
+JDK_DEBUG_AGENT_HEADERS := $(INCLUDE_DST_DIR)/jdwpTransport.h
-$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include/%.h
$(call install-file)
################################################################################
--- a/jdk/make/copy/CopyCommon.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/copy/CopyCommon.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -28,13 +28,13 @@
include $(SPEC)
include MakeBase.gmk
-INCLUDEDIR = $(JDK_OUTPUTDIR)/include
-LIBDIR := $(JDK_OUTPUTDIR)/lib
+INCLUDE_DST_DIR := $(JDK_OUTPUTDIR)/include
+LIB_DST_DIR := $(JDK_OUTPUTDIR)/lib
-OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS)
+INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/$(OPENJDK_TARGET_OS)
ifeq ($(OPENJDK_TARGET_OS), windows)
- OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32
+ INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/win32
else ifeq ($(OPENJDK_TARGET_OS), macosx)
- OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin
+ INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/darwin
endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/data/bundle/JDK-Info.plist Fri Aug 22 10:33:05 2014 -0700
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>libjli.dylib</string>
+ <key>CFBundleGetInfoString</key>
+ <string>@@INFO@@</string>
+ <key>CFBundleIdentifier</key>
+ <string>@@ID@@</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>7.0</string>
+ <key>CFBundleName</key>
+ <string>@@NAME@@</string>
+ <key>CFBundlePackageType</key>
+ <string>BNDL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>@@VERSION@@</string>
+ <key>JavaVM</key>
+ <dict>
+ <key>JVMCapabilities</key>
+ <array>
+ <string>CommandLine</string>
+ </array>
+ <key>JVMMinimumFrameworkVersion</key>
+ <string>13.2.9</string>
+ <key>JVMMinimumSystemVersion</key>
+ <string>10.6.0</string>
+ <key>JVMPlatformVersion</key>
+ <string>@@PLATFORM_VERSION@@</string>
+ <key>JVMVendor</key>
+ <string>@@VENDOR@@</string>
+ <key>JVMVersion</key>
+ <string>@@VERSION@@</string>
+ </dict>
+</dict>
+</plist>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/data/bundle/JRE-Info.plist Fri Aug 22 10:33:05 2014 -0700
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>libjli.dylib</string>
+ <key>CFBundleGetInfoString</key>
+ <string>@@INFO@@</string>
+ <key>CFBundleIdentifier</key>
+ <string>@@ID@@</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>7.0</string>
+ <key>CFBundleName</key>
+ <string>@@NAME@@</string>
+ <key>CFBundlePackageType</key>
+ <string>BNDL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>@@VERSION@@</string>
+ <key>JavaVM</key>
+ <dict>
+ <key>JVMMinimumFrameworkVersion</key>
+ <string>13.2.9</string>
+ <key>JVMMinimumSystemVersion</key>
+ <string>10.6.0</string>
+ <key>JVMPlatformVersion</key>
+ <string>@@PLATFORM_VERSION@@</string>
+ <key>JVMVendor</key>
+ <string>@@VENDOR@@</string>
+ <key>JVMVersion</key>
+ <string>@@VERSION@@</string>
+ </dict>
+</dict>
+</plist>
--- a/jdk/make/gendata/Gendata-java.base.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/gendata/Gendata-java.base.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -64,15 +64,15 @@
GENDATA_JAVA_SECURITY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security
GENDATA_JAVA_SECURITY := $(JDK_OUTPUTDIR)/lib/security/java.security
-
+
# RESTRICTED_PKGS_SRC is optionally set in custom extension for this makefile
-
+
$(GENDATA_JAVA_SECURITY): $(BUILD_TOOLS) $(GENDATA_JAVA_SECURITY_SRC) $(RESTRICTED_PKGS_SRC)
$(ECHO) "Generating java.security"
$(MKDIR) -p $(@D)
$(TOOL_MAKEJAVASECURITY) $(GENDATA_JAVA_SECURITY_SRC) $@ $(OPENJDK_TARGET_OS) \
$(RESTRICTED_PKGS_SRC) || exit 1
-
+
GENDATA += $(GENDATA_JAVA_SECURITY)
##########################################################################################
--- a/jdk/make/gendata/GendataCommon.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/gendata/GendataCommon.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -28,9 +28,7 @@
include $(SPEC)
include MakeBase.gmk
include JavaCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
# We need the tools.
include Tools.gmk
--- a/jdk/make/gensrc/GensrcCommon.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/gensrc/GensrcCommon.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -30,9 +30,7 @@
include JavaCompilation.gmk
include NativeCompilation.gmk
include TextFileProcessing.gmk
-
-# Setup the java compilers for the JDK build.
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
# We need the tools.
include Tools.gmk
--- a/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -28,7 +28,8 @@
# into LocaleDataMetaInfo.java
# First go look for all locale files
-LOCALE_FILES := $(shell $(FIND) $(JDK_TOPDIR)/src/*/share/classes \
+LOCALE_FILES := $(shell $(FIND) $(JDK_TOPDIR)/src/java.base/share/classes \
+ $(JDK_TOPDIR)/src/jdk.localedata/share/classes \
-name "FormatData_*.java" -o -name "FormatData_*.properties" -o \
-name "CollationData_*.java" -o -name "CollationData_*.properties" -o \
-name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \
--- a/jdk/make/gensrc/GensrcProperties.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/gensrc/GensrcProperties.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -23,9 +23,6 @@
# questions.
#
-# Prepare the find cache.
-$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/*/*/classes)))
-
# All .properties files to be compiled are appended to this variable.
ALL_COMPILED_PROPSOURCES :=
# All generated .java files from compilation are appended to this variable.
@@ -76,7 +73,6 @@
$(JDK_TOPDIR)/src/java.management/share/classes/sun/management/resources \
$(JDK_TOPDIR)/src/java.desktop/share/classes/sun/print/resources \
$(JDK_TOPDIR)/src/jdk.dev/share/classes/sun/tools/jar/resources \
- $(JDK_TOPDIR)/src/jdk.dev/share/classes/jdk/jigsaw/tools/jlink/resources \
$(JDK_TOPDIR)/src/java.logging/share/classes/sun/util/logging/resources)) \
#
--- a/jdk/make/gensrc/GensrcSwing.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/gensrc/GensrcSwing.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -78,11 +78,8 @@
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/java.desktop/javax/swing
$(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) \
-sourcepath "$(subst $(SPACE),$(PATH_SEP),\
- $(if $(SHUFFLED),$(wildcard $(JDK_TOPDIR)/src/*/*/classes) \
- $(JDK_OUTPUTDIR)/gensrc/java.base, \
- $(JDK_TOPDIR)/src/share/classes \
- $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
- $(JDK_OUTPUTDIR)/gensrc))" \
+ $(wildcard $(JDK_TOPDIR)/src/*/*/classes) \
+ $(JDK_OUTPUTDIR)/gensrc/java.base)" \
-doclet build.tools.swingbeaninfo.GenDocletBeanInfo \
-x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/java.desktop/javax/swing \
-t $(DOCLET_DATA_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \
--- a/jdk/make/lib/Awt2dLibraries.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/lib/Awt2dLibraries.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -23,12 +23,9 @@
# questions.
#
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries.gmk))
-
WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
-##########################################################################################
+################################################################################
BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib
@@ -76,7 +73,7 @@
DESKTOP_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
-##########################################################################################
+################################################################################
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
@@ -144,7 +141,7 @@
endif
-##########################################################################################
+################################################################################
LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \
@@ -296,7 +293,7 @@
DESKTOP_LIBRARIES += $(BUILD_LIBAWT)
-##########################################################################################
+################################################################################
ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
ifndef BUILD_HEADLESS_ONLY
@@ -388,7 +385,7 @@
endif
endif
-##########################################################################################
+################################################################################
LIBLCMS_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/liblcms
LIBLCMS_CPPFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
@@ -441,7 +438,7 @@
$(BUILD_LIBLCMS): $(BUILD_LIBAWT)
-##########################################################################################
+################################################################################
ifdef OPENJDK
BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
@@ -515,7 +512,7 @@
DESKTOP_LIBRARIES += $(BUILD_LIBJAVAJPEG)
-##########################################################################################
+################################################################################
LIBFONTMANAGER_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \
$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libfontmanager
@@ -607,54 +604,7 @@
DESKTOP_LIBRARIES += $(BUILD_LIBFONTMANAGER)
-##########################################################################################
-
-ifndef OPENJDK
-
- LIBT2K_SRC := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k
- LIBT2K_CFLAGS := $(addprefix -I, $(LIBT2K_SRC)) \
- -I$(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k/t2k \
- -I$(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \
- -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
- -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
- -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
- -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
- -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
- -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
- #
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \
- LIBRARY := t2k, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBT2K_SRC), \
- EXCLUDE_FILES := t2k/orion.c, \
- LANG := C++, \
- OPTIMIZATION := HIGH, \
- CFLAGS := $(CFLAGS_JDKLIB) $(LIBT2K_CFLAGS), \
- CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBT2K_CFLAGS), \
- CFLAGS_windows = -DCC_NOEX, \
- CXXFLAGS_windows = -DCC_NOEX, \
- MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libt2k/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
- LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \
- LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \
- VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=t2k.dll" \
- -D "JDK_INTERNAL_NAME=t2k" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libt2k, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- # t2k is linked against fontmanager
- $(BUILD_LIBT2K): $(BUILD_LIBFONTMANAGER)
-
- DESKTOP_LIBRARIES += $(BUILD_LIBT2K)
-endif
-
-##########################################################################################
+################################################################################
ifeq ($(OPENJDK_TARGET_OS), windows)
LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
@@ -768,99 +718,7 @@
DESKTOP_LIBRARIES += $(BUILD_LIBJAWT)
-##########################################################################################
-
-ifndef OPENJDK
-
- LIBKCMS_SRC := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libkcms \
- $(JDK_TOPDIR)/src/closed/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libkcms \
- #
- LIBKCMS_CFLAGS += $(addprefix -I, $(LIBKCMS_SRC)) \
- -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
- -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
- -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
- #
- LIBKCMS_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/java.desktop/windows/native/libkcms/cmm.rc
-
- LIBKCMS_CFLAGS += $(CFLAGS_JDKLIB)
-
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- # This particular library uses a feature called PIC_CODE_SMALL (on solaris)
- # implement it like this...since it's only used here
- LIBKCMS_CFLAGS := $(patsubst -KPIC, -Kpic, $(LIBKCMS_CFLAGS))
- else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
- LIBKCMS_CFLAGS := $(patsubst -fPIC, -fpic, $(LIBKCMS_CFLAGS))
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \
- LIBRARY := kcms, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBKCMS_SRC), \
- LANG := C, \
- EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \
- OPTIMIZATION := LOW, \
- CFLAGS := $(LIBKCMS_CFLAGS) \
- -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \
- CFLAGS_linux := -Wno-missing-field-initializers, \
- MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libkcms/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_linux := -lc -lpthread, \
- LDFLAGS_SUFFIX_solaris := -lc, \
- LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
- LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \
- VERSIONINFO_RESOURCE := $(LIBKCMS_VERSIONINFO_RESOURCE), \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=kcms.dll" \
- -D "JDK_INTERNAL_NAME=kcms" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBKCMS): $(BUILD_LIBJAVA)
-
- DESKTOP_LIBRARIES += $(BUILD_LIBKCMS)
-
-endif
-
-##########################################################################################
-
-ifndef OPENJDK
- ifeq ($(OPENJDK_TARGET_OS), solaris)
- ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-
- ifeq ($(shell if test "$(OS_VERSION_MAJOR)" -eq 5 -a "$(OS_VERSION_MINOR)" -le 10; then $(ECHO) ok; fi), ok)
-
- SUNWJDGA_MAPFILE :=
- ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
- SUNWJDGA_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdga/mapfile-vers
- endif
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \
- LIBRARY := sunwjdga, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/java.desktop/unix/native/libsunwjdga, \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- -I$(JDK_TOPDIR)/src/share/javavm/export \
- -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
- $(X_CFLAGS), \
- MAPFILE := $(SUNWJDGA_MAPFILE), \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(X_LIBS) -ldga -lX11 $(LIBDL) -lc, \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- DESKTOP_LIBRARIES += $(BUILD_LIBSUNWJDGA)
-
- endif
- endif
- endif
-endif
-
-##########################################################################################
+################################################################################
ifeq ($(BUILD_HEADLESS), true)
# Mac and Windows only use the native AWT lib, do not build libawt_headless
@@ -932,7 +790,7 @@
endif
endif
-##########################################################################################
+################################################################################
ifndef BUILD_HEADLESS_ONLY
@@ -1041,47 +899,7 @@
endif
-##########################################################################################
-
-ifndef OPENJDK
-
- LIBDCPR_SRC_DIRS := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libdcpr
- LIBDCPR_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBDCPR_SRC_DIRS) -type d)) \
- -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
- -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
- -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
- -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
- #
-
- $(eval $(call SetupNativeCompilation,BUILD_LIBDCPR, \
- LIBRARY := dcpr, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(LIBDCPR_SRC_DIRS), \
- LANG := C, \
- OPTIMIZATION := LOW, \
- CFLAGS := $(CFLAGS_JDKLIB) \
- $(LIBDCPR_CFLAGS), \
- MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdcpr/mapfile-vers, \
- LDFLAGS := $(LDFLAGS_JDKLIB) \
- $(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX := $(LIBM) $(LDFLAGS_JDKLIB_SUFFIX), \
- LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB), \
- LDFLAGS_SUFFIX_posix := -lm, \
- VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
- RC_FLAGS := $(RC_FLAGS) \
- -D "JDK_FNAME=dcpr.dll" \
- -D "JDK_INTERNAL_NAME=dcpr" \
- -D "JDK_FTYPE=0x2L", \
- OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdcpr, \
- DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
- $(BUILD_LIBDCPR): $(BUILD_LIBJAVA)
-
- DESKTOP_LIBRARIES += $(BUILD_LIBDCPR)
-
-endif
-
-##########################################################################################
+################################################################################
ifeq ($(OPENJDK_TARGET_OS), macosx)
@@ -1158,7 +976,7 @@
endif
-##########################################################################################
+################################################################################
ifeq ($(OPENJDK_TARGET_OS), macosx)
@@ -1199,3 +1017,8 @@
#$(BUILD_LIBOSXUI): $(BUILD_LIBJAVA)
endif
+
+################################################################################
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries.gmk))
--- a/jdk/make/lib/CoreLibraries.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/lib/CoreLibraries.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -26,6 +26,8 @@
WIN_VERIFY_LIB := $(JDK_OUTPUTDIR)/objs/libverify/verify.lib
##########################################################################################
+# libfdlibm is statically linked with libjava below and not delivered into the
+# product on its own.
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
--- a/jdk/make/lib/Lib-java.base.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/lib/Lib-java.base.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -25,6 +25,10 @@
include LibCommon.gmk
+# Prepare the find cache.
+$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/java.base/*/native \
+ $(JDK_TOPDIR)/src/*/java.base/*/native)))
+
include CoreLibraries.gmk
include NetworkingLibraries.gmk
include NioLibraries.gmk
--- a/jdk/make/lib/Lib-java.desktop.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/lib/Lib-java.desktop.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -25,6 +25,10 @@
include LibCommon.gmk
+# Prepare the find cache.
+$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/java.desktop/*/native \
+ $(JDK_TOPDIR)/src/*/java.desktop/*/native)))
+
include PlatformLibraries.gmk
include Awt2dLibraries.gmk
include SoundLibraries.gmk
--- a/jdk/make/lib/LibCommon.gmk Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/lib/LibCommon.gmk Fri Aug 22 10:33:05 2014 -0700
@@ -29,9 +29,6 @@
include MakeBase.gmk
include NativeCompilation.gmk
-# Prepare the find cache.
-$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/*/*/native)))
-
# Build tools
include Tools.gmk
--- a/jdk/make/mapfiles/libjava/mapfile-vers Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/mapfiles/libjava/mapfile-vers Fri Aug 22 10:33:05 2014 -0700
@@ -78,13 +78,13 @@
Java_java_io_FileInputStream_available;
Java_java_io_FileInputStream_close0;
Java_java_io_FileInputStream_initIDs;
- Java_java_io_FileInputStream_open;
+ Java_java_io_FileInputStream_open0;
Java_java_io_FileInputStream_read0;
Java_java_io_FileInputStream_readBytes;
Java_java_io_FileInputStream_skip;
Java_java_io_FileOutputStream_close0;
Java_java_io_FileOutputStream_initIDs;
- Java_java_io_FileOutputStream_open;
+ Java_java_io_FileOutputStream_open0;
Java_java_io_FileOutputStream_write;
Java_java_io_FileOutputStream_writeBytes;
Java_java_io_ObjectInputStream_bytesToDoubles;
@@ -97,7 +97,7 @@
Java_java_io_RandomAccessFile_getFilePointer;
Java_java_io_RandomAccessFile_initIDs;
Java_java_io_RandomAccessFile_length;
- Java_java_io_RandomAccessFile_open;
+ Java_java_io_RandomAccessFile_open0;
Java_java_io_RandomAccessFile_read0;
Java_java_io_RandomAccessFile_readBytes;
Java_java_io_RandomAccessFile_seek0;
--- a/jdk/make/mapfiles/libjava/reorder-sparc Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/mapfiles/libjava/reorder-sparc Fri Aug 22 10:33:05 2014 -0700
@@ -44,7 +44,7 @@
text: .text%Java_java_io_UnixFileSystem_canonicalize;
text: .text%JNU_GetStringPlatformChars;
text: .text%JNU_ReleaseStringPlatformChars;
-text: .text%Java_java_io_FileInputStream_open;
+text: .text%Java_java_io_FileInputStream_open0;
text: .text%fileOpen;
text: .text%Java_java_io_FileInputStream_readBytes;
text: .text%readBytes;
--- a/jdk/make/mapfiles/libjava/reorder-sparcv9 Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/mapfiles/libjava/reorder-sparcv9 Fri Aug 22 10:33:05 2014 -0700
@@ -47,7 +47,7 @@
text: .text%Java_java_io_UnixFileSystem_canonicalize;
text: .text%JNU_GetStringPlatformChars;
text: .text%JNU_ReleaseStringPlatformChars;
-text: .text%Java_java_io_FileInputStream_open;
+text: .text%Java_java_io_FileInputStream_open0;
text: .text%fileOpen;
text: .text%Java_java_io_FileInputStream_readBytes;
text: .text%readBytes;
--- a/jdk/make/mapfiles/libjava/reorder-x86 Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/make/mapfiles/libjava/reorder-x86 Fri Aug 22 10:33:05 2014 -0700
@@ -57,7 +57,7 @@
text: .text%Java_java_lang_ClassLoader_00024NativeLibrary_find;
text: .text%Java_java_lang_Float_floatToIntBits;
text: .text%Java_java_lang_Double_doubleToLongBits;
-text: .text%Java_java_io_FileInputStream_open;
+text: .text%Java_java_io_FileInputStream_open0;
text: .text%fileOpen;
text: .text%Java_java_io_UnixFileSystem_getLength;
text: .text%Java_java_io_FileInputStream_readBytes;
@@ -90,7 +90,7 @@
text: .text%JNU_CallMethodByName;
text: .text%JNU_CallMethodByNameV;
text: .text%Java_java_util_logging_FileHandler_lockFile;
-text: .text%Java_java_io_FileOutputStream_open;
+text: .text%Java_java_io_FileOutputStream_open0;
text: .text%Java_java_io_UnixFileSystem_createDirectory;
text: .text%Java_java_io_UnixFileSystem_getLastModifiedTime;
text: .text%Java_java_util_prefs_FileSystemPreferences_lockFile0;
--- a/jdk/src/java.base/share/classes/java/io/FileInputStream.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/src/java.base/share/classes/java/io/FileInputStream.java Fri Aug 22 10:33:05 2014 -0700
@@ -184,7 +184,16 @@
* Opens the specified file for reading.
* @param name the name of the file
*/
- private native void open(String name) throws FileNotFoundException;
+ private native void open0(String name) throws FileNotFoundException;
+
+ // wrap native call to allow instrumentation
+ /**
+ * Opens the specified file for reading.
+ * @param name the name of the file
+ */
+ private void open(String name) throws FileNotFoundException {
+ open0(name);
+ }
/**
* Reads a byte of data from this input stream. This method blocks
--- a/jdk/src/java.base/share/classes/java/io/FileOutputStream.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/src/java.base/share/classes/java/io/FileOutputStream.java Fri Aug 22 10:33:05 2014 -0700
@@ -256,9 +256,20 @@
* @param name name of file to be opened
* @param append whether the file is to be opened in append mode
*/
- private native void open(String name, boolean append)
+ private native void open0(String name, boolean append)
throws FileNotFoundException;
+ // wrap native call to allow instrumentation
+ /**
+ * Opens a file, with the specified name, for overwriting or appending.
+ * @param name name of file to be opened
+ * @param append whether the file is to be opened in append mode
+ */
+ private void open(String name, boolean append)
+ throws FileNotFoundException {
+ open0(name, append);
+ }
+
/**
* Writes the specified byte to this file output stream.
*
--- a/jdk/src/java.base/share/classes/java/io/RandomAccessFile.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/src/java.base/share/classes/java/io/RandomAccessFile.java Fri Aug 22 10:33:05 2014 -0700
@@ -296,9 +296,26 @@
* @param mode the mode flags, a combination of the O_ constants
* defined above
*/
- private native void open(String name, int mode)
+ private native void open0(String name, int mode)
throws FileNotFoundException;
+ // wrap native call to allow instrumentation
+ /**
+ * Opens a file and returns the file descriptor. The file is
+ * opened in read-write mode if the O_RDWR bit in {@code mode}
+ * is true, else the file is opened as read-only.
+ * If the {@code name} refers to a directory, an IOException
+ * is thrown.
+ *
+ * @param name the name of the file
+ * @param mode the mode flags, a combination of the O_ constants
+ * defined above
+ */
+ private void open(String name, int mode)
+ throws FileNotFoundException {
+ open0(name, mode);
+ }
+
// 'Read' primitives
/**
--- a/jdk/src/java.base/share/classes/java/net/SocketInputStream.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/src/java.base/share/classes/java/net/SocketInputStream.java Fri Aug 22 10:33:05 2014 -0700
@@ -96,6 +96,26 @@
int timeout)
throws IOException;
+ // wrap native call to allow instrumentation
+ /**
+ * Reads into an array of bytes at the specified offset using
+ * the received socket primitive.
+ * @param fd the FileDescriptor
+ * @param b the buffer into which the data is read
+ * @param off the start offset of the data
+ * @param len the maximum number of bytes read
+ * @param timeout the read timeout in ms
+ * @return the actual number of bytes read, -1 is
+ * returned when the end of the stream is reached.
+ * @exception IOException If an I/O error has occurred.
+ */
+ private int socketRead(FileDescriptor fd,
+ byte b[], int off, int len,
+ int timeout)
+ throws IOException {
+ return socketRead0(fd, b, off, len, timeout);
+ }
+
/**
* Reads into a byte array data from the socket.
* @param b the buffer into which the data is read
@@ -147,7 +167,7 @@
// acquire file descriptor and do the read
FileDescriptor fd = impl.acquireFD();
try {
- n = socketRead0(fd, b, off, length, timeout);
+ n = socketRead(fd, b, off, length, timeout);
if (n > 0) {
return n;
}
@@ -165,7 +185,7 @@
impl.setConnectionResetPending();
impl.acquireFD();
try {
- n = socketRead0(fd, b, off, length, timeout);
+ n = socketRead(fd, b, off, length, timeout);
if (n > 0) {
return n;
}
--- a/jdk/src/java.base/share/native/libjava/FileInputStream.c Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/src/java.base/share/native/libjava/FileInputStream.c Fri Aug 22 10:33:05 2014 -0700
@@ -57,7 +57,7 @@
*/
JNIEXPORT void JNICALL
-Java_java_io_FileInputStream_open(JNIEnv *env, jobject this, jstring path) {
+Java_java_io_FileInputStream_open0(JNIEnv *env, jobject this, jstring path) {
fileOpen(env, this, path, fis_fd, O_RDONLY);
}
--- a/jdk/src/java.base/share/native/libjava/RandomAccessFile.c Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/src/java.base/share/native/libjava/RandomAccessFile.c Fri Aug 22 10:33:05 2014 -0700
@@ -47,8 +47,8 @@
JNIEXPORT void JNICALL
-Java_java_io_RandomAccessFile_open(JNIEnv *env,
- jobject this, jstring path, jint mode)
+Java_java_io_RandomAccessFile_open0(JNIEnv *env,
+ jobject this, jstring path, jint mode)
{
int flags = 0;
if (mode & java_io_RandomAccessFile_O_RDONLY)
--- a/jdk/src/java.base/unix/native/libjava/FileOutputStream_md.c Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/src/java.base/unix/native/libjava/FileOutputStream_md.c Fri Aug 22 10:33:05 2014 -0700
@@ -53,8 +53,8 @@
*/
JNIEXPORT void JNICALL
-Java_java_io_FileOutputStream_open(JNIEnv *env, jobject this,
- jstring path, jboolean append) {
+Java_java_io_FileOutputStream_open0(JNIEnv *env, jobject this,
+ jstring path, jboolean append) {
fileOpen(env, this, path, fos_fd,
O_WRONLY | O_CREAT | (append ? O_APPEND : O_TRUNC));
}
--- a/jdk/src/java.base/windows/native/libjava/FileOutputStream_md.c Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/src/java.base/windows/native/libjava/FileOutputStream_md.c Fri Aug 22 10:33:05 2014 -0700
@@ -54,8 +54,8 @@
*/
JNIEXPORT void JNICALL
-Java_java_io_FileOutputStream_open(JNIEnv *env, jobject this,
- jstring path, jboolean append) {
+Java_java_io_FileOutputStream_open0(JNIEnv *env, jobject this,
+ jstring path, jboolean append) {
fileOpen(env, this, path, fos_fd,
O_WRONLY | O_CREAT | (append ? O_APPEND : O_TRUNC));
}
--- a/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/InquireType.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/src/java.security.jgss/share/classes/com/sun/security/jgss/InquireType.java Fri Aug 22 10:33:05 2014 -0700
@@ -43,7 +43,7 @@
* </ul>
* @deprecated as of 1.9, replaced by {@link #KRB5_GET_SESSION_KEY_EX}
* which returns an instance of
- * {@link sun.security.jgss.krb5.Krb5Context.EncryptionKey}
+ * {@link javax.security.auth.kerberos.EncryptionKey}
* that implements the {@link javax.crypto.SecretKey} interface and
* has similar methods with {@link javax.security.auth.kerberos.KerberosKey}.
*/
--- a/jdk/test/TEST.groups Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/TEST.groups Fri Aug 22 10:33:05 2014 -0700
@@ -343,6 +343,7 @@
java/io/Serializable/serialver \
java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java \
java/lang/invoke/lambda/LambdaAccessControlTest.java \
+ java/lang/invoke/lambda/LambdaAsm.java \
java/lang/System/MacEncoding/TestFileEncoding.java \
java/net/URLClassLoader/closetest/GetResourceAsStream.java \
java/util/Collections/EmptyIterator.java \
@@ -397,6 +398,11 @@
java/text/Bidi/Bug7051769.java \
javax/crypto/Cipher/CipherStreamClose.java \
javax/management/monitor/AttributeArbitraryDataTypeTest.java \
+ javax/management/mxbean/AmbiguousConstructorTest.java \
+ javax/management/mxbean/ExceptionDiagnosisTest.java \
+ javax/management/mxbean/LeakTest.java \
+ javax/management/mxbean/MXBeanTest.java \
+ javax/management/mxbean/PropertyNamesTest.java \
jdk/lambda/vm/InterfaceAccessFlagsTest.java \
sun/misc/URLClassPath/ClassnameCharTest.java
@@ -492,6 +498,7 @@
sun/security/acl \
sun/security/jgss \
sun/security/krb5 \
+ java/lang/annotation/AnnotationType/AnnotationTypeDeadlockTest.java \
java/lang/System/MacEncoding/TestFileEncoding.java \
java/nio/channels/AsynchronousSocketChannel/Leaky.java \
java/security/PermissionCollection/Concurrent.java \
@@ -499,6 +506,8 @@
java/security/cert/GetInstance.java \
java/util/logging/DrainFindDeadlockTest.java \
java/util/logging/LoggingMXBeanTest.java \
+ java/util/logging/TestLogConfigurationDeadLock.java \
+ java/util/logging/TestLoggerBundleSync.java \
sun/net/www/http/KeepAliveCache/B5045306.java \
sun/security/provider/PolicyFile/Alias.java \
sun/security/provider/PolicyFile/Comparator.java \
@@ -550,6 +559,7 @@
java/lang/PrimitiveSumMinMaxTest.java \
java/lang/String/StringJoinTest.java \
java/lang/Thread/StopThrowable.java \
+ java/net/Authenticator/B4769350.java \
java/net/Authenticator/Deadlock.java \
java/net/CookieHandler/LocalHostCookie.java \
java/net/CookieHandler/CookieManagerTest.java \
@@ -600,7 +610,6 @@
java/util/zip/ZipFile/StreamZipEntriesTest.java \
java/util/zip/ZipFile/DeleteTempJar.java \
javax/crypto/Cipher/CipherStreamClose.java \
- sun/misc/URLClassPath/ClassnameCharTest.java \
sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java \
sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java
--- a/jdk/test/com/sun/jdi/ShellScaffold.sh Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/com/sun/jdi/ShellScaffold.sh Fri Aug 22 10:33:05 2014 -0700
@@ -882,7 +882,7 @@
startDebuggee()
{
- args=$TESTVMOPTS $TESTJAVAOPTS
+ args="$TESTVMOPTS $TESTJAVAOPTS"
if [ ! -z "$args" ] ; then
echo "--Starting debuggee with args from TESTVMOPTS and/or TESTJAVAOPTS: $args"
--- a/jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh Fri Aug 22 10:33:05 2014 -0700
@@ -36,9 +36,12 @@
exit 1
fi
+if [ "x${COMPILEJAVA}" = "x" ]; then
+ COMPILEJAVA="${TESTJAVA}"
+fi
JAVA="${TESTJAVA}/bin/java"
-JAVAC="${TESTJAVA}/bin/javac"
+JAVAC="${COMPILEJAVA}/bin/javac"
cp -f ${TESTSRC}/InheritIO.java .
--- a/jdk/test/java/lang/instrument/NMTHelper.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/java/lang/instrument/NMTHelper.java Fri Aug 22 10:33:05 2014 -0700
@@ -21,8 +21,12 @@
* questions.
*/
+import java.io.File;
+import java.io.FileWriter;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.Arrays;
+import java.util.stream.Collectors;
import sun.management.ManagementFactoryHelper;
import com.sun.management.DiagnosticCommandMBean;
@@ -53,14 +57,14 @@
Object[] dcmdArgs = {args};
String[] signature = {String[].class.getName()};
- try {
- System.out.print("> " + cmd + " ");
- for (String s : args) {
- System.out.print(s + " ");
- }
- System.out.println(":");
+ String cmdString = cmd + " " +
+ Arrays.stream(args).collect(Collectors.joining(" "));
+ File f = new File("dcmdoutput-" + cmd + "-" + System.currentTimeMillis() + ".txt");
+ System.out.println("Output from Dcmd '" + cmdString + "' is being written to file " + f);
+ try (FileWriter fw = new FileWriter(f)) {
+ fw.write("> " + cmdString + ":");
String result = (String) dcmd.invoke(cmd, dcmdArgs, signature);
- System.out.println(result);
+ fw.write(result);
return result;
} catch(Exception ex) {
ex.printStackTrace();
--- a/jdk/test/java/lang/instrument/RedefineBigClass.sh Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/java/lang/instrument/RedefineBigClass.sh Fri Aug 22 10:33:05 2014 -0700
@@ -27,7 +27,7 @@
# @author Daniel D. Daugherty
#
# @run shell MakeJAR3.sh RedefineBigClassAgent 'Can-Redefine-Classes: true'
-# @run build BigClass RedefineBigClassApp
+# @run build BigClass RedefineBigClassApp NMTHelper
# @run shell/timeout=600 RedefineBigClass.sh
#
--- a/jdk/test/java/lang/instrument/RetransformBigClass.sh Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/java/lang/instrument/RetransformBigClass.sh Fri Aug 22 10:33:05 2014 -0700
@@ -27,7 +27,7 @@
# @author Daniel D. Daugherty
#
# @run shell MakeJAR4.sh RetransformBigClassAgent SimpleIdentityTransformer 'Can-Retransform-Classes: true'
-# @run build BigClass RetransformBigClassApp
+# @run build BigClass RetransformBigClassApp NMTHelper
# @run shell/timeout=600 RetransformBigClass.sh
#
--- a/jdk/test/java/util/Base64/TestBase64.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/java/util/Base64/TestBase64.java Fri Aug 22 10:33:05 2014 -0700
@@ -114,8 +114,6 @@
testDecodeIgnoredAfterPadding();
}
- private static sun.misc.BASE64Encoder sunmisc = new sun.misc.BASE64Encoder();
-
private static void test(Base64.Encoder enc, Base64.Decoder dec,
int numRuns, int numBytes) throws Throwable {
Random rnd = new java.util.Random();
@@ -143,21 +141,6 @@
throw new RuntimeException(
"Base64 enc.encode().withoutPadding() has padding!");
}
- // compare to sun.misc.BASE64Encoder
-
- byte[] encoded2 = sunmisc.encode(orig).getBytes("ASCII");
- if (!withoutPadding) { // don't test for withoutPadding()
- checkEqual(normalize(encoded), normalize(encoded2),
- "Base64 enc.encode() does not match sun.misc.base64!");
- }
- // remove padding '=' to test non-padding decoding case
- if (encoded[encoded.length -2] == '=')
- encoded2 = Arrays.copyOf(encoded, encoded.length -2);
- else if (encoded[encoded.length -1] == '=')
- encoded2 = Arrays.copyOf(encoded, encoded.length -1);
- else
- encoded2 = null;
-
// --------testing encodetoString(byte[])/decode(String)--------
String str = enc.encodeToString(orig);
if (!Arrays.equals(str.getBytes("ASCII"), encoded)) {
@@ -167,11 +150,6 @@
byte[] buf = dec.decode(new String(encoded, "ASCII"));
checkEqual(buf, orig, "Base64 decoding(String) failed!");
- if (encoded2 != null) {
- buf = dec.decode(new String(encoded2, "ASCII"));
- checkEqual(buf, orig, "Base64 decoding(String) failed!");
- }
-
//-------- testing encode/decode(Buffer)--------
testEncode(enc, ByteBuffer.wrap(orig), encoded);
ByteBuffer bin = ByteBuffer.allocateDirect(orig.length);
@@ -183,9 +161,6 @@
bin.put(encoded).flip();
testDecode(dec, bin, orig);
- if (encoded2 != null)
- testDecode(dec, ByteBuffer.wrap(encoded2), orig);
-
// --------testing decode.wrap(input stream)--------
// 1) random buf length
ByteArrayInputStream bais = new ByteArrayInputStream(encoded);
--- a/jdk/test/java/util/Base64/TestBase64Golden.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/java/util/Base64/TestBase64Golden.java Fri Aug 22 10:33:05 2014 -0700
@@ -40,9 +40,6 @@
import java.util.Objects;
import java.util.Random;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
-
public class TestBase64Golden {
public static void main(String[] args) throws Exception {
@@ -138,16 +135,6 @@
resArr = decoder.decode(encodedStr);
assertEqual(resArr, srcArr);
- // test compatible with sun.misc.Base64Encoder
- if (type == Base64Type.MIME) {
- sun.misc.BASE64Encoder miscEncoder = new BASE64Encoder();
- sun.misc.BASE64Decoder miscDecoder = new BASE64Decoder();
- resArr = decoder.decode(miscEncoder.encode(srcArr));
- assertEqual(resArr, srcArr);
-
- resArr = encoder.encode(miscDecoder.decodeBuffer(encodedStr));
- assertEqual(new String(resArr, DEF_CHARSET), encodedStr);
- }
}
}
--- a/jdk/test/java/util/Currency/PropertiesTest.sh Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/java/util/Currency/PropertiesTest.sh Fri Aug 22 10:33:05 2014 -0700
@@ -100,14 +100,14 @@
# Make a private copy of the jdk so we can write to the properties file location
# without disturbing other users, including concurrently executing tests.
WRITABLEJDK=.${FS}testjava
-cp -Hr $TESTJAVA $WRITABLEJDK
+cp -H -R $TESTJAVA $WRITABLEJDK || exit 1
if [ -d ${TESTJAVA}${FS}jre ]; then
PROPLOCATION=${WRITABLEJDK}${FS}jre${FS}lib
else
PROPLOCATION=${WRITABLEJDK}${FS}lib
fi
-chmod -R +w $WRITABLEJDK
-cp ${PROPS} $PROPLOCATION
+chmod -R +w $WRITABLEJDK || exit 1
+cp ${PROPS} $PROPLOCATION || exit 1
echo "Properties location: ${PROPLOCATION}"
# run
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java Fri Aug 22 10:33:05 2014 -0700
@@ -26,6 +26,7 @@
* @bug 4858522
* @summary Basic unit test of HotspotClassLoadingMBean.getClassInitializationTime()
* @author Steve Bohne
+ * @run main/othervm -XX:+UsePerfData GetClassInitializationTime
*/
/*
--- a/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java Fri Aug 22 10:33:05 2014 -0700
@@ -26,6 +26,7 @@
* @bug 4858522
* @summary Basic unit test of HotspotRuntimeMBean.getSafepointSyncTime()
* @author Steve Bohne
+ * @run main/othervm -XX:+UsePerfData GetSafepointSyncTime
*/
/*
--- a/jdk/test/sun/management/HotspotThreadMBean/GetInternalThreads.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/sun/management/HotspotThreadMBean/GetInternalThreads.java Fri Aug 22 10:33:05 2014 -0700
@@ -27,6 +27,7 @@
* @summary Basic Test for HotspotThreadMBean.getInternalThreadCount()
* and getInternalThreadCpuTime()
* @author Mandy Chung
+ * @run main/othervm -XX:+UsePerfData GetInternalThreads
*/
import sun.management.*;
--- a/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java Fri Aug 22 10:33:05 2014 -0700
@@ -29,10 +29,10 @@
* @author Luis-Miguel Alventosa
* @run clean JvmstatCountersTest
* @run build JvmstatCountersTest
- * @run main/othervm/timeout=600 JvmstatCountersTest 1
- * @run main/othervm/timeout=600 -Dcom.sun.management.jmxremote JvmstatCountersTest 2
- * @run main/othervm/timeout=600 -Dcom.sun.management.jmxremote.port=0 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false JvmstatCountersTest 3
- * @run main/othervm/timeout=600 JvmstatCountersTest 4
+ * @run main/othervm/timeout=600 -XX:+UsePerfData JvmstatCountersTest 1
+ * @run main/othervm/timeout=600 -XX:+UsePerfData -Dcom.sun.management.jmxremote JvmstatCountersTest 2
+ * @run main/othervm/timeout=600 -XX:+UsePerfData -Dcom.sun.management.jmxremote.port=0 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false JvmstatCountersTest 3
+ * @run main/othervm/timeout=600 -XX:+UsePerfData JvmstatCountersTest 4
*/
import java.io.*;
--- a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java Thu Aug 21 18:48:12 2014 +0400
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java Fri Aug 22 10:33:05 2014 -0700
@@ -53,7 +53,7 @@
* @bug 7110104
* @library /lib/testlibrary
* @build jdk.testlibrary.* JMXStartStopTest JMXStartStopDoSomething
- * @run main/othervm/timeout=600 JMXStartStopTest
+ * @run main/othervm/timeout=600 -XX:+UsePerfData JMXStartStopTest
* @summary Makes sure that enabling/disabling the management agent through
* JCMD achieves the desired results
*/