Skip to content

D
dragonwell8_jdk

openanolis / dragonwell8_jdk

通知 4
Star 2
Fork 0
D
dragonwell8_jdk
提交 e864d64d 编写于 作者: L lana
浏览文件
操作

Merge

上级 d8bfbbd9 eb182394
隐藏空白更改
内联 并排
Showing with 8199 addition and 7559 deletion
.hgtags
浏览文件 @ e864d64d
...@@ -233,3 +233,4 @@ eea685b9ccaa1980e0a7e07d6a3a84bcc7e9ab82 jdk8-b107 ...@@ -233,3 +233,4 @@ eea685b9ccaa1980e0a7e07d6a3a84bcc7e9ab82 jdk8-b107
946f3fd5f8bf0ccd180c258d25e5837fa1bf004c jdk8-b109 946f3fd5f8bf0ccd180c258d25e5837fa1bf004c jdk8-b109
54e099776f08430d3a7f4feabd9f2ba886b55320 jdk8-b110 54e099776f08430d3a7f4feabd9f2ba886b55320 jdk8-b110
719befd87c7b96ae103c05730ca555227bfc0116 jdk8-b111 719befd87c7b96ae103c05730ca555227bfc0116 jdk8-b111
f002f5f3a16cca62e139cb8eed05ffaeb373587d jdk8-b112
make/common/shared/Compiler-msvc.gmk
浏览文件 @ e864d64d
...@@ -53,7 +53,7 @@ ifndef CONFIGURE_BUILD ...@@ -53,7 +53,7 @@ ifndef CONFIGURE_BUILD
# The VS2010 compiler is the same one used on both 32bit and 64bit # The VS2010 compiler is the same one used on both 32bit and 64bit
ifeq ($(CC_MAJORVER), 16) ifeq ($(CC_MAJORVER), 16)
COMPILER_NAME=Microsoft Visual Studio 10 (16.00.30319.01) COMPILER_NAME=Microsoft Visual Studio 10 (16.00.40219.01)
COMPILER_VERSION=VS2010 COMPILER_VERSION=VS2010
ifeq ($(WINDOWSSDKDIR),) ifeq ($(WINDOWSSDKDIR),)
WINDOWSSDKDIR := $(error WINDOWSSDKDIR cannot be empty here) WINDOWSSDKDIR := $(error WINDOWSSDKDIR cannot be empty here)
......
make/common/shared/Defs-versions.gmk
浏览文件 @ e864d64d
...@@ -86,19 +86,17 @@ endif ...@@ -86,19 +86,17 @@ endif
# REQUIRED_MAKE_VER # REQUIRED_MAKE_VER
# The minimum version of GNU make. # The minimum version of GNU make.
# #
# REQUIRED_MKS_VER
# Windows only: If MKS used instead of CYGWIN, the minimum version of MKS.
#
# REQUIRED_OS_VARIANT_NAME # REQUIRED_OS_VARIANT_NAME
# The OS variation name required. # The OS variation name required.
# Solaris: Solaris or OpenSolaris # Solaris: Solaris or OpenSolaris
# Windows: Windows2000, WindowsXP, Windows2003, etc. # Windows: Windows2000, WindowsXP, Windows2003, Windows2008R2, etc.
# Linux: Fedora, RedHat, SuSE, Ubuntu, etc. # Linux: Fedora, RedHat, SuSE, Ubuntu, etc.
# #
# REQUIRED_OS_VARIANT_VERSION # REQUIRED_OS_VARIANT_VERSION
# The version number associated with the above OS variant name. # The version number associated with the above OS variant name.
# Solaris: output of uname -r # Solaris: output of uname -r
# Windows: 5.0 for Windows2000, 5.1 for WindowsXP, 5.2 for Windows2003, etc. # Windows: 5.0 for Windows2000, 5.1 for WindowsXP,
# 5.2 for Windows2003, 6.1 for Windows2008R2, etc.
# Linux: number for the variant, e.g. 9 for Fedora 9 # Linux: number for the variant, e.g. 9 for Fedora 9
# #
# REQUIRED_OS_VERSION # REQUIRED_OS_VERSION
...@@ -180,21 +178,15 @@ endif ...@@ -180,21 +178,15 @@ endif
# Windows specific # Windows specific
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
REQUIRED_OS_NAME = Windows REQUIRED_OS_NAME = Windows
ifeq ($(ARCH_DATA_MODEL),64) REQUIRED_OS_VERSION = 6.1
REQUIRED_OS_VERSION = 5.2 REQUIRED_OS_VARIANT_NAME = Windows2008R2
REQUIRED_OS_VARIANT_NAME = Windows2003
else
REQUIRED_OS_VERSION = 5.1
REQUIRED_OS_VARIANT_NAME = WindowsXP
endif
REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION) REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION)
REQUIRED_CYGWIN_VER = 4.0 REQUIRED_CYGWIN_VER = 4.0
REQUIRED_MKS_VER = 6.1
ifeq ($(CC_VERSION),msvc) ifeq ($(CC_VERSION),msvc)
REQUIRED_COMPILER_NAME = Visual Studio 10 REQUIRED_COMPILER_NAME = Visual Studio 10
REQUIRED_COMPILER_VERSION = VS2010 REQUIRED_COMPILER_VERSION = VS2010
REQUIRED_CC_VER = 16.00.30319.01 REQUIRED_CC_VER = 16.00.40219.01
REQUIRED_LINK_VER = 10.00.30319.01 REQUIRED_LINK_VER = 10.00.40219.01
endif endif
ifeq ($(CC_VERSION),gcc) ifeq ($(CC_VERSION),gcc)
REQUIRED_CC_VER = 3.4.3 REQUIRED_CC_VER = 3.4.3
......
make/common/shared/Sanity.gmk
浏览文件 @ e864d64d
...@@ -121,11 +121,13 @@ ifeq ($(PLATFORM), macosx) ...@@ -121,11 +121,13 @@ ifeq ($(PLATFORM), macosx)
endif endif
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
# Windows 2000 is 5.0, Windows XP is 5.1, Windows 2003 is 5.2 # Windows 2000 is 5.0, Windows XP is 5.1,
# Windows 2003 is 5.2, Windows 7 and 2008R2 are 6.1
# Assume 5.0 (Windows 2000) if systeminfo does not help # Assume 5.0 (Windows 2000) if systeminfo does not help
WINDOWS_MAPPING-5.0 := Windows2000 WINDOWS_MAPPING-5.0 := Windows2000
WINDOWS_MAPPING-5.1 := WindowsXP WINDOWS_MAPPING-5.1 := WindowsXP
WINDOWS_MAPPING-5.2 := Windows2003 WINDOWS_MAPPING-5.2 := Windows2003
WINDOWS_MAPPING-6.1 := Windows2008R2
# What kind of system we are using (Variation is the common name) # What kind of system we are using (Variation is the common name)
_OS_VERSION := \ _OS_VERSION := \
$(shell systeminfo 2> $(DEV_NULL) | \ $(shell systeminfo 2> $(DEV_NULL) | \
...@@ -180,7 +182,6 @@ include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk ...@@ -180,7 +182,6 @@ include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk
sane-linux \ sane-linux \
sane-cygwin \ sane-cygwin \
sane-cygwin-shell \ sane-cygwin-shell \
sane-mks \
sane-arch_data_model \ sane-arch_data_model \
sane-os_patch_level \ sane-os_patch_level \
sane-classpath \ sane-classpath \
...@@ -317,7 +318,7 @@ ifndef OPENJDK ...@@ -317,7 +318,7 @@ ifndef OPENJDK
endif # OPENJDK endif # OPENJDK
ifeq ($(PLATFORM), windows) ifeq ($(PLATFORM), windows)
sane-os_version:: sane-cygwin sane-mks sane-cygwin-shell sane-os_version:: sane-cygwin sane-cygwin-shell
endif endif
###################################################### ######################################################
...@@ -386,22 +387,6 @@ sane-cygwin-shell: ...@@ -386,22 +387,6 @@ sane-cygwin-shell:
endif endif
endif endif
######################################################
# Check the Windows mks version
######################################################
ifeq ($(PLATFORM), windows)
MKS_CHECK :=$(call CheckVersions,$(MKS_VER),$(REQUIRED_MKS_VER))
sane-mks:
ifdef USING_MKS
ifeq ($(MKS_CHECK),missing)
@$(call OfficialErrorMessage,MKS version,$(MKS_VER),$(REQUIRED_MKS_VER))
endif
ifeq ($(MKS_CHECK),older)
@$(call OfficialErrorMessage,MKS version,$(MKS_VER),$(REQUIRED_MKS_VER))
endif
endif
endif
###################################################### ######################################################
# Get list of installed patches (this file has a particular format) # Get list of installed patches (this file has a particular format)
###################################################### ######################################################
......
make/tools/manifest.mf
浏览文件 @ e864d64d
Manifest-Version: 1.0 Manifest-Version: 1.0
Specification-Title: Java Platform API Specification Specification-Title: Java Platform API Specification
Specification-Version: 1.7 Specification-Version: 1.8
Specification-Vendor: Oracle Corporation Specification-Vendor: Oracle Corporation
Implementation-Title: Java Runtime Environment Implementation-Title: Java Runtime Environment
Implementation-Version: @@RELEASE@@ Implementation-Version: @@RELEASE@@
......
makefiles/BuildJdk.gmk
浏览文件 @ e864d64d
...@@ -47,13 +47,13 @@ include ProfileNames.gmk ...@@ -47,13 +47,13 @@ include ProfileNames.gmk
import: import-only import: import-only
import-only: import-only:
# Import (corba jaxp jaxws langtools hotspot) # Import (corba jaxp jaxws langtools hotspot)
+$(MAKE) -f Import.gmk +$(MAKE) -f Import.gmk
gensrc: import gensrc-only gensrc: import gensrc-only
gensrc-only: gensrc-only:
+$(MAKE) -f GenerateJavaSources.gmk +$(MAKE) -f GenerateSources.gmk
# Ok, now gensrc is fully populated. # Ok, now gensrc is fully populated.
gendata: gensrc gendata-only gendata: gensrc gendata-only
gendata-only: gendata-only:
...@@ -62,8 +62,8 @@ gendata-only: ...@@ -62,8 +62,8 @@ gendata-only:
classes: gendata classes-only classes: gendata classes-only
classes-only: classes-only:
+$(MAKE) -f CompileJavaClasses.gmk +$(MAKE) -f CompileJavaClasses.gmk
# The classes are now built and # The classes are now built and
# any javah files have now been generated. # any javah files have now been generated.
libs: classes libs-only libs: classes libs-only
libs-only: libs-only:
...@@ -71,23 +71,23 @@ libs-only: ...@@ -71,23 +71,23 @@ libs-only:
launchers: libs launchers-only launchers: libs launchers-only
launchers-only: launchers-only:
# Finally compile the launchers. # Finally compile the launchers.
+$(MAKE) -f CompileLaunchers.gmk +$(MAKE) -f CompileLaunchers.gmk
genclasses: launchers genclasses-only genclasses: launchers genclasses-only
genclasses-only: genclasses-only:
# Generate classes that have other sources. Needs # Generate classes that have other sources. Needs
# to execute launchers. # to execute launchers.
+$(MAKE) -f GenerateClasses.gmk +$(MAKE) -f GenerateClasses.gmk
jdk: genclasses jdk: genclasses
# Now we have a complete jdk, which you can run. # Now we have a complete jdk, which you can run.
# It is not yet wrapped up as an installed image. # It is not yet wrapped up as an installed image.
demos: demos:
# The demos are compiled against this jdk. # The demos are compiled against this jdk.
+$(MAKE) -f CompileDemos.gmk +$(MAKE) -f CompileDemos.gmk
# Now copy the sample sources into the jdk. # Now copy the sample sources into the jdk.
+$(MAKE) -f CopySamples.gmk +$(MAKE) -f CopySamples.gmk
# Create the final jdk and jre images, to be wrapped up # Create the final jdk and jre images, to be wrapped up
...@@ -96,9 +96,9 @@ demos: ...@@ -96,9 +96,9 @@ demos:
images: images:
+$(MAKE) PROFILE="" -f CreateJars.gmk +$(MAKE) PROFILE="" -f CreateJars.gmk
+$(MAKE) PROFILE="" -f Images.gmk +$(MAKE) PROFILE="" -f Images.gmk
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
+$(MAKE) -f Bundles.gmk +$(MAKE) -f Bundles.gmk
endif endif
overlay-images: overlay-images:
+$(MAKE) -f CompileLaunchers.gmk OVERLAY_IMAGES=true +$(MAKE) -f CompileLaunchers.gmk OVERLAY_IMAGES=true
...@@ -114,8 +114,8 @@ profiles: $(ALL_PROFILES) ...@@ -114,8 +114,8 @@ profiles: $(ALL_PROFILES)
sign-jars: sign-jars:
+$(MAKE) -f SignJars.gmk +$(MAKE) -f SignJars.gmk
BINARIES:=$(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*)) BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
INSTALLDIR:=openjdk-$(RELEASE) INSTALLDIR := openjdk-$(RELEASE)
# Install the jdk image, in a very crude way. Not taking into # Install the jdk image, in a very crude way. Not taking into
# account, how to install properly on macosx or windows etc. # account, how to install properly on macosx or windows etc.
...@@ -126,8 +126,8 @@ install: ...@@ -126,8 +126,8 @@ install:
$(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/* $(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/*
$(CP) -rp $(JDK_IMAGE_DIR)/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR) $(CP) -rp $(JDK_IMAGE_DIR)/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
$(MKDIR) -p $(INSTALL_PREFIX)/bin $(MKDIR) -p $(INSTALL_PREFIX)/bin
$(RM) $(addprefix $(INSTALL_PREFIX)/bin/,$(BINARIES)) $(RM) $(addprefix $(INSTALL_PREFIX)/bin/, $(BINARIES))
$(foreach b,$(BINARIES),$(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true $(foreach b, $(BINARIES), $(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true
# The all target builds the JDK, but not the images # The all target builds the JDK, but not the images
all: jdk all: jdk
......
makefiles/Bundles.gmk
浏览文件 @ e864d64d
...@@ -31,108 +31,108 @@ default: bundles ...@@ -31,108 +31,108 @@ default: bundles
# Only macosx has bundles defined. # Only macosx has bundles defined.
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
bundles: jre-bundle jdk-bundle bundles: jre-bundle jdk-bundle
# JDK_BUNDLE_DIR and JRE_BUNDLE_DIR are defined in SPEC. # JDK_BUNDLE_DIR and JRE_BUNDLE_DIR are defined in SPEC.
MACOSX_SRC := $(JDK_TOPDIR)/src/macosx MACOSX_SRC := $(JDK_TOPDIR)/src/macosx
# All these OPENJDK checks are needed since there is no coherency between # All these OPENJDK checks are needed since there is no coherency between
# these values in open and closed. Should probably be fixed. # these values in open and closed. Should probably be fixed.
ifndef OPENJDK ifndef OPENJDK
BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(JDK_MINOR_VERSION)u$(JDK_UPDATE_VERSION) BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(JDK_MINOR_VERSION)u$(JDK_UPDATE_VERSION)
else else
BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE) BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE)
endif endif
BUNDLE_ID_JRE := $(BUNDLE_ID).jre BUNDLE_ID_JRE := $(BUNDLE_ID).jre
BUNDLE_ID_JDK := $(BUNDLE_ID).jdk BUNDLE_ID_JDK := $(BUNDLE_ID).jdk
BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_MINOR_VERSION) BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_MINOR_VERSION)
BUNDLE_NAME_JRE := $(BUNDLE_NAME) BUNDLE_NAME_JRE := $(BUNDLE_NAME)
BUNDLE_NAME_JDK := $(BUNDLE_NAME) BUNDLE_NAME_JDK := $(BUNDLE_NAME)
ifndef OPENJDK ifndef OPENJDK
BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_VERSION) BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_VERSION)
else else
BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) ($(JDK_VERSION)) BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) ($(JDK_VERSION))
endif endif
BUNDLE_INFO_JRE := $(BUNDLE_INFO) BUNDLE_INFO_JRE := $(BUNDLE_INFO)
BUNDLE_INFO_JDK := $(BUNDLE_INFO) BUNDLE_INFO_JDK := $(BUNDLE_INFO)
BUNDLE_PLATFORM_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION) BUNDLE_PLATFORM_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION)
BUNDLE_VERSION := $(JDK_VERSION) BUNDLE_VERSION := $(JDK_VERSION)
ifeq ($(COMPANY_NAME),N/A) ifeq ($(COMPANY_NAME), N/A)
BUNDLE_VENDOR := UNDEFINED BUNDLE_VENDOR := UNDEFINED
else else
BUNDLE_VENDOR := $(COMPANY_NAME) BUNDLE_VENDOR := $(COMPANY_NAME)
endif endif
JDK_FILE_LIST := $(shell $(FIND) $(JDK_IMAGE_DIR)) JDK_FILE_LIST := $(shell $(FIND) $(JDK_IMAGE_DIR))
JRE_FILE_LIST := $(shell $(FIND) $(JRE_IMAGE_DIR)) JRE_FILE_LIST := $(shell $(FIND) $(JRE_IMAGE_DIR))
JDK_TARGET_LIST := $(subst $(JDK_IMAGE_DIR)/,$(JDK_BUNDLE_DIR)/Home/,$(JDK_FILE_LIST)) JDK_TARGET_LIST := $(subst $(JDK_IMAGE_DIR)/,$(JDK_BUNDLE_DIR)/Home/,$(JDK_FILE_LIST))
JRE_TARGET_LIST := $(subst $(JRE_IMAGE_DIR)/,$(JRE_BUNDLE_DIR)/Home/,$(JRE_FILE_LIST)) JRE_TARGET_LIST := $(subst $(JRE_IMAGE_DIR)/,$(JRE_BUNDLE_DIR)/Home/,$(JRE_FILE_LIST))
# The old builds implementation of this did not preserve symlinks so # The old builds implementation of this did not preserve symlinks so
# make sure they are followed and the contents copied instead. # make sure they are followed and the contents copied instead.
# To fix this, remove -L # To fix this, remove -L
# Copy empty directories (jre/lib/applet). # Copy empty directories (jre/lib/applet).
$(JDK_BUNDLE_DIR)/Home/%: $(JDK_IMAGE_DIR)/% $(JDK_BUNDLE_DIR)/Home/%: $(JDK_IMAGE_DIR)/%
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -L '$<' '$@'; fi if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -L '$<' '$@'; fi
$(JRE_BUNDLE_DIR)/Home/%: $(JRE_IMAGE_DIR)/% $(JRE_BUNDLE_DIR)/Home/%: $(JRE_IMAGE_DIR)/%
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -L '$<' '$@'; fi if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -L '$<' '$@'; fi
$(JDK_BUNDLE_DIR)/MacOS/libjli.dylib: $(JDK_BUNDLE_DIR)/MacOS/libjli.dylib:
$(ECHO) Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(LN) -s ../Home/jre/lib/jli/libjli.dylib $@ $(LN) -s ../Home/jre/lib/jli/libjli.dylib $@
$(JRE_BUNDLE_DIR)/MacOS/libjli.dylib: $(JRE_BUNDLE_DIR)/MacOS/libjli.dylib:
$(ECHO) Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) Creating link $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(LN) -s ../Home/lib/jli/libjli.dylib $@ $(LN) -s ../Home/lib/jli/libjli.dylib $@
$(JDK_BUNDLE_DIR)/Info.plist: $(SPEC) $(JDK_BUNDLE_DIR)/Info.plist: $(SPEC)
$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" \ $(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" \
-e "s/@@NAME@@/$(BUNDLE_NAME_JDK)/g" \ -e "s/@@NAME@@/$(BUNDLE_NAME_JDK)/g" \
-e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" \ -e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" \
-e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \ -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \
-e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \ -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \
-e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \ -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \
< $(MACOSX_SRC)/bundle/JDK-Info.plist > $@ < $(MACOSX_SRC)/bundle/JDK-Info.plist > $@
$(JRE_BUNDLE_DIR)/Info.plist: $(SPEC) $(JRE_BUNDLE_DIR)/Info.plist: $(SPEC)
$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(SED) -e "s/@@ID@@/$(BUNDLE_ID_JRE)/g" \ $(SED) -e "s/@@ID@@/$(BUNDLE_ID_JRE)/g" \
-e "s/@@NAME@@/$(BUNDLE_NAME_JRE)/g" \ -e "s/@@NAME@@/$(BUNDLE_NAME_JRE)/g" \
-e "s/@@INFO@@/$(BUNDLE_INFO_JRE)/g" \ -e "s/@@INFO@@/$(BUNDLE_INFO_JRE)/g" \
-e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \ -e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \
-e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \ -e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \
-e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \ -e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \
< $(MACOSX_SRC)/bundle/JRE-Info.plist > $@ < $(MACOSX_SRC)/bundle/JRE-Info.plist > $@
jdk-bundle: $(JDK_TARGET_LIST) $(JDK_BUNDLE_DIR)/MacOS/libjli.dylib \ jdk-bundle: $(JDK_TARGET_LIST) $(JDK_BUNDLE_DIR)/MacOS/libjli.dylib \
$(JDK_BUNDLE_DIR)/Info.plist $(JDK_BUNDLE_DIR)/Info.plist
$(SETFILE) -a B $(dir $(JDK_BUNDLE_DIR)) $(SETFILE) -a B $(dir $(JDK_BUNDLE_DIR))
jre-bundle: $(JRE_TARGET_LIST) $(JRE_BUNDLE_DIR)/MacOS/libjli.dylib \ jre-bundle: $(JRE_TARGET_LIST) $(JRE_BUNDLE_DIR)/MacOS/libjli.dylib \
$(JRE_BUNDLE_DIR)/Info.plist $(JRE_BUNDLE_DIR)/Info.plist
$(SETFILE) -a B $(dir $(JRE_BUNDLE_DIR)) $(SETFILE) -a B $(dir $(JRE_BUNDLE_DIR))
else # Not macosx else # Not macosx
bundles: bundles:
$(ECHO) "No bundles defined for $(OPENJDK_TARGET_OS)" $(ECHO) "No bundles defined for $(OPENJDK_TARGET_OS)"
endif # macosx endif # macosx
......
makefiles/CompileDemos.gmk
浏览文件 @ e864d64d
...@@ -35,10 +35,10 @@ include NativeCompilation.gmk ...@@ -35,10 +35,10 @@ include NativeCompilation.gmk
include Setup.gmk include Setup.gmk
# Prepare the find cache. Only used if running on windows. # Prepare the find cache. Only used if running on windows.
$(eval $(call FillCacheFind,$(JDK_TOPDIR)/src)) $(eval $(call FillCacheFind, $(JDK_TOPDIR)/src))
# Append demo goals to this variable. # Append demo goals to this variable.
BUILD_DEMOS= BUILD_DEMOS =
# The demo structure and contents should really be cleaned up. # The demo structure and contents should really be cleaned up.
# Now every other demo has its own quirks where to put the # Now every other demo has its own quirks where to put the
...@@ -47,13 +47,13 @@ BUILD_DEMOS= ...@@ -47,13 +47,13 @@ BUILD_DEMOS=
################################################################################################## ##################################################################################################
define SetupAppletDemo define SetupAppletDemo
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_APPLET_$1,\ $$(eval $$(call SetupJavaCompilation,BUILD_DEMO_APPLET_$1, \
SETUP:=GENERATE_USINGJDKBYTECODE,\ SETUP := GENERATE_USINGJDKBYTECODE, \
SRC:=$(JDK_TOPDIR)/src/$3share/demo/applets/$1,\ SRC := $(JDK_TOPDIR)/src/$3share/demo/applets/$1, \
BIN:=$(JDK_OUTPUTDIR)/demo/applets/$1,\ BIN := $(JDK_OUTPUTDIR)/demo/applets/$1, \
COPY:=.html .java .xyz .obj .au .gif,\ COPY := .html .java .xyz .obj .au .gif, \
DISABLE_SJAVAC:=$2)) DISABLE_SJAVAC := $2))
BUILD_DEMOS += $$(BUILD_DEMO_APPLET_$1) BUILD_DEMOS += $$(BUILD_DEMO_APPLET_$1)
endef endef
$(eval $(call SetupAppletDemo,ArcTest)) $(eval $(call SetupAppletDemo,ArcTest))
...@@ -71,91 +71,91 @@ $(eval $(call SetupAppletDemo,SortDemo)) ...@@ -71,91 +71,91 @@ $(eval $(call SetupAppletDemo,SortDemo))
$(eval $(call SetupAppletDemo,SpreadSheet)) $(eval $(call SetupAppletDemo,SpreadSheet))
ifndef OPENJDK ifndef OPENJDK
$(eval $(call SetupAppletDemo,Animator,,closed/)) $(eval $(call SetupAppletDemo,Animator,,closed/))
$(eval $(call SetupAppletDemo,GraphLayout,true,closed/)) $(eval $(call SetupAppletDemo,GraphLayout,true,closed/))
$(eval $(call SetupAppletDemo,JumpingBox,,closed/)) $(eval $(call SetupAppletDemo,JumpingBox,,closed/))
$(eval $(call SetupAppletDemo,TicTacToe,,closed/)) $(eval $(call SetupAppletDemo,TicTacToe,,closed/))
endif endif
################################################################################################## ##################################################################################################
PATTERNS_TO_COPY=.html .txt .properties .js .gif .jpg .theme .data .opt README .c .h .png .ttf .xyz .obj PATTERNS_TO_COPY = .html .txt .properties .js .gif .jpg .theme .data .opt README .c .h .png .ttf .xyz .obj
define SetupDemo define SetupDemo
# Param 1 = Name of the demo # Param 1 = Name of the demo
# Param 2 = Subdirectory of the demo below the demo directory. # Param 2 = Subdirectory of the demo below the demo directory.
# Param 3 = Additional javac flags. # Param 3 = Additional javac flags.
# Param 4 = The main class for the jar. # Param 4 = The main class for the jar.
# Param 5 = Additional source directory. # Param 5 = Additional source directory.
# Param 6 = Extra dir below $(JDK_TOPDIR)/src (closed) # Param 6 = Extra dir below $(JDK_TOPDIR)/src (closed)
# Param 7 = List of files to copy # Param 7 = List of files to copy
# Param 8 = Base name of jar file. Defaults to $1 # Param 8 = Base name of jar file. Defaults to $1
# Param 9 = Exclude list # Param 9 = Exclude list
# Param 10 = Extra copy patterns # Param 10 = Extra copy patterns
# Param 11 = Extra manifest attribute # Param 11 = Extra manifest attribute
# Param 12 = Suffix for compiler setup name # Param 12 = Suffix for compiler setup name
# In some demos the source is found in a subdir called src. # In some demos the source is found in a subdir called src.
$1_MAIN_SRC:=$$(wildcard $(JDK_TOPDIR)/src/$6share/demo/$2/$1/src) $1_MAIN_SRC := $$(wildcard $(JDK_TOPDIR)/src/$6share/demo/$2/$1/src)
ifeq ($$($1_MAIN_SRC),) ifeq ($$($1_MAIN_SRC), )
$1_MAIN_SRC:=$(JDK_TOPDIR)/src/$6share/demo/$2/$1 $1_MAIN_SRC := $(JDK_TOPDIR)/src/$6share/demo/$2/$1
endif endif
ifneq ($8,) ifneq ($8, )
$1_JARFILE := $8.jar $1_JARFILE := $8.jar
else else
$1_JARFILE := $1.jar $1_JARFILE := $1.jar
endif endif
ifeq ($(findstring $1,Laffy SwingSet3),) ifeq ($(findstring $1,Laffy SwingSet3), )
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_$1,\ $$(eval $$(call SetupJavaCompilation,BUILD_DEMO_$1, \
SETUP:=GENERATE_USINGJDKBYTECODE,\ SETUP := GENERATE_USINGJDKBYTECODE, \
ADD_JAVAC_FLAGS:=$3,\ ADD_JAVAC_FLAGS := $3, \
SRC:=$$($1_MAIN_SRC) $5,\ SRC := $$($1_MAIN_SRC) $5, \
BIN:=$(JDK_OUTPUTDIR)/democlasses/$2/$1,\ BIN := $(JDK_OUTPUTDIR)/democlasses/$2/$1, \
COPY:=$(PATTERNS_TO_COPY) $(10),\ COPY := $(PATTERNS_TO_COPY) $(10), \
JAR:=$(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE),\ JAR := $(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE), \
JARMAIN:=$4,\ JARMAIN := $4, \
MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf,\ MANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf, \
EXTRA_MANIFEST_ATTR:=$(11),\ EXTRA_MANIFEST_ATTR := $(11), \
SRCZIP:=$(JDK_OUTPUTDIR)/demo/$2/$1/src.zip,\ SRCZIP := $(JDK_OUTPUTDIR)/demo/$2/$1/src.zip, \
EXCLUDE_FILES:=$9,\ EXCLUDE_FILES := $9, \
DISABLE_SJAVAC:=$(12))) DISABLE_SJAVAC := $(12)))
BUILD_DEMOS += $$(BUILD_DEMO_$1) \ BUILD_DEMOS += $$(BUILD_DEMO_$1) \
$(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE) \ $(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE) \
$(JDK_OUTPUTDIR)/demo/$2/$1/src.zip $(JDK_OUTPUTDIR)/demo/$2/$1/src.zip
endif endif
# Copy files. # Copy files.
$1_COPY_TARGETS := $$(patsubst $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%,\ $1_COPY_TARGETS := $$(patsubst $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%, \
$(JDK_OUTPUTDIR)/demo/$2/$1/%,\ $(JDK_OUTPUTDIR)/demo/$2/$1/%, \
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/$6share/demo/$2/$1/,$7))) $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/$6share/demo/$2/$1/, $7)))
ifneq ($7,) ifneq ($7, )
$(JDK_OUTPUTDIR)/demo/$2/$1/% : $(JDK_TOPDIR)/src/$6share/demo/$2/$1/% $(JDK_OUTPUTDIR)/demo/$2/$1/%: $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%
$$(call install-file) $$(call install-file)
$(CHMOD) -f ug+w $$@ $(CHMOD) -f ug+w $$@
BUILD_DEMOS += $$($1_COPY_TARGETS) BUILD_DEMOS += $$($1_COPY_TARGETS)
endif endif
endef endef
$(eval $(call SetupDemo,CodePointIM,jfc,,CodePointIM,,,*.html)) $(eval $(call SetupDemo,CodePointIM,jfc,,CodePointIM,,,*.html))
$(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services : \ $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services: \
$(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar \ $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar \
$(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor $(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor
(cd $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM && \ (cd $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM && \
$(MKDIR) -p _the.tmp/META-INF/services && \ $(MKDIR) -p _the.tmp/META-INF/services && \
$(CP) $(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor _the.tmp/META-INF/services && \ $(CP) $(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor _the.tmp/META-INF/services && \
cd _the.tmp && \ cd _the.tmp && \
$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar META-INF/services/java.awt.im.spi.InputMethodDescriptor && \ $(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar META-INF/services/java.awt.im.spi.InputMethodDescriptor && \
cd META-INF/services && \ cd META-INF/services && \
$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar java.awt.im.spi.InputMethodDescriptor) $(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar java.awt.im.spi.InputMethodDescriptor)
$(RM) -r $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.tmp $(RM) -r $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.tmp
$(TOUCH) $@ $(TOUCH) $@
BUILD_DEMOS+=$(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services
$(eval $(call SetupDemo,MoleculeViewer,applets,,XYZChemModel,,,example*.html XYZApp.java)) $(eval $(call SetupDemo,MoleculeViewer,applets,,XYZChemModel,,,example*.html XYZApp.java))
$(eval $(call SetupDemo,WireFrame,applets,,ThreeD,,,example*.html ThreeD.java)) $(eval $(call SetupDemo,WireFrame,applets,,ThreeD,,,example*.html ThreeD.java))
...@@ -175,193 +175,194 @@ $(eval $(call SetupDemo,VerboseGC,management,,VerboseGC,,,README*)) ...@@ -175,193 +175,194 @@ $(eval $(call SetupDemo,VerboseGC,management,,VerboseGC,,,README*))
$(eval $(call SetupDemo,zipfs,nio,,,,,README* *.java,,,,Main-Class: \n)) $(eval $(call SetupDemo,zipfs,nio,,,,,README* *.java,,,,Main-Class: \n))
ifndef OPENJDK ifndef OPENJDK
$(eval $(call SetupDemo,Laffy,jfc,,,,closed/,*)) $(eval $(call SetupDemo,Laffy,jfc,,,,closed/,*))
$(eval $(call SetupDemo,SwingSet3,jfc,,,,closed/,*)) $(eval $(call SetupDemo,SwingSet3,jfc,,,,closed/,*))
$(eval $(call SetupDemo,Java2D,jfc,,java2d.Java2Demo,,closed/,*.html README*,Java2Demo)) $(eval $(call SetupDemo,Java2D,jfc,,java2d.Java2Demo,,closed/,*.html README*,Java2Demo))
$(eval $(call SetupDemo,Stylepad,jfc,,Stylepad,\ $(eval $(call SetupDemo,Stylepad,jfc,,Stylepad, \
$(JDK_TOPDIR)/src/share/demo/jfc/Notepad,closed/,*.txt,,$(JDK_TOPDIR)/src/share/demo/jfc/Notepad/README.txt)) $(JDK_TOPDIR)/src/share/demo/jfc/Notepad,closed/,*.txt,,$(JDK_TOPDIR)/src/share/demo/jfc/Notepad/README.txt))
$(eval $(call SetupDemo,SwingSet2,jfc,,SwingSet2,,closed/,README* *.html,,,.java COPYRIGHT,\ $(eval $(call SetupDemo,SwingSet2,jfc,,SwingSet2,,closed/,README* *.html,,,.java COPYRIGHT, \
SplashScreen-Image: resources/images/splash.png,true)) SplashScreen-Image: resources/images/splash.png,true))
BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%,\ BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%, \
$(JDK_OUTPUTDIR)/demo/nbproject/%,\ $(JDK_OUTPUTDIR)/demo/nbproject/%, \
$(call CacheFind,$(JDK_TOPDIR)/src/closed/share/demo/nbproject)) $(call CacheFind, $(JDK_TOPDIR)/src/closed/share/demo/nbproject))
$(JDK_OUTPUTDIR)/demo/nbproject/% : $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%
$(call install-file) $(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%
$(CHMOD) -f ug+w $@ $(call install-file)
$(CHMOD) -f ug+w $@
endif endif
################################################################################################## ##################################################################################################
# In the old makefiles, j2dbench was not compiled. # In the old makefiles, j2dbench was not compiled.
#$(eval $(call SetupDemo,J2DBench,java2d,/src,,j2dbench/J2DBench)) #$(eval $(call SetupDemo,J2DBench, java2d, /src, , j2dbench/J2DBench))
# JVMTI demos are a bit strange and share some files, but be careful the # JVMTI demos are a bit strange and share some files, but be careful the
# shared files are just the *.c and *.h files, not the README or sample # shared files are just the *.c and *.h files, not the README or sample
# makefiles. So we always exclude the README.txt and sample.makefile.txt # makefiles. So we always exclude the README.txt and sample.makefile.txt
# from the extra sources. # from the extra sources.
define SetupJVMTIDemo define SetupJVMTIDemo
# Param 1 = Name of the demo # Param 1 = Name of the demo
# Param 2 = add these directories to the includes, default is agent_util # Param 2 = add these directories to the includes, default is agent_util
# Param 3 = extra CFLAGS # Param 3 = extra CFLAGS
# Param 4 = C or C++ (defaults to C) # Param 4 = C or C++ (defaults to C)
# Param 5 = libs for posix # Param 5 = libs for posix
# Param 6 = libs for windows # Param 6 = libs for windows
# Param 7 = libs for solaris # Param 7 = libs for solaris
BUILD_DEMO_JVMTI_$1_EXTRA_SRC:= \ BUILD_DEMO_JVMTI_$1_EXTRA_SRC := \
$$(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/$1) \ $$(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/$1) \
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/,$2)) $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2))
BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE:= \ BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE := \
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/,$2)/README.txt) \ $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/README.txt) \
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/,$2)/sample.makefile.txt) $$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2)/sample.makefile.txt)
BUILD_DEMO_JVMTI_$1_EXTRA_INC:=$$(addprefix -I,$$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC)) BUILD_DEMO_JVMTI_$1_EXTRA_INC := $$(addprefix -I, $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC))
BUILD_DEMO_JVMTI_$1_LANG:=C BUILD_DEMO_JVMTI_$1_LANG := C
ifneq (,$4) ifneq (, $4)
BUILD_DEMO_JVMTI_$1_LANG:=$4 BUILD_DEMO_JVMTI_$1_LANG := $4
endif endif
ifeq (C++,$4) ifeq (C++, $4)
$1_EXTRA_CXX:=$(LDFLAGS_CXX_JDK) $(LIBCXX) $1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX)
endif endif
$1_CXXFLAGS:=$(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \ $1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \
$$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \ $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \
$(CXXFLAGS_DEBUG_SYMBOLS) $(CXXFLAGS_DEBUG_SYMBOLS)
ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH),waiters-sparc) ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH), waiters-sparc)
$1_FILTER:=-xregs=no%appl $1_FILTER := -xregs=no%appl
$1_CXXFLAGS:=$$(filter-out $$($1_FILTER),$$($1_CXXFLAGS)) $1_CXXFLAGS := $$(filter-out $$($1_FILTER), $$($1_CXXFLAGS))
endif endif
# Workaround for CFLAGS_JDKLIB containing ',' on solaris. If this is added as 'CFLAGS' to the # Workaround for CFLAGS_JDKLIB containing ',' on solaris. If this is added as 'CFLAGS' to the
# eval call below, the comma gets expanded too early. # eval call below, the comma gets expanded too early.
BUILD_DEMO_JVMTI_$1_CFLAGS:=$(CFLAGS_JDKLIB) $(CFLAGS_DEBUG_SYMBOLS) \ BUILD_DEMO_JVMTI_$1_CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_DEBUG_SYMBOLS) \
-I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
# Remove the -incremental:no setting to get .ilk-files like in the old build. # Remove the -incremental:no setting to get .ilk-files like in the old build.
$$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1,\ $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC),\ SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
LANG:=$$(BUILD_DEMO_JVMTI_$1_LANG),\ LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
OPTIMIZATION:=LOW,\ OPTIMIZATION := LOW, \
CXXFLAGS:=$$($1_CXXFLAGS),\ CXXFLAGS := $$($1_CXXFLAGS), \
LDFLAGS:=$(filter-out -incremental:no -opt:ref,$(LDFLAGS_JDKLIB)),\ LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
LDFLAGS_macosx:=$(call SET_EXECUTABLE_ORIGIN),\ LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
LDFLAGS_SUFFIX:=$$($1_EXTRA_CXX),\ LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
LDFLAGS_SUFFIX_posix:=$5,\ LDFLAGS_SUFFIX_posix := $5, \
LDFLAGS_SUFFIX_windows:=$6,\ LDFLAGS_SUFFIX_windows := $6, \
LDFLAGS_SUFFIX_solaris:=$7 -lc,\ LDFLAGS_SUFFIX_solaris := $7 -lc, \
LDFLAGS_SUFFIX_linux:=$8,\ LDFLAGS_SUFFIX_linux := $8, \
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS:=$$(RC_FLAGS) \ RC_FLAGS := $$(RC_FLAGS) \
-D "JDK_FNAME=$1.dll" \ -D "JDK_FNAME=$1.dll" \
-D "JDK_INTERNAL_NAME=$1" \ -D "JDK_INTERNAL_NAME=$1" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/demoobjs/jvmti/$1,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1, \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib,\ OUTPUT_DIR := $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib, \
LIBRARY:=$1)) LIBRARY := $1))
$$(eval $$(call SetupZipArchive,BUILD_DEMO_JVMTI_SRC_$1,\ $$(eval $$(call SetupZipArchive,BUILD_DEMO_JVMTI_SRC_$1, \
SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC),\ SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
EXCLUDE_FILES:=$$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE), \ EXCLUDE_FILES := $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE), \
ZIP:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip)) ZIP := $(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip))
$(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt : $(JDK_TOPDIR)/src/share/demo/jvmti/$1/README.txt $(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt: $(JDK_TOPDIR)/src/share/demo/jvmti/$1/README.txt
$$(call install-file) $$(call install-file)
$(CHMOD) -f ug+w $$@ $(CHMOD) -f ug+w $$@
ifneq (,$$(wildcard $(JDK_TOPDIR)/src/share/demo/jvmti/$1/*.java)) ifneq (, $$(wildcard $(JDK_TOPDIR)/src/share/demo/jvmti/$1/*.java))
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_JVMTI_$1_JAVA,\ $$(eval $$(call SetupJavaCompilation,BUILD_DEMO_JVMTI_$1_JAVA, \
SETUP:=GENERATE_USINGJDKBYTECODE,\ SETUP := GENERATE_USINGJDKBYTECODE, \
SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/$1,\ SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1, \
BIN:=$(JDK_OUTPUTDIR)/democlasses/jvmti/$1,\ BIN := $(JDK_OUTPUTDIR)/democlasses/jvmti/$1, \
COPY:=$(PATTERNS_TO_COPY),\ COPY := $(PATTERNS_TO_COPY), \
JAR:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar,\ JAR := $(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar, \
EXTRA_MANIFEST_ATTR:=Main-Class: \n,\ EXTRA_MANIFEST_ATTR := Main-Class: \n, \
MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf)) MANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf))
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar
endif endif
BUILD_DEMOS += $$(BUILD_DEMO_JVMTI_$1) \ BUILD_DEMOS += $$(BUILD_DEMO_JVMTI_$1) \
$(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip \ $(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip \
$(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt $(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
# These files normally end up in OBJECT_DIR but for demos they # These files normally end up in OBJECT_DIR but for demos they
# are supposed to be included in the distro. # are supposed to be included in the distro.
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib: $$(BUILD_DEMO_JVMTI_$1) $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib: $$(BUILD_DEMO_JVMTI_$1)
$(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.lib $$@ $(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.lib $$@
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp: $$(BUILD_DEMO_JVMTI_$1) $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp: $$(BUILD_DEMO_JVMTI_$1)
$(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.exp $$@ $(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.exp $$@
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib \ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib \
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp
endif endif
endef endef
$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util)) $(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util))
$(eval $(call SetupJVMTIDemo,gctest, agent_util)) $(eval $(call SetupJVMTIDemo,gctest, agent_util))
$(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo)) $(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo))
$(eval $(call SetupJVMTIDemo,heapViewer, agent_util)) $(eval $(call SetupJVMTIDemo,heapViewer, agent_util))
$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo,\ $(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \
-I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt,C,\ -I$(JDK_TOPDIR)/src/share/npt -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, C, \
-ldl,ws2_32.lib winmm.lib,-lsocket -lnsl,-lpthread)) -ldl, ws2_32.lib winmm.lib, -lsocket -lnsl, -lpthread))
$(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo)) $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
$(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo)) $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
$(eval $(call SetupJVMTIDemo,waiters, agent_util,,C++)) $(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++))
$(eval $(call SetupJVMTIDemo,versionCheck, agent_util)) $(eval $(call SetupJVMTIDemo,versionCheck, agent_util))
################################################################################################## ##################################################################################################
# The jpda demo (com/sun/tools/example) is oddly enough stored in src/share/classes. # The jpda demo (com/sun/tools/example) is oddly enough stored in src/share/classes.
# At least, we do not need to compile the jpda demo, just jar/zip up the sources. # At least, we do not need to compile the jpda demo, just jar/zip up the sources.
JPDA_SOURCES:=$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/tools/example) JPDA_SOURCES := $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example)
# The number of files are few enough so that we can use echo safely below to list them. # The number of files are few enough so that we can use echo safely below to list them.
JPDA_FILES:=$(subst $(JDK_TOPDIR)/src/share/classes/,,$(JPDA_SOURCES)) JPDA_FILES := $(subst $(JDK_TOPDIR)/src/share/classes/,,$(JPDA_SOURCES))
$(JDK_OUTPUTDIR)/demo/jpda/src.zip : $(JPDA_SOURCES) $(JDK_OUTPUTDIR)/demo/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/*") (cd $(JDK_TOPDIR)/src/share/classes && $(ZIP) -qru $@ com -i "com/sun/tools/example/*")
$(JDK_OUTPUTDIR)/demo/jpda/examples.jar : $(JPDA_SOURCES) $(JDK_OUTPUTDIR)/demo/jpda/examples.jar: $(JPDA_SOURCES)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $(@D)/_the.sources $(RM) $(@D)/_the.sources
$(call ListPathsSafely,JPDA_FILES,\n, >> $(@D)/_the.sources) $(call ListPathsSafely,JPDA_FILES,\n, >> $(@D)/_the.sources)
$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
-e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $(JDK_TOPDIR)/make/tools/manifest.mf > $(@D)/_the.manifest -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $(JDK_TOPDIR)/make/tools/manifest.mf > $(@D)/_the.manifest
$(ECHO) "Main-Class: " >> $(@D)/_the.manifest $(ECHO) "Main-Class: " >> $(@D)/_the.manifest
(cd $(JDK_TOPDIR)/src/share/classes && $(JAR) cfm $@ $(@D)/_the.manifest @$(@D)/_the.sources) (cd $(JDK_TOPDIR)/src/share/classes && $(JAR) cfm $@ $(@D)/_the.manifest @$(@D)/_the.sources)
(cd $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example && $(JAR) uf $@ README) (cd $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example && $(JAR) uf $@ README)
$(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README : $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example/README $(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README: $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example/README
$(call install-file) $(call install-file)
$(CHMOD) -f ug+w $@ $(CHMOD) -f ug+w $@
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jpda/src.zip $(JDK_OUTPUTDIR)/demo/jpda/examples.jar \ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jpda/src.zip $(JDK_OUTPUTDIR)/demo/jpda/examples.jar \
$(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README $(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README
################################################################################################## ##################################################################################################
$(JDK_OUTPUTDIR)/demo/management/index.html : $(JDK_TOPDIR)/src/share/demo/management/index.html $(JDK_OUTPUTDIR)/demo/management/index.html: $(JDK_TOPDIR)/src/share/demo/management/index.html
$(call install-file) $(call install-file)
$(CHMOD) -f ug+w $@ $(CHMOD) -f ug+w $@
$(JDK_OUTPUTDIR)/demo/jvmti/index.html : $(JDK_TOPDIR)/src/share/demo/jvmti/index.html $(JDK_OUTPUTDIR)/demo/jvmti/index.html: $(JDK_TOPDIR)/src/share/demo/jvmti/index.html
$(call install-file) $(call install-file)
$(CHMOD) -f ug+w $@ $(CHMOD) -f ug+w $@
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/management/index.html \ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/management/index.html \
$(JDK_OUTPUTDIR)/demo/jvmti/index.html $(JDK_OUTPUTDIR)/demo/jvmti/index.html
################################################################################################## ##################################################################################################
# The netbeans project files are copied into the demo directory. # The netbeans project files are copied into the demo directory.
BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%,\ BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%, \
$(JDK_OUTPUTDIR)/demo/nbproject/%,\ $(JDK_OUTPUTDIR)/demo/nbproject/%, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/demo/nbproject)) $(call CacheFind, $(JDK_TOPDIR)/src/share/demo/nbproject))
$(JDK_OUTPUTDIR)/demo/nbproject/% : $(JDK_TOPDIR)/src/share/demo/nbproject/% $(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/share/demo/nbproject/%
$(call install-file) $(call install-file)
$(CHMOD) -f ug+w $@ $(CHMOD) -f ug+w $@
...@@ -376,64 +377,64 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/README ...@@ -376,64 +377,64 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/README
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
$(JDK_OUTPUTDIR)/democlasses/jni/Poller/% : $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/% $(JDK_OUTPUTDIR)/democlasses/jni/Poller/%: $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/%
$(call install-file) $(call install-file)
$(CHMOD) -f ug+w $@ $(CHMOD) -f ug+w $@
$(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt : $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/README.txt $(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt: $(JDK_TOPDIR)/src/solaris/demo/jni/Poller/README.txt
$(call install-file) $(call install-file)
$(CHMOD) -f ug+w $@ $(CHMOD) -f ug+w $@
$(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar : \ $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar: \
$(JDK_OUTPUTDIR)/democlasses/jni/Poller/README.txt $(JDK_OUTPUTDIR)/democlasses/jni/Poller/Poller.c $(JDK_OUTPUTDIR)/democlasses/jni/Poller/README.txt $(JDK_OUTPUTDIR)/democlasses/jni/Poller/Poller.c
$(eval $(call SetupJavaCompilation,BUILD_DEMO_POLLER_JAR,\ $(eval $(call SetupJavaCompilation,BUILD_DEMO_POLLER_JAR, \
SETUP:=GENERATE_USINGJDKBYTECODE, \ SETUP := GENERATE_USINGJDKBYTECODE, \
SRC:=$(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \ SRC := $(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \
BIN:=$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \ BIN := $(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
HEADERS:=$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \ HEADERS := $(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
JAR:=$(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar, \ JAR := $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar, \
MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf, \ MANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf, \
SRCZIP:=$(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip, \ SRCZIP := $(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip, \
COPY:=README.txt Poller.c, \ COPY := README.txt Poller.c, \
JARMAIN:=Client)) JARMAIN := Client))
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar $(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip \ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar $(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip \
$(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt $(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt
$(eval $(call SetupNativeCompilation,BUILD_LIBPOLLER,\ $(eval $(call SetupNativeCompilation,BUILD_LIBPOLLER, \
SRC:=$(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \ SRC := $(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW,\ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) $(SHARED_LIBRARY_FLAGS) \ CFLAGS := $(CFLAGS_JDKLIB) $(SHARED_LIBRARY_FLAGS) \
-I$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \ -I$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
LDFLAGS:=$(LDFLAGS_JDKLIB), \ LDFLAGS := $(LDFLAGS_JDKLIB), \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/demoobjs/jni/Poller,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/demoobjs/jni/Poller, \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/demoobjs, \ OUTPUT_DIR := $(JDK_OUTPUTDIR)/demoobjs, \
LIBRARY:=Poller)) LIBRARY := Poller))
# #
# We can only compile native code after jar has been build (since we depend on generated .h files) # We can only compile native code after jar has been build (since we depend on generated .h files)
# #
$(JDK_OUTPUTDIR)/demoobjs/jni/Poller/Poller.o : $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar $(JDK_OUTPUTDIR)/demoobjs/jni/Poller/Poller.o: $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar
$(JDK_OUTPUTDIR)/demo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX) : \ $(JDK_OUTPUTDIR)/demo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX): \
$(JDK_OUTPUTDIR)/demoobjs/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX) $(JDK_OUTPUTDIR)/demoobjs/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX)
$(call install-file) $(call install-file)
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX) BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX)
endif endif
################################################################################################## ##################################################################################################
ifndef OPENJDK ifndef OPENJDK
DB_DEMO_ZIPFILE := $(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip) DB_DEMO_ZIPFILE := $(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip)
$(JDK_OUTPUTDIR)/demo/_the.db.unzipped: $(DB_DEMO_ZIPFILE) $(JDK_OUTPUTDIR)/demo/_the.db.unzipped: $(DB_DEMO_ZIPFILE)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) -r $(JDK_OUTPUTDIR)/demo/db $(JDK_OUTPUTDIR)/demo/demo $(RM) -r $(JDK_OUTPUTDIR)/demo/db $(JDK_OUTPUTDIR)/demo/demo
$(CD) $(JDK_OUTPUTDIR)/demo && $(UNZIP) -q -o $< $(CD) $(JDK_OUTPUTDIR)/demo && $(UNZIP) -q -o $<
...@@ -441,14 +442,14 @@ ifndef OPENJDK ...@@ -441,14 +442,14 @@ ifndef OPENJDK
$(CD) $(JDK_OUTPUTDIR)/demo && $(RM) -r db-derby-*-bin $(CD) $(JDK_OUTPUTDIR)/demo && $(RM) -r db-derby-*-bin
$(TOUCH) $@ $(TOUCH) $@
# Copy this after the unzip above to avoid race with directory creation and mv command. # Copy this after the unzip above to avoid race with directory creation and mv command.
$(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html: \ $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html: \
$(JDK_TOPDIR)/src/closed/share/db/README-JDK-DEMOS.html \ $(JDK_TOPDIR)/src/closed/share/db/README-JDK-DEMOS.html \
| $(JDK_OUTPUTDIR)/demo/_the.db.unzipped | $(JDK_OUTPUTDIR)/demo/_the.db.unzipped
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@ $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/_the.db.unzipped $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/_the.db.unzipped $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html
endif endif
################################################################################################## ##################################################################################################
......
makefiles/CompileJavaClasses.gmk
浏览文件 @ e864d64d
...@@ -38,201 +38,201 @@ EXCLUDES := ...@@ -38,201 +38,201 @@ EXCLUDES :=
########################################################################################## ##########################################################################################
EXCLUDES += com/sun/pept \ EXCLUDES += com/sun/pept \
com/sun/tools/example/trace\ com/sun/tools/example/trace \
com/sun/tools/example/debug/bdi\ com/sun/tools/example/debug/bdi \
com/sun/tools/example/debug/event\ com/sun/tools/example/debug/event \
com/sun/tools/example/debug/gui com/sun/tools/example/debug/gui
ifdef OPENJDK ifdef OPENJDK
EXCLUDES+= sun/dc \ EXCLUDES += sun/dc \
com/sun/jmx/snmp \ com/sun/jmx/snmp \
sun/management/snmp \ sun/management/snmp \
com/sun/script com/sun/script
endif endif
ifndef OPENJDK ifndef OPENJDK
# There exists two versions of this file... # There exists two versions of this file...
EXFILES := $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java EXFILES := $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
# This gets built on unix platforms implicitly in the old build even though # This gets built on unix platforms implicitly in the old build even though
# it's excluded in the closed build. # it's excluded in the closed build.
EXCLUDES+=sun/java2d/pisces EXCLUDES += sun/java2d/pisces
# AccessBridge is compiled separately below. # AccessBridge is compiled separately below.
EXFILES += AccessBridge.java \ EXFILES += AccessBridge.java \
AccessBridgeLoader.java \ AccessBridgeLoader.java \
com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java
# This seems to never be built # This seems to never be built
EXCLUDES += com/sun/java/accessibility/extensions EXCLUDES += com/sun/java/accessibility/extensions
endif endif
endif endif
ifneq ($(OPENJDK_TARGET_OS),solaris) ifneq ($(OPENJDK_TARGET_OS), solaris)
# Exclude Solaris nio and two security related files in src/share/classes # Exclude Solaris nio and two security related files in src/share/classes
EXFILES += SolarisAclFileAttributeView.java \ EXFILES += SolarisAclFileAttributeView.java \
SolarisFileStore.java \ SolarisFileStore.java \
SolarisFileSystem.java \ SolarisFileSystem.java \
SolarisFileSystemProvider.java \ SolarisFileSystemProvider.java \
SolarisNativeDispatcher.java \ SolarisNativeDispatcher.java \
SolarisUserDefinedFileAttributeView.java \ SolarisUserDefinedFileAttributeView.java \
SolarisWatchService.java \ SolarisWatchService.java \
SolarisAclFileAttributeView.java \ SolarisAclFileAttributeView.java \
SolarisLoginModule.java \ SolarisLoginModule.java \
SolarisSystem.java \ SolarisSystem.java \
sun/nio/ch/DevPollArrayWrapper.java \ sun/nio/ch/DevPollArrayWrapper.java \
sun/nio/ch/DevPollSelectorImpl.java \ sun/nio/ch/DevPollSelectorImpl.java \
sun/nio/ch/DevPollSelectorProvider.java \ sun/nio/ch/DevPollSelectorProvider.java \
sun/nio/ch/EventPortSelectorImpl.java \ sun/nio/ch/EventPortSelectorImpl.java \
sun/nio/ch/EventPortSelectorProvider.java \ sun/nio/ch/EventPortSelectorProvider.java \
sun/nio/ch/EventPortWrapper.java \ sun/nio/ch/EventPortWrapper.java \
sun/nio/ch/SolarisAsynchronousChannelProvider.java \ sun/nio/ch/SolarisAsynchronousChannelProvider.java \
sun/nio/ch/SolarisEventPort.java \ sun/nio/ch/SolarisEventPort.java \
sun/tools/attach/SolarisAttachProvider.java \ sun/tools/attach/SolarisAttachProvider.java \
sun/tools/attach/SolarisVirtualMachine.java sun/tools/attach/SolarisVirtualMachine.java
EXCLUDES += com/oracle/security EXCLUDES += com/oracle/security
endif endif
# In the old build, this isn't excluded on macosx, even though it probably # In the old build, this isn't excluded on macosx, even though it probably
# should be. # should be.
ifneq ($(OPENJDK_TARGET_OS),macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
EXFILES+=WrapperGenerator.java EXFILES += WrapperGenerator.java
endif endif
ifneq ($(OPENJDK_TARGET_OS),windows) ifneq ($(OPENJDK_TARGET_OS), windows)
# Exclude Window security related files in src/share/classes # Exclude Window security related files in src/share/classes
EXFILES+=NTLoginModule.java \ EXFILES += NTLoginModule.java \
NTSystem.java NTSystem.java
else else
EXFILES+=UnixLoginModule.java \ EXFILES += UnixLoginModule.java \
UnixSystem.java UnixSystem.java
endif endif
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
# Don't build GTK L&F on Windows # Don't build GTK L&F on Windows
EXCLUDES+=com/sun/java/swing/plaf/gtk EXCLUDES += com/sun/java/swing/plaf/gtk
endif endif
ifneq ($(OPENJDK_TARGET_OS),linux) ifneq ($(OPENJDK_TARGET_OS), linux)
EXFILES+=sun/tools/attach/LinuxAttachProvider.java \ EXFILES += sun/tools/attach/LinuxAttachProvider.java \
sun/tools/attach/LinuxVirtualMachine.java \ sun/tools/attach/LinuxVirtualMachine.java \
sun/nio/ch/EPoll.java \ sun/nio/ch/EPoll.java \
sun/nio/ch/EPollArrayWrapper.java \ sun/nio/ch/EPollArrayWrapper.java \
sun/nio/ch/EPollPort.java \ sun/nio/ch/EPollPort.java \
sun/nio/ch/EPollSelectorImpl.java \ sun/nio/ch/EPollSelectorImpl.java \
sun/nio/ch/EPollSelectorProvider.java \ sun/nio/ch/EPollSelectorProvider.java \
sun/nio/ch/LinuxAsynchronousChannelProvider.java \ sun/nio/ch/LinuxAsynchronousChannelProvider.java \
sun/nio/fs/LinuxDosFileAttributeView.java \ sun/nio/fs/LinuxDosFileAttributeView.java \
sun/nio/fs/LinuxFileStore.java \ sun/nio/fs/LinuxFileStore.java \
sun/nio/fs/LinuxFileSystem.java \ sun/nio/fs/LinuxFileSystem.java \
sun/nio/fs/LinuxFileSystemProvider.java \ sun/nio/fs/LinuxFileSystemProvider.java \
sun/nio/fs/MagicFileTypeDetector.java \ sun/nio/fs/MagicFileTypeDetector.java \
sun/nio/fs/LinuxNativeDispatcher.java \ sun/nio/fs/LinuxNativeDispatcher.java \
sun/nio/fs/LinuxUserDefinedFileAttributeView.java \ sun/nio/fs/LinuxUserDefinedFileAttributeView.java \
sun/nio/fs/LinuxWatchService.java sun/nio/fs/LinuxWatchService.java
endif endif
ifneq ($(OPENJDK_TARGET_OS),macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
EXFILES+=sun/nio/ch/BsdAsynchronousChannelProvider.java \ EXFILES += sun/nio/ch/BsdAsynchronousChannelProvider.java \
sun/nio/ch/KQueue.java \ sun/nio/ch/KQueue.java \
sun/nio/ch/KQueuePort.java \ sun/nio/ch/KQueuePort.java \
sun/nio/fs/BsdFileStore.java \ sun/nio/fs/BsdFileStore.java \
sun/nio/fs/BsdFileSystem.java \ sun/nio/fs/BsdFileSystem.java \
sun/nio/fs/BsdFileSystemProvider.java \ sun/nio/fs/BsdFileSystemProvider.java \
sun/nio/fs/BsdNativeDispatcher.java \ sun/nio/fs/BsdNativeDispatcher.java \
sun/nio/fs/MacOSXFileSystemProvider.java \ sun/nio/fs/MacOSXFileSystemProvider.java \
sun/nio/fs/MacOSXFileSystem.java \ sun/nio/fs/MacOSXFileSystem.java \
sun/nio/fs/MacOSXNativeDispatcher.java \ sun/nio/fs/MacOSXNativeDispatcher.java \
sun/tools/attach/BsdAttachProvider.java \ sun/tools/attach/BsdAttachProvider.java \
sun/tools/attach/BsdVirtualMachine.java sun/tools/attach/BsdVirtualMachine.java
endif endif
# Exclude BreakIterator classes that are just used in compile process to generate # Exclude BreakIterator classes that are just used in compile process to generate
# data files and shouldn't go in the product # data files and shouldn't go in the product
EXFILES+=sun/text/resources/BreakIteratorRules.java \ EXFILES += sun/text/resources/BreakIteratorRules.java \
sun/text/resources/BreakIteratorRules_th.java sun/text/resources/BreakIteratorRules_th.java
# TODO: Add BUILD_HEADLESS_ONLY to configure? # TODO: Add BUILD_HEADLESS_ONLY to configure?
ifdef BUILD_HEADLESS_ONLY ifdef BUILD_HEADLESS_ONLY
EXCLUDES+=sun/applet EXCLUDES += sun/applet
endif endif
ifdef OPENJDK ifdef OPENJDK
EXCLUDES+=sun/java2d/cmm/kcms EXCLUDES += sun/java2d/cmm/kcms
endif endif
# Used on windows and macosx # Used on windows and macosx
ifeq (,$(filter $(OPENJDK_TARGET_OS), windows macosx)) ifeq (, $(filter $(OPENJDK_TARGET_OS), windows macosx))
EXFILES+=sun/awt/AWTCharset.java EXFILES += sun/awt/AWTCharset.java
endif endif
ifneq ($(OPENJDK_TARGET_OS), macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
EXFILES+=sun/awt/X11/ScreenFormat.java \ EXFILES += sun/awt/X11/ScreenFormat.java \
sun/awt/X11/XArc.java \ sun/awt/X11/XArc.java \
sun/awt/X11/XChar2b.java \ sun/awt/X11/XChar2b.java \
sun/awt/X11/XCharStruct.java \ sun/awt/X11/XCharStruct.java \
sun/awt/X11/XClassHint.java \ sun/awt/X11/XClassHint.java \
sun/awt/X11/XComposeStatus.java \ sun/awt/X11/XComposeStatus.java \
sun/awt/X11/XExtCodes.java \ sun/awt/X11/XExtCodes.java \
sun/awt/X11/XFontProp.java \ sun/awt/X11/XFontProp.java \
sun/awt/X11/XFontSetExtents.java \ sun/awt/X11/XFontSetExtents.java \
sun/awt/X11/XFontStruct.java \ sun/awt/X11/XFontStruct.java \
sun/awt/X11/XGCValues.java \ sun/awt/X11/XGCValues.java \
sun/awt/X11/XHostAddress.java \ sun/awt/X11/XHostAddress.java \
sun/awt/X11/XIMCallback.java \ sun/awt/X11/XIMCallback.java \
sun/awt/X11/XIMHotKeyTrigger.java \ sun/awt/X11/XIMHotKeyTrigger.java \
sun/awt/X11/XIMHotKeyTriggers.java \ sun/awt/X11/XIMHotKeyTriggers.java \
sun/awt/X11/XIMPreeditCaretCallbackStruct.java \ sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
sun/awt/X11/XIMPreeditDrawCallbackStruct.java \ sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \ sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
sun/awt/X11/XIMStatusDrawCallbackStruct.java \ sun/awt/X11/XIMStatusDrawCallbackStruct.java \
sun/awt/X11/XIMStringConversionCallbackStruct.java \ sun/awt/X11/XIMStringConversionCallbackStruct.java \
sun/awt/X11/XIMStringConversionText.java \ sun/awt/X11/XIMStringConversionText.java \
sun/awt/X11/XIMStyles.java \ sun/awt/X11/XIMStyles.java \
sun/awt/X11/XIMText.java \ sun/awt/X11/XIMText.java \
sun/awt/X11/XIMValuesList.java \ sun/awt/X11/XIMValuesList.java \
sun/awt/X11/XImage.java \ sun/awt/X11/XImage.java \
sun/awt/X11/XKeyboardControl.java \ sun/awt/X11/XKeyboardControl.java \
sun/awt/X11/XKeyboardState.java \ sun/awt/X11/XKeyboardState.java \
sun/awt/X11/XOMCharSetList.java \ sun/awt/X11/XOMCharSetList.java \
sun/awt/X11/XOMFontInfo.java \ sun/awt/X11/XOMFontInfo.java \
sun/awt/X11/XOMOrientation.java \ sun/awt/X11/XOMOrientation.java \
sun/awt/X11/XPoint.java \ sun/awt/X11/XPoint.java \
sun/awt/X11/XRectangle.java \ sun/awt/X11/XRectangle.java \
sun/awt/X11/XSegment.java \ sun/awt/X11/XSegment.java \
sun/awt/X11/XStandardColormap.java \ sun/awt/X11/XStandardColormap.java \
sun/awt/X11/XTextItem.java \ sun/awt/X11/XTextItem.java \
sun/awt/X11/XTextItem16.java \ sun/awt/X11/XTextItem16.java \
sun/awt/X11/XTextProperty.java \ sun/awt/X11/XTextProperty.java \
sun/awt/X11/XTimeCoord.java \ sun/awt/X11/XTimeCoord.java \
sun/awt/X11/XWindowChanges.java \ sun/awt/X11/XWindowChanges.java \
sun/awt/X11/XdbeSwapInfo.java \ sun/awt/X11/XdbeSwapInfo.java \
sun/awt/X11/XmbTextItem.java \ sun/awt/X11/XmbTextItem.java \
sun/awt/X11/XwcTextItem.java sun/awt/X11/XwcTextItem.java
endif endif
# Exclude another implicitly not included file. # Exclude another implicitly not included file.
EXFILES+=sun/util/locale/AsciiUtil.java EXFILES += sun/util/locale/AsciiUtil.java
ifeq (,$(filter $(OPENJDK_TARGET_OS), solaris macosx)) ifeq (, $(filter $(OPENJDK_TARGET_OS), solaris macosx))
# #
# only solaris and macosx # only solaris and macosx
# #
EXFILES+=sun/nio/fs/PollingWatchService.java EXFILES += sun/nio/fs/PollingWatchService.java
endif endif
# TODO: Fix when converting NIO # TODO: Fix when converting NIO
# Exclude *-linux-arm.java and *-linux-ppc.java from closed. # Exclude *-linux-arm.java and *-linux-ppc.java from closed.
EXFILES+=-linux-arm.java \ EXFILES += -linux-arm.java \
-linux-ppc.java -linux-ppc.java
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
EXFILES+=sun/nio/ch/AbstractPollSelectorImpl.java \ EXFILES += sun/nio/ch/AbstractPollSelectorImpl.java \
sun/nio/ch/PollSelectorProvider.java \ sun/nio/ch/PollSelectorProvider.java \
sun/nio/ch/SimpleAsynchronousFileChannelImpl.java sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
endif endif
# These files do not appear in the build result of the old build. This # These files do not appear in the build result of the old build. This
...@@ -242,43 +242,43 @@ endif ...@@ -242,43 +242,43 @@ endif
# be picked up by implicit compilation. On a rebuild, they are picked up # be picked up by implicit compilation. On a rebuild, they are picked up
# and compiled. Exclude them here to produce the same rt.jar as the old # and compiled. Exclude them here to produce the same rt.jar as the old
# build does when building just once. # build does when building just once.
EXFILES+=javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \ EXFILES += javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \ javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
javax/swing/plaf/nimbus/ScrollBarPainter.java \ javax/swing/plaf/nimbus/ScrollBarPainter.java \
javax/swing/plaf/nimbus/SliderPainter.java \ javax/swing/plaf/nimbus/SliderPainter.java \
javax/swing/plaf/nimbus/SpinnerPainter.java \ javax/swing/plaf/nimbus/SpinnerPainter.java \
javax/swing/plaf/nimbus/SplitPanePainter.java \ javax/swing/plaf/nimbus/SplitPanePainter.java \
javax/swing/plaf/nimbus/TabbedPanePainter.java javax/swing/plaf/nimbus/TabbedPanePainter.java
# Acquire a list of files that should be copied straight over to the classes. # Acquire a list of files that should be copied straight over to the classes.
include CopyIntoClasses.gmk include CopyIntoClasses.gmk
# Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA # Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA
ifndef OPENJDK ifndef OPENJDK
CLOSED_SRC_DIRS:=$(JDK_TOPDIR)/src/closed/share/classes \ CLOSED_SRC_DIRS := $(JDK_TOPDIR)/src/closed/share/classes \
$(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
endif endif
MACOSX_SRC_DIRS := MACOSX_SRC_DIRS :=
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes
# this files are duplicated in MACOSX_SRC_DIRS # this files are duplicated in MACOSX_SRC_DIRS
EXFILES+= $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java \ 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/sun/java2d/BackBufferCapsProvider.java \
$(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \ $(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \
$(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \ $(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \
$(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \ $(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java \ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java \
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java
# JObjC.jar contains 1.5 byte-code...so skip it here :-( # JObjC.jar contains 1.5 byte-code...so skip it here :-(
# MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/jobjc/src # MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/jobjc/src
# EXCLUDES+= tests/java/com/apple/jobjc # EXCLUDES += tests/java/com/apple/jobjc
EXCLUDES+= com/apple/jobjc EXCLUDES += com/apple/jobjc
endif endif
# The exception handling of swing beaninfo # The exception handling of swing beaninfo
...@@ -291,23 +291,23 @@ $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/t ...@@ -291,23 +291,23 @@ $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/t
# JDK_FILTER at the make command line, only a subset of the JDK java files will # JDK_FILTER at the make command line, only a subset of the JDK java files will
# be recompiled. If multiple paths are separated by comma, convert that into a # be recompiled. If multiple paths are separated by comma, convert that into a
# space separated list. # space separated list.
JDK_USER_DEFINED_FILTER:=$(strip $(subst $(COMMA),$(SPACE),$(JDK_FILTER))) JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
$(eval $(call SetupJavaCompilation,BUILD_JDK,\ $(eval $(call SetupJavaCompilation,BUILD_JDK, \
SETUP:=GENERATE_JDKBYTECODE,\ SETUP := GENERATE_JDKBYTECODE, \
SRC:=$(JDK_TOPDIR)/src/share/classes \ SRC := $(JDK_TOPDIR)/src/share/classes \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
$(MACOSX_SRC_DIRS) \ $(MACOSX_SRC_DIRS) \
$(JDK_OUTPUTDIR)/gensrc \ $(JDK_OUTPUTDIR)/gensrc \
$(JDK_OUTPUTDIR)/gensrc_no_srczip \ $(JDK_OUTPUTDIR)/gensrc_no_srczip \
$(CLOSED_SRC_DIRS),\ $(CLOSED_SRC_DIRS), \
INCLUDES:=$(JDK_USER_DEFINED_FILTER),\ INCLUDES := $(JDK_USER_DEFINED_FILTER), \
EXCLUDES:=$(EXCLUDES),\ EXCLUDES := $(EXCLUDES), \
EXCLUDE_FILES:=$(EXFILES),\ EXCLUDE_FILES := $(EXFILES), \
BIN:=$(JDK_OUTPUTDIR)/classes,\ BIN := $(JDK_OUTPUTDIR)/classes, \
COPY:=$(COPY_PATTERNS),\ COPY := $(COPY_PATTERNS), \
COPY_FILES:=$(COPY_FILES),\ COPY_FILES := $(COPY_FILES), \
HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers)) HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers))
########################################################################################## ##########################################################################################
...@@ -317,85 +317,85 @@ $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin: ...@@ -317,85 +317,85 @@ $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin:
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
# #
# JObjC.jar is compiled with BOOT_JAVAC which (may) not support the "-h" flag. # JObjC.jar is compiled with BOOT_JAVAC which (may) not support the "-h" flag.
# so we first compile classes with BOOT_JAVAC and then with JDK_JAVAC :-( # so we first compile classes with BOOT_JAVAC and then with JDK_JAVAC :-(
# #
$(eval $(call SetupJavaCompiler,GENERATE_15BYTECODE,\ $(eval $(call SetupJavaCompiler,GENERATE_15BYTECODE, \
JAVAC:=$(JAVAC),\ JAVAC := $(JAVAC), \
FLAGS:=-source 1.5 -target 1.5 -g -bootclasspath $(BOOT_RTJAR) -cp $(JDK_OUTPUTDIR)/../langtools/dist/lib/classes.jar $(DISABLE_WARNINGS),\ FLAGS := -source 1.5 -target 1.5 -g -bootclasspath $(BOOT_RTJAR) -cp $(JDK_OUTPUTDIR)/../langtools/dist/lib/classes.jar $(DISABLE_WARNINGS), \
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
$(eval $(call SetupJavaCompilation,BUILD_JOBJC,\ $(eval $(call SetupJavaCompilation,BUILD_JOBJC, \
SETUP:=GENERATE_15BYTECODE,\ SETUP := GENERATE_15BYTECODE, \
DISABLE_SJAVAC:=true,\ DISABLE_SJAVAC := true, \
SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \ SRC := $(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
$(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \ $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
$(JDK_OUTPUTDIR)/gensrc_jobjc/src, \ $(JDK_OUTPUTDIR)/gensrc_jobjc/src, \
INCLUDES := com/apple/jobjc,\ INCLUDES := com/apple/jobjc, \
EXCLUDES := tests/java/com/apple/jobjc,\ EXCLUDES := tests/java/com/apple/jobjc, \
BIN:=$(JDK_OUTPUTDIR)/jobjc_classes,\ BIN := $(JDK_OUTPUTDIR)/jobjc_classes, \
JAR:=$(JDK_OUTPUTDIR)/lib/JObjC.jar, \ JAR := $(JDK_OUTPUTDIR)/lib/JObjC.jar, \
JARINDEX := true)) JARINDEX := true))
$(BUILD_JOBJC) : $(BUILD_JDK) $(BUILD_JOBJC): $(BUILD_JDK)
$(eval $(call SetupJavaCompilation,BUILD_JOBJC_HEADERS,\ $(eval $(call SetupJavaCompilation,BUILD_JOBJC_HEADERS, \
SETUP:=GENERATE_JDKBYTECODE,\ SETUP := GENERATE_JDKBYTECODE, \
SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \ SRC := $(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
$(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \ $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
$(JDK_OUTPUTDIR)/gensrc_jobjc/src, \ $(JDK_OUTPUTDIR)/gensrc_jobjc/src, \
INCLUDES := com/apple/jobjc,\ INCLUDES := com/apple/jobjc, \
EXCLUDES := tests/java/com/apple/jobjc,\ EXCLUDES := tests/java/com/apple/jobjc, \
BIN:=$(JDK_OUTPUTDIR)/jobjc_classes_headers,\ BIN := $(JDK_OUTPUTDIR)/jobjc_classes_headers, \
HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers_jobjc)) HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers_jobjc))
$(BUILD_JOBJC_HEADERS) : $(BUILD_JDK) $(BUILD_JOBJC_HEADERS): $(BUILD_JDK)
endif endif
########################################################################################## ##########################################################################################
ifndef OPENJDK ifndef OPENJDK
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
$(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_32,\ $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_32, \
SETUP:=GENERATE_JDKBYTECODE,\ SETUP := GENERATE_JDKBYTECODE, \
JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \
SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/32bit,\ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/32bit, \
BIN:=$(JDK_OUTPUTDIR)/classes_ab/32bit)) BIN := $(JDK_OUTPUTDIR)/classes_ab/32bit))
$(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK) $(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK)
$(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_LEGACY,\ $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_LEGACY, \
SETUP:=GENERATE_JDKBYTECODE,\ SETUP := GENERATE_JDKBYTECODE, \
JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \
SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/legacy,\ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/legacy, \
BIN:=$(JDK_OUTPUTDIR)/classes_ab/legacy)) BIN := $(JDK_OUTPUTDIR)/classes_ab/legacy))
$(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK) $(BUILD_ACCESSBRIDGE_LEGACY): $(BUILD_JDK)
else else
$(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_64,\ $(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_64, \
SETUP:=GENERATE_JDKBYTECODE,\ SETUP := GENERATE_JDKBYTECODE, \
JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\ JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \
SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/64bit,\ SRC := $(JDK_OUTPUTDIR)/gensrc_ab/64bit, \
BIN:=$(JDK_OUTPUTDIR)/classes_ab/64bit)) BIN := $(JDK_OUTPUTDIR)/classes_ab/64bit))
$(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK) $(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK)
endif endif
endif endif
endif endif
########################################################################################## ##########################################################################################
all: $(BUILD_JDK) $(BUILD_JOBJC) $(BUILD_JOBJC_HEADERS) $(COPY_EXTRA) \ all: $(BUILD_JDK) $(BUILD_JOBJC) $(BUILD_JOBJC_HEADERS) $(COPY_EXTRA) \
$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \ $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
$(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \ $(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \
$(BUILD_ACCESSBRIDGE_LEGACY) $(BUILD_ACCESSBRIDGE_LEGACY)
.PHONY: all .PHONY: all
makefiles/CompileLaunchers.gmk
浏览文件 @ e864d64d
...@@ -33,26 +33,26 @@ include NativeCompilation.gmk ...@@ -33,26 +33,26 @@ include NativeCompilation.gmk
include Setup.gmk include Setup.gmk
# Prepare the find cache. Only used on windows. # Prepare the find cache. Only used on windows.
$(eval $(call FillCacheFind,$(JDK_TOPDIR)/src/share/bin)) $(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/share/bin))
# Build tools # Build tools
include Tools.gmk include Tools.gmk
BUILD_LAUNCHERS= BUILD_LAUNCHERS =
# When building a legacy overlay image (on solaris 64 bit), the launchers # When building a legacy overlay image (on solaris 64 bit), the launchers
# need to be built with a different rpath and a different output dir. # need to be built with a different rpath and a different output dir.
ifeq ($(OVERLAY_IMAGES),true) ifeq ($(OVERLAY_IMAGES), true)
ORIGIN_ROOT:=/../.. ORIGIN_ROOT := /../..
OUTPUT_SUBDIR:=$(OPENJDK_TARGET_CPU_ISADIR) OUTPUT_SUBDIR := $(OPENJDK_TARGET_CPU_ISADIR)
else else
ORIGIN_ROOT:=/.. ORIGIN_ROOT := /..
endif endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN) ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
else else
ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
endif endif
# #
...@@ -60,157 +60,157 @@ endif ...@@ -60,157 +60,157 @@ endif
# System.loadLibrary("jawt") first. This was the behaviour described in the # System.loadLibrary("jawt") first. This was the behaviour described in the
# devloper documentation of JAWT and what worked with OpenJDK6. # devloper documentation of JAWT and what worked with OpenJDK6.
# #
ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),) ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), )
ORIGIN_ARG+=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR))
endif endif
define SetupLauncher define SetupLauncher
# TODO: Fix mapfile on solaris. Won't work with ld as linker. # TODO: Fix mapfile on solaris. Won't work with ld as linker.
# Parameter 1 is the name of the launcher (java,javac,jar...) # Parameter 1 is the name of the launcher (java, javac, jar...)
# Parameter 2 is extra CFLAGS # Parameter 2 is extra CFLAGS
# Parameter 3 is extra LDFLAGS # Parameter 3 is extra LDFLAGS
# Parameter 4 is extra LDFLAGS_SUFFIX_posix # Parameter 4 is extra LDFLAGS_SUFFIX_posix
# Parameter 5 is extra LDFLAGS_SUFFIX_windows # Parameter 5 is extra LDFLAGS_SUFFIX_windows
# Parameter 6 is optional Windows JLI library (full path) # Parameter 6 is optional Windows JLI library (full path)
# Parameter 7 is optional Windows resource (RC) flags # Parameter 7 is optional Windows resource (RC) flags
# Parameter 8 is optional Windows version resource file (.rc) # Parameter 8 is optional Windows version resource file (.rc)
# Parameter 9 is different output dir # Parameter 9 is different output dir
# Parameter 10 if set, link statically with c runtime on windows. # Parameter 10 if set, link statically with c runtime on windows.
# Parameter 11 if set, override plist file on macosx. # Parameter 11 if set, override plist file on macosx.
$1_WINDOWS_JLI_LIB:=$(JDK_OUTPUTDIR)/objs/libjli/jli.lib $1_WINDOWS_JLI_LIB := $(JDK_OUTPUTDIR)/objs/libjli/jli.lib
ifneq ($6,) ifneq ($6, )
$1_WINDOWS_JLI_LIB:=$6 $1_WINDOWS_JLI_LIB := $6
endif endif
$1_VERSION_INFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc $1_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc
ifneq ($8,) ifneq ($8, )
$1_VERSION_INFO_RESOURCE:=$8 $1_VERSION_INFO_RESOURCE := $8
endif
$1_LDFLAGS := $3
$1_LDFLAGS_SUFFIX :=
ifeq ($(OPENJDK_TARGET_OS), macosx)
$1_PLIST_FILE := Info-cmdline.plist
ifneq ($(11), )
$1_PLIST_FILE := $(11)
ifneq ($$(findstring privileged, $$($1_PLIST_FILE)), )
$1_CODESIGN := true
endif
endif endif
$1_LDFLAGS := $3 $1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
$1_LDFLAGS_SUFFIX := -framework Cocoa -framework Security -framework ApplicationServices \
ifeq ($(OPENJDK_TARGET_OS), macosx) -sectcreate __TEXT __info_plist $(JDK_TOPDIR)/src/macosx/lib/$$($1_PLIST_FILE)
$1_PLIST_FILE:=Info-cmdline.plist
ifneq ($(11),)
$1_PLIST_FILE:=$(11)
ifneq ($$(findstring privileged,$$($1_PLIST_FILE)),)
$1_CODESIGN:=true
endif
endif
$1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
-framework Cocoa -framework Security -framework ApplicationServices \
-sectcreate __TEXT __info_plist $(JDK_TOPDIR)/src/macosx/lib/$$($1_PLIST_FILE)
$1_LDFLAGS_SUFFIX += -pthread $1_LDFLAGS_SUFFIX += -pthread
endif endif
ifeq ($(USE_EXTERNAL_LIBZ), true) ifeq ($(USE_EXTERNAL_LIBZ), true)
$1_LDFLAGS_SUFFIX += -lz $1_LDFLAGS_SUFFIX += -lz
endif endif
$1_OUTPUT_DIR_ARG:=$9 $1_OUTPUT_DIR_ARG := $9
ifeq (,$$($1_OUTPUT_DIR_ARG)) ifeq (, $$($1_OUTPUT_DIR_ARG))
$1_OUTPUT_DIR_ARG:=$(JDK_OUTPUTDIR)/bin $1_OUTPUT_DIR_ARG := $(JDK_OUTPUTDIR)/bin
endif endif
# TODO: maybe it's better to move this if-statement out of this function # TODO: maybe it's better to move this if-statement out of this function
ifeq ($1,java) ifeq ($1, java)
$1_OPTIMIZATION_ARG:=HIGH $1_OPTIMIZATION_ARG := HIGH
$1_LDFLAGS_solaris:=-R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR) $1_LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR)
else else
$1_OPTIMIZATION_ARG:=LOW $1_OPTIMIZATION_ARG := LOW
endif endif
$1_CFLAGS:=$(CFLAGS_JDKEXE) $1_CFLAGS := $(CFLAGS_JDKEXE)
ifeq ($(10),true) ifeq ($(10), true)
$1_CFLAGS:=$(filter-out -MD,$(CFLAGS_JDKEXE)) $1_CFLAGS := $(filter-out -MD, $(CFLAGS_JDKEXE))
endif endif
ifneq ($(wildcard $(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)),) ifneq ($(wildcard $(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), )
$1_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU) $1_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)
else else
$1_MAPFILE:= $1_MAPFILE :=
endif endif
$(call SetupNativeCompilation,BUILD_LAUNCHER_$1,\ $(call SetupNativeCompilation,BUILD_LAUNCHER_$1, \
SRC:=$(JDK_TOPDIR)/src/share/bin,\ SRC := $(JDK_TOPDIR)/src/share/bin, \
INCLUDE_FILES:=main.c,\ INCLUDE_FILES := main.c, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=$$($1_OPTIMIZATION_ARG), \ OPTIMIZATION := $$($1_OPTIMIZATION_ARG), \
CFLAGS:=$$($1_CFLAGS) \ CFLAGS := $$($1_CFLAGS) \
-I$(JDK_TOPDIR)/src/share/bin \ -I$(JDK_TOPDIR)/src/share/bin \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS)/bin \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS)/bin \
-DFULL_VERSION='"$(FULL_VERSION)"' \ -DFULL_VERSION='"$(FULL_VERSION)"' \
-DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
-DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \ -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
-DLIBARCHNAME='"$(OPENJDK_TARGET_CPU_LEGACY)"' \ -DLIBARCHNAME='"$(OPENJDK_TARGET_CPU_LEGACY)"' \
-DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \ -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
-DPROGNAME='"$1"' $(DPACKAGEPATH) \ -DPROGNAME='"$1"' $(DPACKAGEPATH) \
$2,\ $2, \
CFLAGS_linux:=-fPIC,\ CFLAGS_linux := -fPIC, \
CFLAGS_solaris:=-KPIC -DHAVE_GETHRTIME,\ CFLAGS_solaris := -KPIC -DHAVE_GETHRTIME, \
LDFLAGS:=$(LDFLAGS_JDKEXE) \ LDFLAGS := $(LDFLAGS_JDKEXE) \
$(ORIGIN_ARG) \ $(ORIGIN_ARG) \
$$($1_LDFLAGS),\ $$($1_LDFLAGS), \
LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_NAME,$1),\ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \
LDFLAGS_linux:=-lpthread \ LDFLAGS_linux := -lpthread \
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)),\ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
LDFLAGS_solaris:=$$($1_LDFLAGS_solaris) \ LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)),\ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
MAPFILE := $$($1_MAPFILE), \ MAPFILE := $$($1_MAPFILE), \
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX),\ LDFLAGS_SUFFIX := $(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX), \
LDFLAGS_SUFFIX_posix:=$4,\ LDFLAGS_SUFFIX_posix := $4, \
LDFLAGS_SUFFIX_windows:=$$($1_WINDOWS_JLI_LIB) \ LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \
$(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5,\ $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5, \
LDFLAGS_SUFFIX_linux:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \ LDFLAGS_SUFFIX_linux := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
LDFLAGS_SUFFIX_solaris:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \ LDFLAGS_SUFFIX_solaris := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR),\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR), \
OUTPUT_DIR:=$$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR),\ OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \
PROGRAM:=$1,\ PROGRAM := $1, \
DEBUG_SYMBOLS:=true,\ DEBUG_SYMBOLS := true, \
VERSIONINFO_RESOURCE:=$$($1_VERSION_INFO_RESOURCE),\ VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \
RC_FLAGS:=$(RC_FLAGS)\ RC_FLAGS := $(RC_FLAGS) \
-D "JDK_FNAME=$1$(EXE_SUFFIX)" \ -D "JDK_FNAME=$1$(EXE_SUFFIX)" \
-D "JDK_INTERNAL_NAME=$1" \ -D "JDK_INTERNAL_NAME=$1" \
-D "JDK_FTYPE=0x1L" \ -D "JDK_FTYPE=0x1L" \
$7,\ $7, \
MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest,\ MANIFEST := $(JDK_TOPDIR)/src/windows/resource/java.manifest, \
CODESIGN:=$$($1_CODESIGN)) CODESIGN := $$($1_CODESIGN))
BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1) BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
$$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjli_static.a $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjli_static.a
endif endif
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
$$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjava/java.lib \ $$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjava/java.lib \
$$($1_WINDOWS_JLI_LIB) $$($1_WINDOWS_JLI_LIB)
endif endif
endef endef
########################################################################################## ##########################################################################################
XLIBS:=$(X_LIBS) -lX11 XLIBS := $(X_LIBS) -lX11
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
DPACKAGEPATH:=-DPACKAGE_PATH='"$(PACKAGE_PATH)"' DPACKAGEPATH := -DPACKAGE_PATH='"$(PACKAGE_PATH)"'
XLIBS:= XLIBS :=
endif endif
ifdef OPENJDK ifdef OPENJDK
JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/windows/resource/icons" JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/windows/resource/icons"
else else
JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows" JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
endif endif
# On windows, the debuginfo files get the same name as for java.dll. Build # On windows, the debuginfo files get the same name as for java.dll. Build
# into another dir and copy selectively so debuginfo for java.dll isn't # into another dir and copy selectively so debuginfo for java.dll isn't
# overwritten. # overwritten.
$(eval $(call SetupLauncher,java,\ $(eval $(call SetupLauncher,java, \
-DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib,\ -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
$(JDK_OUTPUTDIR)/objs/jli_static.lib,$(JAVA_RC_FLAGS),\ $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
$(JDK_TOPDIR)/src/windows/resource/java.rc,$(JDK_OUTPUTDIR)/objs/java_objs,true)) $(JDK_TOPDIR)/src/windows/resource/java.rc, $(JDK_OUTPUTDIR)/objs/java_objs,true))
$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java) $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
...@@ -219,271 +219,271 @@ $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java) ...@@ -219,271 +219,271 @@ $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX) BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX)
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call SetupLauncher,javaw,\ $(eval $(call SetupLauncher,javaw, \
-DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib,\ -DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
$(JDK_OUTPUTDIR)/objs/jli_static.lib,$(JAVA_RC_FLAGS),\ $(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
$(JDK_TOPDIR)/src/windows/resource/java.rc,,true)) $(JDK_TOPDIR)/src/windows/resource/java.rc,,true))
endif endif
ifndef BUILD_HEADLESS_ONLY ifndef BUILD_HEADLESS_ONLY
$(eval $(call SetupLauncher,appletviewer,\ $(eval $(call SetupLauncher,appletviewer, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',,\ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',, \
$(XLIBS))) $(XLIBS)))
endif endif
$(eval $(call SetupLauncher,extcheck,\ $(eval $(call SetupLauncher,extcheck, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.extcheck.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.extcheck.Main"$(COMMA) }'))
$(eval $(call SetupLauncher,idlj,\ $(eval $(call SetupLauncher,idlj, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.corba.se.idl.toJavaPortable.Compile"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.corba.se.idl.toJavaPortable.Compile"$(COMMA) }'))
$(eval $(call SetupLauncher,jar,\ $(eval $(call SetupLauncher,jar, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jar.Main"$(COMMA) }'))
$(eval $(call SetupLauncher,jarsigner,\ $(eval $(call SetupLauncher,jarsigner, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.jarsigner.Main"$(COMMA) }'))
$(eval $(call SetupLauncher,javac,\ $(eval $(call SetupLauncher,javac, \
-DEXPAND_CLASSPATH_WILDCARDS \ -DEXPAND_CLASSPATH_WILDCARDS \
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }'))
ifeq ($(ENABLE_SJAVAC),yes) ifeq ($(ENABLE_SJAVAC), yes)
$(eval $(call SetupLauncher,sjavac,\ $(eval $(call SetupLauncher,sjavac, \
-DEXPAND_CLASSPATH_WILDCARDS \ -DEXPAND_CLASSPATH_WILDCARDS \
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.sjavac.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.sjavac.Main"$(COMMA) }'))
endif endif
$(eval $(call SetupLauncher,javadoc,\ $(eval $(call SetupLauncher,javadoc, \
-DEXPAND_CLASSPATH_WILDCARDS \ -DEXPAND_CLASSPATH_WILDCARDS \
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javadoc.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javadoc.Main"$(COMMA) }'))
$(eval $(call SetupLauncher,javah,\ $(eval $(call SetupLauncher,javah, \
-DEXPAND_CLASSPATH_WILDCARDS \ -DEXPAND_CLASSPATH_WILDCARDS \
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javah.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javah.Main"$(COMMA) }'))
$(eval $(call SetupLauncher,javap,\ $(eval $(call SetupLauncher,javap, \
-DEXPAND_CLASSPATH_WILDCARDS \ -DEXPAND_CLASSPATH_WILDCARDS \
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javap.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javap.Main"$(COMMA) }'))
$(eval $(call SetupLauncher,jdeps,\ $(eval $(call SetupLauncher,jdeps, \
-DEXPAND_CLASSPATH_WILDCARDS \ -DEXPAND_CLASSPATH_WILDCARDS \
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \ -DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.jdeps.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.jdeps.Main"$(COMMA) }'))
BUILD_LAUNCHER_jconsole_CFLAGS_windows:=-DJAVAW BUILD_LAUNCHER_jconsole_CFLAGS_windows := -DJAVAW
BUILD_LAUNCHER_jconsole_LDFLAGS_windows:=user32.lib BUILD_LAUNCHER_jconsole_LDFLAGS_windows := user32.lib
$(eval $(call SetupLauncher,jconsole,\ $(eval $(call SetupLauncher,jconsole, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "-J-Djconsole.showOutputViewer"$(COMMA) "sun.tools.jconsole.JConsole"$(COMMA) }' \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "-J-Djconsole.showOutputViewer"$(COMMA) "sun.tools.jconsole.JConsole"$(COMMA) }' \
-DAPP_CLASSPATH='{ "/lib/jconsole.jar"$(COMMA) "/lib/tools.jar"$(COMMA) "/classes" }')) -DAPP_CLASSPATH='{ "/lib/jconsole.jar"$(COMMA) "/lib/tools.jar"$(COMMA) "/classes" }'))
$(eval $(call SetupLauncher,jdb,\ $(eval $(call SetupLauncher,jdb, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.example.debug.tty.TTY"$(COMMA) }' \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.example.debug.tty.TTY"$(COMMA) }' \
-DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }')) -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }'))
$(eval $(call SetupLauncher,jhat,\ $(eval $(call SetupLauncher,jhat, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.hat.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.hat.Main"$(COMMA) }'))
$(eval $(call SetupLauncher,jinfo,\ $(eval $(call SetupLauncher,jinfo, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
"-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \ "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
"-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \ "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
"sun.tools.jinfo.JInfo"$(COMMA) }' \ "sun.tools.jinfo.JInfo"$(COMMA) }' \
-DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
,,,,,,,,,Info-privileged.plist)) ,,,,,,,,,Info-privileged.plist))
$(eval $(call SetupLauncher,jmap,\ $(eval $(call SetupLauncher,jmap, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
"-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \ "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
"-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \ "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
"sun.tools.jmap.JMap"$(COMMA) }' \ "sun.tools.jmap.JMap"$(COMMA) }' \
-DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
,,,,,,,,,Info-privileged.plist)) ,,,,,,,,,Info-privileged.plist))
$(eval $(call SetupLauncher,jps,\ $(eval $(call SetupLauncher,jps, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jps.Jps"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jps.Jps"$(COMMA) }'))
$(eval $(call SetupLauncher,jrunscript,\ $(eval $(call SetupLauncher,jrunscript, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.script.shell.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.script.shell.Main"$(COMMA) }'))
$(eval $(call SetupLauncher,jjs,\ $(eval $(call SetupLauncher,jjs, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.nashorn.tools.Shell"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.nashorn.tools.Shell"$(COMMA) }'))
$(eval $(call SetupLauncher,jsadebugd,\ $(eval $(call SetupLauncher,jsadebugd, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.jvm.hotspot.jdi.SADebugServer"$(COMMA) }' \
-DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
,,,,,,,,,Info-privileged.plist)) ,,,,,,,,,Info-privileged.plist))
$(eval $(call SetupLauncher,jstack,\ $(eval $(call SetupLauncher,jstack, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
"-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \ "-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
"-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \ "-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
"sun.tools.jstack.JStack"$(COMMA) }' \ "sun.tools.jstack.JStack"$(COMMA) }' \
-DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \ -DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
,,,,,,,,,Info-privileged.plist)) ,,,,,,,,,Info-privileged.plist))
$(eval $(call SetupLauncher,jstat,\ $(eval $(call SetupLauncher,jstat, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstat.Jstat"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstat.Jstat"$(COMMA) }'))
$(eval $(call SetupLauncher,jstatd,\ $(eval $(call SetupLauncher,jstatd, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstatd.Jstatd"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jstatd.Jstatd"$(COMMA) }'))
$(eval $(call SetupLauncher,keytool,\ $(eval $(call SetupLauncher,keytool, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.keytool.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.keytool.Main"$(COMMA) }'))
$(eval $(call SetupLauncher,native2ascii,\ $(eval $(call SetupLauncher,native2ascii, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.native2ascii.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.native2ascii.Main"$(COMMA) }'))
ifndef BUILD_HEADLESS_ONLY ifndef BUILD_HEADLESS_ONLY
$(eval $(call SetupLauncher,policytool,\ $(eval $(call SetupLauncher,policytool, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',,\ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \
$(XLIBS))) $(XLIBS)))
endif endif
$(eval $(call SetupLauncher,rmic,\ $(eval $(call SetupLauncher,rmic, \
-DEXPAND_CLASSPATH_WILDCARDS \ -DEXPAND_CLASSPATH_WILDCARDS \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.rmic.Main"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.rmic.Main"$(COMMA) }'))
$(eval $(call SetupLauncher,schemagen,\ $(eval $(call SetupLauncher,schemagen, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.jxc.SchemaGenerator"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.jxc.SchemaGenerator"$(COMMA) }'))
$(eval $(call SetupLauncher,serialver,\ $(eval $(call SetupLauncher,serialver, \
-DEXPAND_CLASSPATH_WILDCARDS \ -DEXPAND_CLASSPATH_WILDCARDS \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.serialver.SerialVer"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.serialver.SerialVer"$(COMMA) }'))
$(eval $(call SetupLauncher,xjc,\ $(eval $(call SetupLauncher,xjc, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.xjc.Driver"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.xjc.Driver"$(COMMA) }'))
$(eval $(call SetupLauncher,wsgen,\ $(eval $(call SetupLauncher,wsgen, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsGen"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsGen"$(COMMA) }'))
$(eval $(call SetupLauncher,wsimport,\ $(eval $(call SetupLauncher,wsimport, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsImport"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.internal.ws.WsImport"$(COMMA) }'))
$(eval $(call SetupLauncher,orbd,\ $(eval $(call SetupLauncher,orbd, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
"-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \ "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
"-J-Dcom.sun.CORBA.activation.Port=1049"$(COMMA) \ "-J-Dcom.sun.CORBA.activation.Port=1049"$(COMMA) \
"-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \ "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \
"com.sun.corba.se.impl.activation.ORBD"$(COMMA) }')) "com.sun.corba.se.impl.activation.ORBD"$(COMMA) }'))
$(eval $(call SetupLauncher,servertool,\ $(eval $(call SetupLauncher,servertool, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.corba.se.impl.activation.ServerTool"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.corba.se.impl.activation.ServerTool"$(COMMA) }'))
$(eval $(call SetupLauncher,tnameserv,\ $(eval $(call SetupLauncher,tnameserv, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
"-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \ "-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
"-J-Djava.util.logging.LoggingPermission=contol"$(COMMA) \ "-J-Djava.util.logging.LoggingPermission=contol"$(COMMA) \
"-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \ "-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \
"com.sun.corba.se.impl.naming.cosnaming.TransientNameServer"$(COMMA) }')) "com.sun.corba.se.impl.naming.cosnaming.TransientNameServer"$(COMMA) }'))
$(eval $(call SetupLauncher,pack200,\ $(eval $(call SetupLauncher,pack200, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.java.util.jar.pack.Driver"$(COMMA) "--pack" }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.java.util.jar.pack.Driver"$(COMMA) "--pack" }'))
$(eval $(call SetupLauncher,rmid,\ $(eval $(call SetupLauncher,rmid, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.server.Activation"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.server.Activation"$(COMMA) }'))
$(eval $(call SetupLauncher,rmiregistry,\ $(eval $(call SetupLauncher,rmiregistry, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.registry.RegistryImpl"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.registry.RegistryImpl"$(COMMA) }'))
$(eval $(call SetupLauncher,jcmd,\ $(eval $(call SetupLauncher,jcmd, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jcmd.JCmd"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jcmd.JCmd"$(COMMA) }'))
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call SetupLauncher,kinit,\ $(eval $(call SetupLauncher,kinit, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Kinit"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Kinit"$(COMMA) }'))
$(eval $(call SetupLauncher,klist,\ $(eval $(call SetupLauncher,klist, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Klist"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Klist"$(COMMA) }'))
$(eval $(call SetupLauncher,ktab,\ $(eval $(call SetupLauncher,ktab, \
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Ktab"$(COMMA) }')) -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Ktab"$(COMMA) }'))
endif endif
########################################################################################## ##########################################################################################
# The order of the object files on the link command line affects the size of the resulting # 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. # binary (at least on linux) which causes the size to differ between old and new build.
ifeq ($(USE_EXTERNAL_LIBZ), true) ifeq ($(USE_EXTERNAL_LIBZ), true)
UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
UNPACKEXE_ZIPOBJS := -lz UNPACKEXE_ZIPOBJS := -lz
else else
UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5 UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \ UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
$(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \ $(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \
$(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \ $(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \
$(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \ $(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \
$(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \ $(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \
$(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \ $(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \
$(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \ $(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \
$(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \ $(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \
$(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \ $(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \
$(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX) $(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX)
endif endif
ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc) ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
UNPACKEXE_CFLAGS += -xregs=no%appl UNPACKEXE_CFLAGS += -xregs=no%appl
UNPACKEXE_LDFLAGS_solaris += -xmemalign=4s UNPACKEXE_LDFLAGS_solaris += -xmemalign=4s
endif endif
UNPACKEXE_LANG:=C UNPACKEXE_LANG := C
ifeq ($(OPENJDK_TARGET_OS),solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
UNPACKEXE_LANG:=C++ UNPACKEXE_LANG := C++
endif endif
# On windows, unpack200 is linked completely differently to all other # On windows, unpack200 is linked completely differently to all other
# executables, using the compiler with the compiler arguments. # executables, using the compiler with the compiler arguments.
# It's also linked incrementally, producing a .ilk file that needs to # It's also linked incrementally, producing a .ilk file that needs to
# be kept away. # be kept away.
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
BUILD_UNPACKEXE_LDEXE:=$(CC) BUILD_UNPACKEXE_LDEXE := $(CC)
EXE_OUT_OPTION_save:=$(EXE_OUT_OPTION) EXE_OUT_OPTION_save := $(EXE_OUT_OPTION)
EXE_OUT_OPTION:=-Fe EXE_OUT_OPTION := -Fe
endif endif
$(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE,\ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \
SRC:=$(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack,\ SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \
EXCLUDE_FILES:=jni.cpp,\ EXCLUDE_FILES := jni.cpp, \
LANG:=$(UNPACKEXE_LANG),\ LANG := $(UNPACKEXE_LANG), \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE)\ CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) \
-DFULL, \ -DFULL, \
CFLAGS_release:=-DPRODUCT,\ CFLAGS_release := -DPRODUCT, \
CFLAGS_linux:=-fPIC,\ CFLAGS_linux := -fPIC, \
CFLAGS_solaris:=-KPIC, \ CFLAGS_solaris := -KPIC, \
CFLAGS_macosx:=-fPIC, \ CFLAGS_macosx := -fPIC, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers-unpack200,\ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers-unpack200, \
LDFLAGS:=$(UNPACKEXE_ZIPOBJS),\ LDFLAGS := $(UNPACKEXE_ZIPOBJS), \
LDFLAGS_windows:=$(CXXFLAGS_JDKEXE),\ LDFLAGS_windows := $(CXXFLAGS_JDKEXE), \
LDFLAGS_posix:=$(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \ LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_linux:=-lc,\ LDFLAGS_linux := -lc, \
LDFLAGS_solaris:=$(UNPACKEXE_LDFLAGS_solaris) -lc,\ LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
LDFLAGS_SUFFIX:=$(LIBCXX),\ LDFLAGS_SUFFIX := $(LIBCXX), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR),\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR),\ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
PROGRAM:=unpack200,\ PROGRAM := unpack200, \
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
RC_FLAGS:=$(RC_FLAGS)\ RC_FLAGS := $(RC_FLAGS) \
-D "JDK_FNAME=unpack200.exe" \ -D "JDK_FNAME=unpack200.exe" \
-D "JDK_INTERNAL_NAME=unpack200" \ -D "JDK_INTERNAL_NAME=unpack200" \
-D "JDK_FTYPE=0x1L",\ -D "JDK_FTYPE=0x1L", \
DEBUG_SYMBOLS:=true,\ DEBUG_SYMBOLS := true, \
MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest)) MANIFEST := $(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest))
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
EXE_OUT_OPTION:=$(EXE_OUT_OPTION_save) EXE_OUT_OPTION := $(EXE_OUT_OPTION_save)
endif endif
ifneq ($(USE_EXTERNAL_LIBZ), true) ifneq ($(USE_EXTERNAL_LIBZ), true)
$(BUILD_UNPACKEXE) : $(UNPACKEXE_ZIPOBJS) $(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS)
endif endif
...@@ -513,13 +513,13 @@ BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) ...@@ -513,13 +513,13 @@ BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
# jdk/make/java/Makefile # jdk/make/java/Makefile
# #
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
BUILD_JEXEC := 1 BUILD_JEXEC := 1
endif endif
endif endif
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
BUILD_JEXEC := 1 BUILD_JEXEC := 1
endif # OPENJDK_TARGET_OS endif # OPENJDK_TARGET_OS
# #
...@@ -527,41 +527,41 @@ endif # OPENJDK_TARGET_OS ...@@ -527,41 +527,41 @@ endif # OPENJDK_TARGET_OS
# #
ifeq ($(BUILD_JEXEC), 1) ifeq ($(BUILD_JEXEC), 1)
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
else ifeq ($(OPENJDK_TARGET_OS),macosx) else ifeq ($(OPENJDK_TARGET_OS), macosx)
BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/macosx/bin BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/macosx/bin
else else
BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/solaris/bin BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/solaris/bin
endif endif
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib
BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/share/bin BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/share/bin
endif endif
endif endif
# #
# Note that the two Makefile's seems to contradict each other, # Note that the two Makefile's seems to contradict each other,
# and that src/macosx/bin/jexec.c seems unused # and that src/macosx/bin/jexec.c seems unused
# #
ifneq ($(BUILD_JEXEC_SRC),) ifneq ($(BUILD_JEXEC_SRC), )
$(eval $(call SetupNativeCompilation,BUILD_JEXEC,\ $(eval $(call SetupNativeCompilation,BUILD_JEXEC, \
SRC:=$(BUILD_JEXEC_SRC),\ SRC := $(BUILD_JEXEC_SRC), \
INCLUDE_FILES:=jexec.c,\ INCLUDE_FILES := jexec.c, \
LANG:=C,\ LANG := C, \
OPTIMIZATION := LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKEXE)\ CFLAGS := $(CFLAGS_JDKEXE) \
$(BUILD_JEXEC_INC), \ $(BUILD_JEXEC_INC), \
CFLAGS_linux:=-fPIC,\ CFLAGS_linux := -fPIC, \
CFLAGS_solaris:=-KPIC,\ CFLAGS_solaris := -KPIC, \
LDFLAGS:=$(LDFLAGS_JDKEXE) \ LDFLAGS := $(LDFLAGS_JDKEXE) \
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jexec_obj,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jexec_obj, \
OUTPUT_DIR:=$(BUILD_JEXEC_DST_DIR),\ OUTPUT_DIR := $(BUILD_JEXEC_DST_DIR), \
DEBUG_SYMBOLS:=true,\ DEBUG_SYMBOLS := true, \
PROGRAM:=jexec)) PROGRAM := jexec))
BUILD_LAUNCHERS += $(BUILD_JEXEC) BUILD_LAUNCHERS += $(BUILD_JEXEC)
endif endif
########################################################################################## ##########################################################################################
...@@ -569,7 +569,7 @@ endif ...@@ -569,7 +569,7 @@ endif
# #
# The java-rmi.cgi script in bin/ only gets delivered in certain situations # The java-rmi.cgi script in bin/ only gets delivered in certain situations
# #
JAVA_RMI_CGI:=$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java-rmi.cgi JAVA_RMI_CGI := $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java-rmi.cgi
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
BUILD_LAUNCHERS += $(JAVA_RMI_CGI) BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
endif endif
...@@ -586,11 +586,11 @@ endif ...@@ -586,11 +586,11 @@ endif
# the final images bin dir. This weird behavior is mimicked here in the converted # the final images bin dir. This weird behavior is mimicked here in the converted
# makefiles for now. Should probably just be deleted. # makefiles for now. Should probably just be deleted.
# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6512052 # http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6512052
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call SetupLauncher,java-rmi,,\ $(eval $(call SetupLauncher,java-rmi, , \
$(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/makefiles/java/main/java/mapfile-$(OPENJDK_TARGET_CPU)))) $(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/makefiles/java/main/java/mapfile-$(OPENJDK_TARGET_CPU))))
else else
$(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh $(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh
$(call install-file) $(call install-file)
$(CHMOD) a+x $@ $(CHMOD) a+x $@
endif endif
...@@ -603,67 +603,67 @@ BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) ...@@ -603,67 +603,67 @@ BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o
LINK_JSPAWNHELPER_FLAGS := LINK_JSPAWNHELPER_FLAGS :=
ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris),) ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris), )
BUILD_JSPAWNHELPER := 1 BUILD_JSPAWNHELPER := 1
endif endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib
endif endif
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
LINK_JSPAWNHELPER_FLAGS += -m64 LINK_JSPAWNHELPER_FLAGS += -m64
endif endif
ifeq ($(BUILD_JSPAWNHELPER), 1) ifeq ($(BUILD_JSPAWNHELPER), 1)
$(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER,\ $(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER, \
SRC:=$(BUILD_JSPAWNHELPER_SRC),\ SRC := $(BUILD_JSPAWNHELPER_SRC), \
INCLUDE_FILES:=jspawnhelper.c,\ INCLUDE_FILES := jspawnhelper.c, \
LANG:=C,\ LANG := C, \
OPTIMIZATION := LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKEXE), \ CFLAGS := $(CFLAGS_JDKEXE), \
LDFLAGS:=$(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \ LDFLAGS := $(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \
LDFLAGS_SUFFIX:= $(LINK_JSPAWNHELPER_OBJECTS), \ LDFLAGS_SUFFIX := $(LINK_JSPAWNHELPER_OBJECTS), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jspawnhelper,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jspawnhelper, \
OUTPUT_DIR:=$(BUILD_JSPAWNHELPER_DST_DIR),\ OUTPUT_DIR := $(BUILD_JSPAWNHELPER_DST_DIR), \
PROGRAM:=jspawnhelper)) PROGRAM := jspawnhelper))
$(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS) $(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS)
BUILD_LAUNCHERS += $(BUILD_JSPAWNHELPER) BUILD_LAUNCHERS += $(BUILD_JSPAWNHELPER)
endif endif
########################################################################################## ##########################################################################################
# jabswitch # jabswitch
ifndef OPENJDK ifndef OPENJDK
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call SetupNativeCompilation,BUILD_JABSWITCH,\ $(eval $(call SetupNativeCompilation,BUILD_JABSWITCH, \
SRC:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge,\ SRC := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge, \
INCLUDE_FILES:=jabswitch.cpp,\ INCLUDE_FILES := jabswitch.cpp, \
LANG:=C++,\ LANG := C++, \
CFLAGS:=$(filter-out -Zc:wchar_t-,$(CFLAGS_JDKEXE)) -Zc:wchar_t \ CFLAGS := $(filter-out -Zc:wchar_t-, $(CFLAGS_JDKEXE)) -Zc:wchar_t \
-analyze- -Od -Gd -D_WINDOWS \ -analyze- -Od -Gd -D_WINDOWS \
-D_UNICODE -DUNICODE -RTC1 -EHsc,\ -D_UNICODE -DUNICODE -RTC1 -EHsc, \
LDFLAGS:=$(LDFLAGS_JDKEXE) \ LDFLAGS := $(LDFLAGS_JDKEXE) \
Advapi32.lib Version.lib User32.lib,\ Advapi32.lib Version.lib User32.lib, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jabswitch,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jabswitch, \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/bin,\ OUTPUT_DIR := $(JDK_OUTPUTDIR)/bin, \
PROGRAM:=jabswitch,\ PROGRAM := jabswitch, \
DEBUG_SYMBOLS:=true,\ DEBUG_SYMBOLS := true, \
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/AccessBridgeStatusWindow.rc,\ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/AccessBridgeStatusWindow.rc, \
RC_FLAGS:=$(RC_FLAGS),\ RC_FLAGS := $(RC_FLAGS), \
MANIFEST:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/jabswitch.manifest)) MANIFEST := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/jabswitch.manifest))
BUILD_LAUNCHERS += $(BUILD_JABSWITCH) BUILD_LAUNCHERS += $(BUILD_JABSWITCH)
endif endif
endif endif
########################################################################################## ##########################################################################################
$(BUILD_LAUNCHERS) : $(JDK_TOPDIR)/makefiles/CompileLaunchers.gmk $(BUILD_LAUNCHERS): $(JDK_TOPDIR)/makefiles/CompileLaunchers.gmk
all: $(BUILD_LAUNCHERS) all: $(BUILD_LAUNCHERS)
......
makefiles/CompileNativeLibraries.gmk
浏览文件 @ e864d64d
因为 它太大了无法显示 source diff 。你可以改为 查看blob。
makefiles/CopyFiles.gmk
浏览文件 @ e864d64d
...@@ -28,22 +28,22 @@ INCLUDEDIR = $(JDK_OUTPUTDIR)/include ...@@ -28,22 +28,22 @@ INCLUDEDIR = $(JDK_OUTPUTDIR)/include
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS) OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS)
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32 OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32
else ifeq ($(OPENJDK_TARGET_OS), macosx) else ifeq ($(OPENJDK_TARGET_OS), macosx)
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin
endif endif
# #
# Copy exported header files to outputdir. # Copy exported header files to outputdir.
# #
H_TARGET_FILES =$(INCLUDEDIR)/jdwpTransport.h \ H_TARGET_FILES = $(INCLUDEDIR)/jdwpTransport.h \
$(INCLUDEDIR)/jni.h \ $(INCLUDEDIR)/jni.h \
$(INCLUDEDIR)/jvmti.h \ $(INCLUDEDIR)/jvmti.h \
$(INCLUDEDIR)/jvmticmlr.h \ $(INCLUDEDIR)/jvmticmlr.h \
$(INCLUDEDIR)/classfile_constants.h \ $(INCLUDEDIR)/classfile_constants.h \
$(INCLUDEDIR)/jawt.h \ $(INCLUDEDIR)/jawt.h \
$(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \ $(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \
$(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h $(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h
$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/share/javavm/export/%.h $(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/share/javavm/export/%.h
$(call install-file) $(call install-file)
...@@ -56,22 +56,22 @@ COPY_FILES = $(H_TARGET_FILES) ...@@ -56,22 +56,22 @@ COPY_FILES = $(H_TARGET_FILES)
########################################################################################## ##########################################################################################
ifndef OPENJDK ifndef OPENJDK
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
COPY_FILES += $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCallbacks.h \ COPY_FILES += $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCallbacks.h \
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.h \ $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.h \
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgePackages.h \ $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgePackages.h \
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.c \ $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.c \
$(JDK_OUTPUTDIR)/lib/accessibility.properties $(JDK_OUTPUTDIR)/lib/accessibility.properties
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/%: \ $(OPENJDK_TARGET_OS_INCLUDE)/bridge/%: \
$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/% $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/%
$(install-file) $(install-file)
$(JDK_OUTPUTDIR)/lib/accessibility.properties: \ $(JDK_OUTPUTDIR)/lib/accessibility.properties: \
$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/accessibility.properties $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/accessibility.properties
$(install-file) $(install-file)
endif endif
endif endif
########################################################################################## ##########################################################################################
...@@ -125,9 +125,9 @@ COPY_FILES += $(PSFONTPROPFILE_TARGET_FILES) ...@@ -125,9 +125,9 @@ COPY_FILES += $(PSFONTPROPFILE_TARGET_FILES)
# Copy flavormap.properties, cursor.properties and cursors gif files to LIBDIR # Copy flavormap.properties, cursor.properties and cursors gif files to LIBDIR
# #
ifneq ($(OPENJDK_TARGET_OS), macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib
else else
OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/macosx/lib OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/macosx/lib
endif endif
$(LIBDIR)/flavormap.properties: $(OPENJDK_TARGET_OS_LIB_SRC)/flavormap.properties $(LIBDIR)/flavormap.properties: $(OPENJDK_TARGET_OS_LIB_SRC)/flavormap.properties
...@@ -145,11 +145,11 @@ COPY_FILES += $(CURSORS_DEST_DIR)/cursors.properties ...@@ -145,11 +145,11 @@ COPY_FILES += $(CURSORS_DEST_DIR)/cursors.properties
CURSORS_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/images/cursors CURSORS_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/images/cursors
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/win32_*.gif) CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/win32_*.gif)
else # OPENJDK_TARGET_OS else # OPENJDK_TARGET_OS
CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/motif_*.gif) CURSORS_SRC_FILES = $(CURSORS_LIB_SRC)/invalid32x32.gif $(wildcard $(CURSORS_LIB_SRC)/motif_*.gif)
endif # OPENJDK_TARGET_OS endif # OPENJDK_TARGET_OS
CURSORS_TARGET_FILES = $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES)) CURSORS_TARGET_FILES = $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES))
$(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/% $(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/%
$(call install-file) $(call install-file)
...@@ -158,7 +158,7 @@ COPY_FILES += $(CURSORS_TARGET_FILES) ...@@ -158,7 +158,7 @@ COPY_FILES += $(CURSORS_TARGET_FILES)
########################################################################################## ##########################################################################################
CONTENT_TYPES_SRC=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib CONTENT_TYPES_SRC = $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib
$(LIBDIR)/content-types.properties: $(CONTENT_TYPES_SRC)/content-types.properties $(LIBDIR)/content-types.properties: $(CONTENT_TYPES_SRC)/content-types.properties
$(call install-file) $(call install-file)
...@@ -183,14 +183,14 @@ COPY_FILES += $(LIBDIR)/hijrah-config-umalqura.properties ...@@ -183,14 +183,14 @@ COPY_FILES += $(LIBDIR)/hijrah-config-umalqura.properties
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/lib
$(LIBDIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings $(LIBDIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings
$(call install-file) $(call install-file)
COPY_FILES += $(LIBDIR)/tzmappings COPY_FILES += $(LIBDIR)/tzmappings
endif endif
...@@ -199,13 +199,13 @@ endif ...@@ -199,13 +199,13 @@ endif
ICCPROFILE_DEST_DIR := $(LIBDIR)/cmm ICCPROFILE_DEST_DIR := $(LIBDIR)/cmm
ifdef OPENJDK ifdef OPENJDK
ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/share/lib/cmm/lcms ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/share/lib/cmm/lcms
else else
ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/cmm/kcms ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/cmm/kcms
endif endif
ICCPROFILE_SRCS:=$(wildcard $(ICCPROFILE_SRC_DIR)/*.pf) ICCPROFILE_SRCS := $(wildcard $(ICCPROFILE_SRC_DIR)/*.pf)
ICCPROFILE_TARGET_FILES:=$(subst $(ICCPROFILE_SRC_DIR),$(ICCPROFILE_DEST_DIR),$(ICCPROFILE_SRCS)) ICCPROFILE_TARGET_FILES := $(subst $(ICCPROFILE_SRC_DIR),$(ICCPROFILE_DEST_DIR),$(ICCPROFILE_SRCS))
$(ICCPROFILE_DEST_DIR)%.pf: $(ICCPROFILE_SRC_DIR)%.pf $(ICCPROFILE_DEST_DIR)%.pf: $(ICCPROFILE_SRC_DIR)%.pf
$(call install-file) $(call install-file)
...@@ -215,60 +215,60 @@ COPY_FILES += $(ICCPROFILE_TARGET_FILES) ...@@ -215,60 +215,60 @@ COPY_FILES += $(ICCPROFILE_TARGET_FILES)
########################################################################################## ##########################################################################################
#make sure freetype dll will be available at runtime as well as link time # make sure freetype dll will be available at runtime as well as link time
# #
#NB: Default freetype build system uses -h linker option and # NB: Default freetype build system uses -h linker option and
# result .so contains hardcoded library name that is later # result .so contains hardcoded library name that is later
# used for adding dependencies to other objects # used for adding dependencies to other objects
# (e.g. libfontmanager.so). # (e.g. libfontmanager.so).
# #
# It is not obvious how to extract that hardcoded name (libfreetype.so.6) # It is not obvious how to extract that hardcoded name (libfreetype.so.6)
# without overcomplicating logic here. # without overcomplicating logic here.
# To workaround this we hardcode .6 suffix for now. # To workaround this we hardcode .6 suffix for now.
# #
# Note that .so.6 library will not be found by System.loadLibrary() # Note that .so.6 library will not be found by System.loadLibrary()
# but fortunately we need to load FreeType library explicitly # but fortunately we need to load FreeType library explicitly
# on windows only # on windows only
# #
#TODO: rework this to avoid hardcoding library name in the makefile #TODO: rework this to avoid hardcoding library name in the makefile
# #
ifdef OPENJDK ifdef OPENJDK
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
FREETYPE_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype) FREETYPE_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype)
else else
ifeq ($(USING_SYSTEM_FT_LIB), false) ifeq ($(USING_SYSTEM_FT_LIB), false)
FREETYPE_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6 FREETYPE_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
endif
endif endif
endif
$(FREETYPE_LIB): $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $(FREETYPE_LIB): $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype)
$(CP) $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@ $(CP) $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@
ifeq ($(OPENJDK_BUILD_OS), windows) ifeq ($(OPENJDK_BUILD_OS), windows)
$(CHMOD) +rx $@ $(CHMOD) +rx $@
endif endif
COPY_FILES += $(FREETYPE_LIB) COPY_FILES += $(FREETYPE_LIB)
endif endif
########################################################################################## ##########################################################################################
# Copy msvcrXX.dll on windows # Copy msvcrXX.dll on windows
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL)) MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL))
# Chmod to avoid permission issues if bundles are unpacked on unix platforms. # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
$(MSVCR_TARGET): $(MSVCR_DLL) $(MSVCR_TARGET): $(MSVCR_DLL)
$(call install-file) $(call install-file)
$(CHMOD) a+rx $@ $(CHMOD) a+rx $@
COPY_FILES += $(MSVCR_TARGET) COPY_FILES += $(MSVCR_TARGET)
endif endif
########################################################################################## ##########################################################################################
HPROF_SRC=$(JDK_TOPDIR)/src/share/demo/jvmti/hprof/jvm.hprof.txt HPROF_SRC = $(JDK_TOPDIR)/src/share/demo/jvmti/hprof/jvm.hprof.txt
$(LIBDIR)/jvm.hprof.txt : $(HPROF_SRC) $(LIBDIR)/jvm.hprof.txt: $(HPROF_SRC)
$(call install-file) $(call install-file)
COPY_FILES += $(LIBDIR)/jvm.hprof.txt COPY_FILES += $(LIBDIR)/jvm.hprof.txt
...@@ -279,12 +279,12 @@ COPY_FILES += $(LIBDIR)/jvm.hprof.txt ...@@ -279,12 +279,12 @@ COPY_FILES += $(LIBDIR)/jvm.hprof.txt
# How to install jvm.cfg. # How to install jvm.cfg.
# #
ifeq ($(JVM_VARIANT_ZERO), true) ifeq ($(JVM_VARIANT_ZERO), true)
JVMCFG_ARCH := zero JVMCFG_ARCH := zero
else else
JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY) JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
endif endif
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
JVMCFG_SRC := $(JDK_TOPDIR)/src/macosx/bin/$(JVMCFG_ARCH)/jvm.cfg JVMCFG_SRC := $(JDK_TOPDIR)/src/macosx/bin/$(JVMCFG_ARCH)/jvm.cfg
else else
JVMCFG_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(JVMCFG_ARCH)/jvm.cfg JVMCFG_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(JVMCFG_ARCH)/jvm.cfg
...@@ -294,7 +294,7 @@ JVMCFG := $(JVMCFG_DIR)/jvm.cfg ...@@ -294,7 +294,7 @@ JVMCFG := $(JVMCFG_DIR)/jvm.cfg
# To do: should this also support -zeroshark? # To do: should this also support -zeroshark?
ifeq ($(OPENJDK_TARGET_CPU_BITS),64) ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
COPY_JVM_CFG_FILE := true COPY_JVM_CFG_FILE := true
else else
# On 32-bit machines we have three potential VMs: client, server and minimal. # On 32-bit machines we have three potential VMs: client, server and minimal.
...@@ -305,7 +305,7 @@ else ...@@ -305,7 +305,7 @@ else
# The main problem is deciding whether to use aliases for the VMs that are not # The main problem is deciding whether to use aliases for the VMs that are not
# present and the current position is that we add aliases for client and server, but # present and the current position is that we add aliases for client and server, but
# not for minimal. # not for minimal.
CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT))) CLIENT_AND_SERVER := $(and $(findstring true, $(JVM_VARIANT_SERVER)), $(findstring true, $(JVM_VARIANT_CLIENT)))
ifeq ($(CLIENT_AND_SERVER), true) ifeq ($(CLIENT_AND_SERVER), true)
COPY_JVM_CFG_FILE := true COPY_JVM_CFG_FILE := true
else else
...@@ -317,35 +317,34 @@ else ...@@ -317,35 +317,34 @@ else
endif endif
ifeq ($(COPY_JVM_CFG_FILE), true) ifeq ($(COPY_JVM_CFG_FILE), true)
$(JVMCFG): $(JVMCFG_SRC) $(JVMCFG): $(JVMCFG_SRC)
$(call install-file) $(call install-file)
else else
$(JVMCFG): $(JVMCFG):
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $(@) $(RM) $(@)
# Now check for other permutations
# Now check for other permutations ifeq ($(JVM_VARIANT_SERVER), true)
ifeq ($(JVM_VARIANT_SERVER), true) $(PRINTF) "-server KNOWN\n">>$(@)
$(PRINTF) "-server KNOWN\n">>$(@) $(PRINTF) "-client ALIASED_TO -server\n">>$(@)
$(PRINTF) "-client ALIASED_TO -server\n">>$(@) ifeq ($(JVM_VARIANT_MINIMAL1), true)
ifeq ($(JVM_VARIANT_MINIMAL1), true)
$(PRINTF) "-minimal KNOWN\n">>$(@) $(PRINTF) "-minimal KNOWN\n">>$(@)
endif endif
else else
ifeq ($(JVM_VARIANT_CLIENT), true) ifeq ($(JVM_VARIANT_CLIENT), true)
$(PRINTF) "-client KNOWN\n">>$(@) $(PRINTF) "-client KNOWN\n">>$(@)
$(PRINTF) "-server ALIASED_TO -client\n">>$(@) $(PRINTF) "-server ALIASED_TO -client\n">>$(@)
ifeq ($(JVM_VARIANT_MINIMAL1), true) ifeq ($(JVM_VARIANT_MINIMAL1), true)
$(PRINTF) "-minimal KNOWN\n">>$(@) $(PRINTF) "-minimal KNOWN\n">>$(@)
endif endif
else else
ifeq ($(JVM_VARIANT_MINIMAL1), true) ifeq ($(JVM_VARIANT_MINIMAL1), true)
$(PRINTF) "-minimal KNOWN\n">>$(@) $(PRINTF) "-minimal KNOWN\n">>$(@)
$(PRINTF) "-server ALIASED_TO -minimal\n">>$(@) $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
$(PRINTF) "-client ALIASED_TO -minimal\n">>$(@) $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
endif endif
endif
endif endif
endif
endif endif
COPY_FILES += $(JVMCFG) COPY_FILES += $(JVMCFG)
...@@ -401,23 +400,23 @@ BLACKLISTED_CERTS_DST := $(JDK_OUTPUTDIR)/lib/security/blacklisted.certs ...@@ -401,23 +400,23 @@ BLACKLISTED_CERTS_DST := $(JDK_OUTPUTDIR)/lib/security/blacklisted.certs
ifndef OPENJDK ifndef OPENJDK
BLACKLIST_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/blacklist BLACKLIST_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/blacklist
BLACKLIST_DST := $(JDK_OUTPUTDIR)/lib/security/blacklist BLACKLIST_DST := $(JDK_OUTPUTDIR)/lib/security/blacklist
BLACKLISTED_CERTS_SRC += $(wildcard $(JDK_TOPDIR)/src/closed/share/lib/security/blacklisted.certs) BLACKLISTED_CERTS_SRC += $(wildcard $(JDK_TOPDIR)/src/closed/share/lib/security/blacklisted.certs)
TRUSTEDLIBS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/trusted.libraries TRUSTEDLIBS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/trusted.libraries
TRUSTEDLIBS_DST := $(JDK_OUTPUTDIR)/lib/security/trusted.libraries TRUSTEDLIBS_DST := $(JDK_OUTPUTDIR)/lib/security/trusted.libraries
$(BLACKLIST_DST): $(BLACKLIST_SRC) $(BLACKLIST_DST): $(BLACKLIST_SRC)
$(call install-file) $(call install-file)
COPY_FILES += $(BLACKLIST_DST) COPY_FILES += $(BLACKLIST_DST)
$(TRUSTEDLIBS_DST): $(TRUSTEDLIBS_SRC) $(TRUSTEDLIBS_DST): $(TRUSTEDLIBS_SRC)
$(call install-file) $(call install-file)
COPY_FILES += $(TRUSTEDLIBS_DST) COPY_FILES += $(TRUSTEDLIBS_DST)
endif endif
...@@ -439,98 +438,98 @@ COPY_FILES += $(BLACKLISTED_CERTS_DST) ...@@ -439,98 +438,98 @@ COPY_FILES += $(BLACKLISTED_CERTS_DST)
ifndef OPENJDK ifndef OPENJDK
SHARED_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts SHARED_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts
SHARED_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/fonts SHARED_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/fonts
SHARED_FONTS_FILES := \ SHARED_FONTS_FILES := \
LucidaTypewriterRegular.ttf \ LucidaTypewriterRegular.ttf \
LucidaTypewriterBold.ttf \ LucidaTypewriterBold.ttf \
LucidaBrightRegular.ttf \ LucidaBrightRegular.ttf \
LucidaBrightDemiBold.ttf \ LucidaBrightDemiBold.ttf \
LucidaBrightItalic.ttf \ LucidaBrightItalic.ttf \
LucidaBrightDemiItalic.ttf \ LucidaBrightDemiItalic.ttf \
LucidaSansRegular.ttf \ LucidaSansRegular.ttf \
LucidaSansDemiBold.ttf \ LucidaSansDemiBold.ttf \
SHARED_FONTS_SRC := $(foreach F,$(SHARED_FONTS_FILES),$(SHARED_FONTS_SRC_DIR)/$(F)) 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 := $(foreach F, $(SHARED_FONTS_FILES), $(SHARED_FONTS_DST_DIR)/$(F))
$(SHARED_FONTS_DST_DIR)/%.ttf : $(SHARED_FONTS_SRC_DIR)/%.ttf $(SHARED_FONTS_DST_DIR)/%.ttf: $(SHARED_FONTS_SRC_DIR)/%.ttf
$(call install-file) $(call install-file)
$(SHARED_FONTS_DST_DIR)/fonts.dir : $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.fonts.dir $(SHARED_FONTS_DST_DIR)/fonts.dir: $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.fonts.dir
$(call install-file) $(call install-file)
COPY_FILES += $(SHARED_FONTS_DST) COPY_FILES += $(SHARED_FONTS_DST)
ifneq ($(OPENJDK_TARGET_OS), windows) ifneq ($(OPENJDK_TARGET_OS), windows)
COPY_FILES += $(SHARED_FONTS_DST_DIR)/fonts.dir COPY_FILES += $(SHARED_FONTS_DST_DIR)/fonts.dir
endif endif
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
# The oblique fonts are only needed/wanted on Linux. # The oblique fonts are only needed/wanted on Linux.
OBL_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts/oblique OBL_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts/oblique
OBL_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/oblique-fonts OBL_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/oblique-fonts
OBL_FONTS_FILES := LucidaTypewriterOblique.ttf LucidaTypewriterBoldOblique.ttf \ OBL_FONTS_FILES := LucidaTypewriterOblique.ttf LucidaTypewriterBoldOblique.ttf \
LucidaSansOblique.ttf LucidaSansDemiOblique.ttf LucidaSansOblique.ttf LucidaSansDemiOblique.ttf
OBL_FONTS_SRC := $(foreach F,$(OBL_FONTS_FILES),$(OBL_FONTS_SRC_DIR)/$(F)) 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 := $(foreach F, $(OBL_FONTS_FILES), $(OBL_FONTS_DST_DIR)/$(F))
$(OBL_FONTS_DST_DIR)/%.ttf : $(OBL_FONTS_SRC_DIR)/%.ttf $(OBL_FONTS_DST_DIR)/%.ttf: $(OBL_FONTS_SRC_DIR)/%.ttf
$(call install-file) $(call install-file)
$(OBL_FONTS_DST_DIR)/fonts.dir : $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir $(OBL_FONTS_DST_DIR)/fonts.dir: $(JDK_TOPDIR)/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir
$(call install-file) $(call install-file)
COPY_FILES += $(OBL_FONTS_DST) $(OBL_FONTS_DST_DIR)/fonts.dir COPY_FILES += $(OBL_FONTS_DST) $(OBL_FONTS_DST_DIR)/fonts.dir
endif # linux endif # linux
endif # OPENJDK endif # OPENJDK
########################################################################################## ##########################################################################################
ifndef OPENJDK ifndef OPENJDK
# #
# Solaris X11 Direct Graphics Access library # Solaris X11 Direct Graphics Access library
# #
_DGALIBS_sparc = \ _DGALIBS_sparc = \
libxinerama.so \ libxinerama.so \
libjdgaSUNWcg6.so \ libjdgaSUNWcg6.so \
libjdgaSUNWffb.so \ libjdgaSUNWffb.so \
libjdgaSUNWm64.so \ libjdgaSUNWm64.so \
libjdgaSUNWafb.so libjdgaSUNWafb.so
_DGALIBS_sparcv9 = \ _DGALIBS_sparcv9 = \
libxinerama.so \ libxinerama.so \
libjdgaSUNWcg6.so \ libjdgaSUNWcg6.so \
libjdgaSUNWffb.so \ libjdgaSUNWffb.so \
libjdgaSUNWm64.so \ libjdgaSUNWm64.so \
libjdgaSUNWafb.so libjdgaSUNWafb.so
_DGALIBS_i586 = # no i586 library yet _DGALIBS_i586 = # no i586 library yet
_DGALIBS_amd64 = # no amd64 library yet _DGALIBS_amd64 = # no amd64 library yet
DGALIBS = $(_DGALIBS_$(OPENJDK_TARGET_CPU_LEGACY):%=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/%) DGALIBS = $(_DGALIBS_$(OPENJDK_TARGET_CPU_LEGACY):%=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/%)
$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libxinerama.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libxinerama.so $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libxinerama.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libxinerama.so
$(call install-file) $(call install-file)
$(CHMOD) 755 $@ $(CHMOD) 755 $@
$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNW%.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libjdgaSUNW%.so $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNW%.so: $(JDK_TOPDIR)/src/closed/solaris/lib/$(OPENJDK_TARGET_CPU_LEGACY)/libjdgaSUNW%.so
$(call install-file) $(call install-file)
$(CHMOD) 755 $@ $(CHMOD) 755 $@
$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWafb.so: $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWffb.so $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWafb.so: $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjdgaSUNWffb.so
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(LN) -s $(<F) $@ $(LN) -s $(<F) $@
COPY_FILES += $(DGALIBS) COPY_FILES += $(DGALIBS)
endif endif
...@@ -538,35 +537,35 @@ endif ...@@ -538,35 +537,35 @@ endif
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
SUNPKCS11_CFG_SRC := $(JDK_TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg 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 := $(JDK_OUTPUTDIR)/lib/security/sunpkcs11-solaris.cfg
$(SUNPKCS11_CFG_DST) : $(SUNPKCS11_CFG_SRC) $(SUNPKCS11_CFG_DST): $(SUNPKCS11_CFG_SRC)
$(call install-file) $(call install-file)
COPY_FILES += $(SUNPKCS11_CFG_DST) COPY_FILES += $(SUNPKCS11_CFG_DST)
endif endif
########################################################################################## ##########################################################################################
ifndef OPENJDK ifndef OPENJDK
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
UCRYPTO_CFG_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/ucrypto-solaris.cfg 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 := $(JDK_OUTPUTDIR)/lib/security/ucrypto-solaris.cfg
$(UCRYPTO_CFG_DST) : $(UCRYPTO_CFG_SRC) $(UCRYPTO_CFG_DST): $(UCRYPTO_CFG_SRC)
$(call install-file) $(call install-file)
COPY_FILES += $(UCRYPTO_CFG_DST) COPY_FILES += $(UCRYPTO_CFG_DST)
endif endif
endif endif
########################################################################################## ##########################################################################################
$(JDK_OUTPUTDIR)/lib/sound.properties : $(JDK_TOPDIR)/src/share/lib/sound.properties $(JDK_OUTPUTDIR)/lib/sound.properties: $(JDK_TOPDIR)/src/share/lib/sound.properties
$(call install-file) $(call install-file)
COPY_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties COPY_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties
......
makefiles/CopyIntoClasses.gmk
浏览文件 @ e864d64d
...@@ -31,56 +31,56 @@ COPY_PATTERNS = .icu _dict ...@@ -31,56 +31,56 @@ COPY_PATTERNS = .icu _dict
XMLSECURITY_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource XMLSECURITY_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource
COPY_FILES += \ COPY_FILES += \
$(XMLSECURITY_RESOURCEDIR)/config.dtd \ $(XMLSECURITY_RESOURCEDIR)/config.dtd \
$(XMLSECURITY_RESOURCEDIR)/config.xml $(XMLSECURITY_RESOURCEDIR)/config.xml
# Copy sun/tools related files into the classes directory. # Copy sun/tools related files into the classes directory.
# Extra jstat files # Extra jstat files
JSTAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jstat/resources JSTAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jstat/resources
COPY_FILES += \ COPY_FILES += \
$(JSTAT_RESOURCEDIR)/jstat_options \ $(JSTAT_RESOURCEDIR)/jstat_options \
$(JSTAT_RESOURCEDIR)/jstat_unsupported_options $(JSTAT_RESOURCEDIR)/jstat_unsupported_options
# Extra jhat files # Extra jhat files
JHAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/hat/resources JHAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/hat/resources
COPY_FILES += \ COPY_FILES += \
$(JHAT_RESOURCEDIR)/hat.js \ $(JHAT_RESOURCEDIR)/hat.js \
$(JHAT_RESOURCEDIR)/oqlhelp.html \ $(JHAT_RESOURCEDIR)/oqlhelp.html \
$(JHAT_RESOURCEDIR)/platform_names.txt $(JHAT_RESOURCEDIR)/platform_names.txt
# Extra jrunscript files # Extra jrunscript files
JRUNSCRIPT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/script/shell JRUNSCRIPT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/script/shell
COPY_FILES += \ COPY_FILES += \
$(JRUNSCRIPT_RESOURCEDIR)/init.js \ $(JRUNSCRIPT_RESOURCEDIR)/init.js \
$(JRUNSCRIPT_RESOURCEDIR)/messages.properties $(JRUNSCRIPT_RESOURCEDIR)/messages.properties
# Extra jvmstat files # Extra jvmstat files
COPY_FILES += \ COPY_FILES += \
$(JDK_TOPDIR)/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap $(JDK_TOPDIR)/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap
# JConsole resources # JConsole resources
JCONSOLE_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources JCONSOLE_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources
COPY_FILES += \ COPY_FILES += \
$(wildcard $(JCONSOLE_RESOURCES_DIR)/*.png) \ $(wildcard $(JCONSOLE_RESOURCES_DIR)/*.png) \
$(wildcard $(JCONSOLE_RESOURCES_DIR)/*.gif) $(wildcard $(JCONSOLE_RESOURCES_DIR)/*.gif)
# Print resources # Print resources
PRINT_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/print/resources PRINT_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/print/resources
COPY_FILES += \ COPY_FILES += \
$(wildcard $(PRINT_RESOURCES_DIR)/*.png) $(wildcard $(PRINT_RESOURCES_DIR)/*.png)
# IDN resources # IDN resources
COPY_FILES += \ COPY_FILES += \
$(JDK_TOPDIR)/src/share/classes/sun/net/idn/uidna.spp $(JDK_TOPDIR)/src/share/classes/sun/net/idn/uidna.spp
# #
# Swing plaf resources # Swing plaf resources
# #
SWING_PLAF_WINDOWS_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows SWING_PLAF_WINDOWS_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows
COPY_FILES += \ COPY_FILES += \
$(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.gif) \ $(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.gif) \
$(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.png) $(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.png)
ifndef OPENJDK ifndef OPENJDK
SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/windows SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/windows
...@@ -88,18 +88,18 @@ ifndef OPENJDK ...@@ -88,18 +88,18 @@ ifndef OPENJDK
COPY_FILES := $(filter-out $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/JavaCup32.png, $(COPY_FILES)) COPY_FILES := $(filter-out $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/JavaCup32.png, $(COPY_FILES))
# Alter JavaCup32.png from ClosedJDK # Alter JavaCup32.png from ClosedJDK
COPY_FILES += \ COPY_FILES += \
$(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png $(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png
endif endif
ifndef OPENJDK ifndef OPENJDK
JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
COPY_FILES += \ COPY_FILES += \
$(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
endif endif
SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic
COPY_FILES += \ COPY_FILES += \
$(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png) $(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png)
ifndef OPENJDK ifndef OPENJDK
SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/javax/swing/plaf/basic SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/javax/swing/plaf/basic
...@@ -107,44 +107,44 @@ ifndef OPENJDK ...@@ -107,44 +107,44 @@ ifndef OPENJDK
COPY_FILES := $(filter-out $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/JavaCup16.png, $(COPY_FILES)) COPY_FILES := $(filter-out $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/JavaCup16.png, $(COPY_FILES))
# Alter JavaCup16.png from ClosedJDK # Alter JavaCup16.png from ClosedJDK
COPY_FILES += \ COPY_FILES += \
$(SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED)/icons/JavaCup16.png $(SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED)/icons/JavaCup16.png
endif endif
ifdef OPENJDK ifdef OPENJDK
SWING_PLAF_MOTIF_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif SWING_PLAF_MOTIF_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif
COPY_FILES += \ COPY_FILES += \
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \ $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png) $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png)
else else
SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/motif SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/motif
COPY_FILES += \ COPY_FILES += \
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.gif) \ $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.gif) \
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.png) $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.png)
endif endif
SWING_PLAF_METAL_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/metal SWING_PLAF_METAL_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/metal
COPY_FILES += \ COPY_FILES += \
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.gif) \ $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.gif) \
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.png) \ $(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/*.gif) \
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.png) \ $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.png) \
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/sounds/*.wav) $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/sounds/*.wav)
ifneq ($(OPENJDK_TARGET_OS), windows) ifneq ($(OPENJDK_TARGET_OS), windows)
# Only copy GTK resources on Solaris/Linux # Only copy GTK resources on Solaris/Linux
SWING_PLAF_GTK_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk SWING_PLAF_GTK_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk
COPY_FILES += \ COPY_FILES += \
$(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.gif) \ $(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.gif) \
$(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.png) \ $(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.png) \
$(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/resources/metacity/SwingFallbackTheme/metacity-1/*.xml) $(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/resources/metacity/SwingFallbackTheme/metacity-1/*.xml)
endif endif
# END: Swing plaf resources # END: Swing plaf resources
SWING_BEANINFO_RESOURCES_SRC_DIR = $(JDK_TOPDIR)/make/tools/swing-beans/beaninfo/images SWING_BEANINFO_RESOURCES_SRC_DIR = $(JDK_TOPDIR)/make/tools/swing-beans/beaninfo/images
SWING_BEANINFO_RESOURCES_SRC = $(wildcard $(SWING_BEANINFO_RESOURCES_SRC_DIR)/*.gif) SWING_BEANINFO_RESOURCES_SRC = $(wildcard $(SWING_BEANINFO_RESOURCES_SRC_DIR)/*.gif)
OUT_BEANINFO_RESOURCES = $(patsubst $(SWING_BEANINFO_RESOURCES_SRC_DIR)%,\ OUT_BEANINFO_RESOURCES = $(patsubst $(SWING_BEANINFO_RESOURCES_SRC_DIR)%, \
$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%,\ $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%, \
$(SWING_BEANINFO_RESOURCES_SRC)) $(SWING_BEANINFO_RESOURCES_SRC))
COPY_EXTRA += $(OUT_BEANINFO_RESOURCES) COPY_EXTRA += $(OUT_BEANINFO_RESOURCES)
# END: Swing beaninfo resources # END: Swing beaninfo resources
...@@ -152,8 +152,8 @@ COPY_EXTRA += $(OUT_BEANINFO_RESOURCES) ...@@ -152,8 +152,8 @@ COPY_EXTRA += $(OUT_BEANINFO_RESOURCES)
# Swing text resources # Swing text resources
SWING_TEXT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/text SWING_TEXT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/text
COPY_FILES += \ COPY_FILES += \
$(SWING_TEXT_RESOURCEDIR)/html/default.css \ $(SWING_TEXT_RESOURCEDIR)/html/default.css \
$(wildcard $(SWING_TEXT_RESOURCEDIR)/rtf/charsets/*.txt) $(wildcard $(SWING_TEXT_RESOURCEDIR)/rtf/charsets/*.txt)
########################################################################################## ##########################################################################################
# #
...@@ -166,57 +166,57 @@ COPY_FILES += \ ...@@ -166,57 +166,57 @@ COPY_FILES += \
# are uncommented and the configuration file is stored in the output META-INF directory. # are uncommented and the configuration file is stored in the output META-INF directory.
# Make sure the output directory is created. # Make sure the output directory is created.
$(eval $(call MakeDir,$(JDK_OUTPUTDIR)/classes/META-INF/services)) $(eval $(call MakeDir, $(JDK_OUTPUTDIR)/classes/META-INF/services))
# Find all META-INF/services/* files # 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_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) 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 # Platform specific overrides shared
ifneq ($(ALL_META-INF_DIRS_targetapi),) ifneq ($(ALL_META-INF_DIRS_targetapi), )
ALL_META-INF_DIRS:=$(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)),\ $(filter-out %$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes%,%,$(ALL_META-INF_DIRS_targetapi)), \
$(ALL_META-INF_DIRS_share)) $(ALL_META-INF_DIRS_share))
else else
ALL_META-INF_DIRS:=$(ALL_META-INF_DIRS_share) ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share)
endif endif
ifndef OPENJDK ifndef OPENJDK
ALL_META-INF_DIRS += $(JDK_TOPDIR)/src/closed/share/classes/sun/java2d/cmm/kcms/META-INF ALL_META-INF_DIRS += $(JDK_TOPDIR)/src/closed/share/classes/sun/java2d/cmm/kcms/META-INF
endif endif
SRC_SERVICES_FILES:=$(wildcard $(addsuffix /services/*,$(ALL_META-INF_DIRS))) SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS)))
ifdef OPENJDK 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/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.CMMServiceProvider,$(SRC_SERVICES_FILES)) SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES))
else 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/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.CMMServiceProvider,$(SRC_SERVICES_FILES)) SRC_SERVICES_FILES := $(filter-out %sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider, $(SRC_SERVICES_FILES))
endif endif
# The number of services files are relatively few. If the increase in numbers, then # The number of services files are relatively few. If the increase in numbers, then
# we have to use ListPathsSafelyNow here. # we have to use ListPathsSafelyNow here.
# Change $(JDK_TOPDIR)/src/.../META-INF/services/yyyy into $(JDK_OUTPUTDIR)/classes/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. # The \n in the printf command is needed to make sed work on Solaris.
OUT_SERVICES_FILES:=$(addprefix $(JDK_OUTPUTDIR)/classes/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')) $(shell $(PRINTF) "$(SRC_SERVICES_FILES)\n" | $(SED) -e 's|/[^ ]*/META-INF/services/||g'))
OUT_SERVICES_FILES_COLON:=$(addsuffix :,$(OUT_SERVICES_FILES)) OUT_SERVICES_FILES_COLON := $(addsuffix :, $(OUT_SERVICES_FILES))
# Exception handling for print services with no META-INF directory # 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/*) 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/,\ OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \
$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/%,%,\ $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/%, %, \
$(SRC_SERVICES_FILES_PRINT))) $(SRC_SERVICES_FILES_PRINT)))
OUT_SERVICES_FILES_PRINT_COLON = $(addsuffix :,$(OUT_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)) 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. # 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)) 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. # Eval the newly created rules to incorporate them into the make tree.
define addto_meta-inf_services define addto_meta-inf_services
$1 $1
echo $(LOG_INFO) Installing META-INF/services/$$(@F) echo $(LOG_INFO) Installing META-INF/services/$$(@F)
$(CAT) $$< | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $$@ $(CAT) $$< | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $$@
endef endef
$(foreach i,$(META-INF_RULES_SERVICES),$(eval $(call addto_meta-inf_services,$i))) $(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. # Here is the generic rule, whose receipt the above rules will trigger.
COPY_EXTRA += $(OUT_SERVICES_FILES) COPY_EXTRA += $(OUT_SERVICES_FILES)
...@@ -224,7 +224,7 @@ COPY_EXTRA += $(OUT_SERVICES_FILES_PRINT) ...@@ -224,7 +224,7 @@ COPY_EXTRA += $(OUT_SERVICES_FILES_PRINT)
### ###
$(JDK_OUTPUTDIR)/classes/sun/nio/cs/ext/sjis0213.dat : $(JDK_OUTPUTDIR)/gensrc/sun/nio/cs/ext/sjis0213.dat $(JDK_OUTPUTDIR)/classes/sun/nio/cs/ext/sjis0213.dat: $(JDK_OUTPUTDIR)/gensrc/sun/nio/cs/ext/sjis0213.dat
$(call install-file) $(call install-file)
COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/sun/nio/cs/ext/sjis0213.dat COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/sun/nio/cs/ext/sjis0213.dat
...@@ -234,17 +234,17 @@ COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/sun/nio/cs/ext/sjis0213.dat ...@@ -234,17 +234,17 @@ 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 := $(JDK_TOPDIR)/src/share/classes/com/sun/media/sound/services
JAVAX_SOUND_SRC_FILES := \ JAVAX_SOUND_SRC_FILES := \
javax.sound.midi.spi.MidiDeviceProvider \ javax.sound.midi.spi.MidiDeviceProvider \
javax.sound.midi.spi.MidiFileReader \ javax.sound.midi.spi.MidiFileReader \
javax.sound.midi.spi.MidiFileWriter \ javax.sound.midi.spi.MidiFileWriter \
javax.sound.midi.spi.SoundbankReader \ javax.sound.midi.spi.SoundbankReader \
javax.sound.sampled.spi.AudioFileReader \ javax.sound.sampled.spi.AudioFileReader \
javax.sound.sampled.spi.AudioFileWriter \ javax.sound.sampled.spi.AudioFileWriter \
javax.sound.sampled.spi.FormatConversionProvider \ javax.sound.sampled.spi.FormatConversionProvider \
javax.sound.sampled.spi.MixerProvider javax.sound.sampled.spi.MixerProvider
COPY_EXTRA += $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/,$(JAVAX_SOUND_SRC_FILES)) 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) 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))) $(foreach R, $(JAVAX_SOUND_RULES), $(eval $(call addto_meta-inf_services, $R)))
makefiles/CopySamples.gmk
浏览文件 @ e864d64d
...@@ -41,15 +41,15 @@ SAMPLE_TARGET := $(subst $(SAMPLE_SOURCE_DIR),$(SAMPLE_TARGET_DIR),$(SAMPLE_SOUR ...@@ -41,15 +41,15 @@ SAMPLE_TARGET := $(subst $(SAMPLE_SOURCE_DIR),$(SAMPLE_TARGET_DIR),$(SAMPLE_SOUR
ifndef OPENJDK ifndef OPENJDK
# Exclude Main.java in EbayClient dir # Exclude Main.java in EbayClient dir
SAMPLE_CLOSED_SOURCE := $(shell $(FIND) $(SAMPLE_CLOSED_SOURCE_DIR) -type f -print | $(GREP) -v EbayClient/Main.java) SAMPLE_CLOSED_SOURCE := $(shell $(FIND) $(SAMPLE_CLOSED_SOURCE_DIR) -type f -print | $(GREP) -v EbayClient/Main.java)
SAMPLE_CLOSED_TARGET := $(subst $(SAMPLE_CLOSED_SOURCE_DIR),$(SAMPLE_TARGET_DIR),$(SAMPLE_CLOSED_SOURCE)) SAMPLE_CLOSED_TARGET := $(subst $(SAMPLE_CLOSED_SOURCE_DIR),$(SAMPLE_TARGET_DIR),$(SAMPLE_CLOSED_SOURCE))
SAMPLE_TARGET += $(SAMPLE_CLOSED_TARGET) SAMPLE_TARGET += $(SAMPLE_CLOSED_TARGET)
endif endif
ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris macosx)) ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris macosx))
SAMPLE_SOLARIS_SOURCE := $(shell $(FIND) $(SAMPLE_SOLARIS_SOURCE_DIR) -type f -print) 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_SOLARIS_TARGET := $(subst $(SAMPLE_SOLARIS_SOURCE_DIR),$(SAMPLE_TARGET_DIR),$(SAMPLE_SOLARIS_SOURCE))
SAMPLE_TARGET += $(SAMPLE_SOLARIS_TARGET) SAMPLE_TARGET += $(SAMPLE_SOLARIS_TARGET)
endif endif
$(SAMPLE_TARGET_DIR)/dtrace/%: $(SAMPLE_SOLARIS_SOURCE_DIR)/dtrace/% $(SAMPLE_TARGET_DIR)/dtrace/%: $(SAMPLE_SOLARIS_SOURCE_DIR)/dtrace/%
...@@ -63,6 +63,6 @@ $(SAMPLE_TARGET_DIR)/%: $(SAMPLE_SOURCE_DIR)/% ...@@ -63,6 +63,6 @@ $(SAMPLE_TARGET_DIR)/%: $(SAMPLE_SOURCE_DIR)/%
COPY_FILES += $(SAMPLE_TARGET) COPY_FILES += $(SAMPLE_TARGET)
all: $(COPY_FILES) all: $(COPY_FILES)
.PHONY: all .PHONY: all
makefiles/CreateJars.gmk
浏览文件 @ e864d64d
...@@ -31,7 +31,7 @@ include Setup.gmk ...@@ -31,7 +31,7 @@ include Setup.gmk
default: all default: all
# Prepare the find cache. Only used if running on windows. # Prepare the find cache. Only used if running on windows.
$(eval $(call FillCacheFind,$(JDK_OUTPUTDIR)/classes)) $(eval $(call FillCacheFind, $(JDK_OUTPUTDIR)/classes))
include Tools.gmk include Tools.gmk
...@@ -40,53 +40,53 @@ include Profiles.gmk ...@@ -40,53 +40,53 @@ include Profiles.gmk
# #
# This makefile...so that altering will trigger rebuilding include/exclude-lists => jars # This makefile...so that altering will trigger rebuilding include/exclude-lists => jars
# #
MAKEFILE=$(JDK_TOPDIR)/makefiles/CreateJars.gmk MAKEFILE = $(JDK_TOPDIR)/makefiles/CreateJars.gmk
# #
# And similarly for the Profiles # And similarly for the Profiles
PROFILE_MAKEFILES=$(JDK_TOPDIR)/makefiles/Profiles.gmk $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt PROFILE_MAKEFILES = $(JDK_TOPDIR)/makefiles/Profiles.gmk $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt
MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf
BEANMANIFEST := $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest BEANMANIFEST := $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest
$(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/lib)) $(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/lib))
########################################################################################## ##########################################################################################
$(eval $(call SetupArchive,BUILD_JCONSOLE_JAR,,\ $(eval $(call SetupArchive,BUILD_JCONSOLE_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes,\ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class .gif .png .properties,\ SUFFIXES := .class .gif .png .properties, \
INCLUDES:=sun/tools/jconsole com/sun/tools/jconsole,\ INCLUDES := sun/tools/jconsole com/sun/tools/jconsole, \
JARMAIN:=sun.tools.jconsole.JConsole,\ JARMAIN := sun.tools.jconsole.JConsole, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/jconsole.jar,\ JAR := $(IMAGES_OUTPUTDIR)/lib/jconsole.jar, \
SKIP_METAINF:=true)) SKIP_METAINF := true))
########################################################################################## ##########################################################################################
$(eval $(call SetupArchive,BUILD_DNS_JAR,,\ $(eval $(call SetupArchive,BUILD_DNS_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes,\ SRCS := $(JDK_OUTPUTDIR)/classes, \
INCLUDES:=sun/net/spi/nameservice/dns,\ INCLUDES := sun/net/spi/nameservice/dns, \
EXTRA_FILES:=META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor,\ EXTRA_FILES := META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar,\ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar, \
SKIP_METAINF:=true)) SKIP_METAINF := true))
########################################################################################## ##########################################################################################
LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \ LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \
iw ja ko lt lv mk ms mt nl no pl pt ro ru sk sl sq sr sv \ iw ja ko lt lv mk ms mt nl no pl pt ro ru sk sl sq sr sv \
th tr uk vi zh th tr uk vi zh
LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/,$(LOCALEDATA_INCLUDE_LOCALES)) \ LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/, $(LOCALEDATA_INCLUDE_LOCALES)) \
$(addprefix sun/util/resources/,$(LOCALEDATA_INCLUDE_LOCALES)) $(addprefix sun/util/resources/, $(LOCALEDATA_INCLUDE_LOCALES))
$(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\ $(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes,\ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class _dict _th,\ SUFFIXES := .class _dict _th, \
INCLUDES:=$(LOCALEDATA_INCLUDES),\ INCLUDES := $(LOCALEDATA_INCLUDES), \
EXCLUDES:=sun/text/resources/th/BreakIteratorRules_th.class,\ EXCLUDES := sun/text/resources/th/BreakIteratorRules_th.class, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar,\ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar, \
SKIP_METAINF:=true)) SKIP_METAINF := true))
########################################################################################## ##########################################################################################
# #
...@@ -102,123 +102,123 @@ $(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\ ...@@ -102,123 +102,123 @@ $(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\
# This value should exclude types destined for jars other than rt.jar and resources.jar. # This value should exclude types destined for jars other than rt.jar and resources.jar.
# When building a Profile this value augments the profile specific exclusions # When building a Profile this value augments the profile specific exclusions
RT_JAR_EXCLUDES += \ RT_JAR_EXCLUDES += \
com/oracle/security \ com/oracle/security \
com/sun/codemodel \ com/sun/codemodel \
com/sun/crypto/provider \ com/sun/crypto/provider \
com/sun/istack/internal/tools \ com/sun/istack/internal/tools \
com/sun/jarsigner \ com/sun/jarsigner \
com/sun/java/accessibility \ com/sun/java/accessibility \
com/sun/javadoc \ com/sun/javadoc \
com/sun/jdi \ com/sun/jdi \
com/sun/net/ssl/internal/ssl \ com/sun/net/ssl/internal/ssl \
com/sun/source \ com/sun/source \
com/sun/tools \ com/sun/tools \
com/sun/xml/internal/dtdparser \ com/sun/xml/internal/dtdparser \
com/sun/xml/internal/rngom \ com/sun/xml/internal/rngom \
com/sun/xml/internal/xsom \ com/sun/xml/internal/xsom \
javax/crypto \ javax/crypto \
javax/swing/AbstractButtonBeanInfo.class \ javax/swing/AbstractButtonBeanInfo.class \
javax/swing/beaninfo \ javax/swing/beaninfo \
javax/swing/BoxBeanInfo.class \ javax/swing/BoxBeanInfo.class \
javax/swing/JAppletBeanInfo.class \ javax/swing/JAppletBeanInfo.class \
javax/swing/JButtonBeanInfo.class \ javax/swing/JButtonBeanInfo.class \
javax/swing/JCheckBoxBeanInfo.class \ javax/swing/JCheckBoxBeanInfo.class \
javax/swing/JCheckBoxMenuItemBeanInfo.class \ javax/swing/JCheckBoxMenuItemBeanInfo.class \
javax/swing/JColorChooserBeanInfo.class \ javax/swing/JColorChooserBeanInfo.class \
javax/swing/JComboBoxBeanInfo.class \ javax/swing/JComboBoxBeanInfo.class \
javax/swing/JComponentBeanInfo.class \ javax/swing/JComponentBeanInfo.class \
javax/swing/JDesktopPaneBeanInfo.class \ javax/swing/JDesktopPaneBeanInfo.class \
javax/swing/JDialogBeanInfo.class \ javax/swing/JDialogBeanInfo.class \
javax/swing/JEditorPaneBeanInfo.class \ javax/swing/JEditorPaneBeanInfo.class \
javax/swing/JFileChooserBeanInfo.class \ javax/swing/JFileChooserBeanInfo.class \
javax/swing/JFormattedTextFieldBeanInfo.class \ javax/swing/JFormattedTextFieldBeanInfo.class \
javax/swing/JFrameBeanInfo.class \ javax/swing/JFrameBeanInfo.class \
javax/swing/JInternalFrameBeanInfo.class \ javax/swing/JInternalFrameBeanInfo.class \
javax/swing/JLabelBeanInfo.class \ javax/swing/JLabelBeanInfo.class \
javax/swing/JLayeredPaneBeanInfo.class \ javax/swing/JLayeredPaneBeanInfo.class \
javax/swing/JListBeanInfo.class \ javax/swing/JListBeanInfo.class \
javax/swing/JMenuBarBeanInfo.class \ javax/swing/JMenuBarBeanInfo.class \
javax/swing/JMenuBeanInfo.class \ javax/swing/JMenuBeanInfo.class \
javax/swing/JMenuItemBeanInfo.class \ javax/swing/JMenuItemBeanInfo.class \
javax/swing/JOptionPaneBeanInfo.class \ javax/swing/JOptionPaneBeanInfo.class \
javax/swing/JPanelBeanInfo.class \ javax/swing/JPanelBeanInfo.class \
javax/swing/JPasswordFieldBeanInfo.class \ javax/swing/JPasswordFieldBeanInfo.class \
javax/swing/JPopupMenuBeanInfo.class \ javax/swing/JPopupMenuBeanInfo.class \
javax/swing/JProgressBarBeanInfo.class \ javax/swing/JProgressBarBeanInfo.class \
javax/swing/JRadioButtonBeanInfo.class \ javax/swing/JRadioButtonBeanInfo.class \
javax/swing/JRadioButtonMenuItemBeanInfo.class \ javax/swing/JRadioButtonMenuItemBeanInfo.class \
javax/swing/JScrollBarBeanInfo.class \ javax/swing/JScrollBarBeanInfo.class \
javax/swing/JScrollPaneBeanInfo.class \ javax/swing/JScrollPaneBeanInfo.class \
javax/swing/JSeparatorBeanInfo.class \ javax/swing/JSeparatorBeanInfo.class \
javax/swing/JSliderBeanInfo.class \ javax/swing/JSliderBeanInfo.class \
javax/swing/JSpinnerBeanInfo.class \ javax/swing/JSpinnerBeanInfo.class \
javax/swing/JSplitPaneBeanInfo.class \ javax/swing/JSplitPaneBeanInfo.class \
javax/swing/JTabbedPaneBeanInfo.class \ javax/swing/JTabbedPaneBeanInfo.class \
javax/swing/JTableBeanInfo.class \ javax/swing/JTableBeanInfo.class \
javax/swing/JTextAreaBeanInfo.class \ javax/swing/JTextAreaBeanInfo.class \
javax/swing/JTextFieldBeanInfo.class \ javax/swing/JTextFieldBeanInfo.class \
javax/swing/JTextPaneBeanInfo.class \ javax/swing/JTextPaneBeanInfo.class \
javax/swing/JToggleButtonBeanInfo.class \ javax/swing/JToggleButtonBeanInfo.class \
javax/swing/JToolBarBeanInfo.class \ javax/swing/JToolBarBeanInfo.class \
javax/swing/JTreeBeanInfo.class \ javax/swing/JTreeBeanInfo.class \
javax/swing/JWindowBeanInfo.class \ javax/swing/JWindowBeanInfo.class \
javax/swing/SwingBeanInfoBase.class \ javax/swing/SwingBeanInfoBase.class \
javax/swing/text/JTextComponentBeanInfo.class \ javax/swing/text/JTextComponentBeanInfo.class \
META-INF/services/com.sun.jdi.connect.Connector \ META-INF/services/com.sun.jdi.connect.Connector \
META-INF/services/com.sun.jdi.connect.spi.TransportService \ META-INF/services/com.sun.jdi.connect.spi.TransportService \
META-INF/services/com.sun.tools.attach.spi.AttachProvider \ META-INF/services/com.sun.tools.attach.spi.AttachProvider \
META-INF/services/com.sun.tools.xjc.Plugin \ META-INF/services/com.sun.tools.xjc.Plugin \
META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \ META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \
org/relaxng/datatype \ org/relaxng/datatype \
sun/awt/HKSCS.class \ sun/awt/HKSCS.class \
sun/awt/motif/X11GB2312.class \ sun/awt/motif/X11GB2312.class \
sun/awt/motif/X11GB2312\$$$$Decoder.class \ sun/awt/motif/X11GB2312\$$$$Decoder.class \
sun/awt/motif/X11GB2312\$$$$Encoder.class \ sun/awt/motif/X11GB2312\$$$$Encoder.class \
sun/awt/motif/X11GBK.class \ sun/awt/motif/X11GBK.class \
sun/awt/motif/X11GBK\$$$$Encoder.class \ sun/awt/motif/X11GBK\$$$$Encoder.class \
sun/awt/motif/X11KSC5601.class \ sun/awt/motif/X11KSC5601.class \
sun/awt/motif/X11KSC5601\$$$$Decoder.class \ sun/awt/motif/X11KSC5601\$$$$Decoder.class \
sun/awt/motif/X11KSC5601\$$$$Encoder.class \ sun/awt/motif/X11KSC5601\$$$$Encoder.class \
sun/jvmstat \ sun/jvmstat \
sun/net/spi/nameservice/dns \ sun/net/spi/nameservice/dns \
sun/nio/cs/ext \ sun/nio/cs/ext \
sun/rmi/rmic \ sun/rmi/rmic \
sun/security/ec \ sun/security/ec \
sun/security/internal \ sun/security/internal \
sun/security/mscapi \ sun/security/mscapi \
sun/security/pkcs11 \ sun/security/pkcs11 \
sun/security/provider/Sun.class \ sun/security/provider/Sun.class \
sun/security/rsa/SunRsaSign.class \ sun/security/rsa/SunRsaSign.class \
sun/security/ssl \ sun/security/ssl \
sun/security/tools/jarsigner \ sun/security/tools/jarsigner \
sun/swing/BeanInfoUtils.class \ sun/swing/BeanInfoUtils.class \
sun/text/resources/cldr \ sun/text/resources/cldr \
sun/tools/asm \ sun/tools/asm \
sun/tools/attach \ sun/tools/attach \
sun/tools/java \ sun/tools/java \
sun/tools/javac \ sun/tools/javac \
sun/tools/jcmd \ sun/tools/jcmd \
sun/tools/jconsole \ sun/tools/jconsole \
sun/tools/jinfo \ sun/tools/jinfo \
sun/tools/jmap \ sun/tools/jmap \
sun/tools/jps \ sun/tools/jps \
sun/tools/jstack \ sun/tools/jstack \
sun/tools/jstat \ sun/tools/jstat \
sun/tools/jstatd \ sun/tools/jstatd \
sun/tools/native2ascii \ sun/tools/native2ascii \
sun/tools/serialver \ sun/tools/serialver \
sun/tools/tree \ sun/tools/tree \
sun/tools/util \ sun/tools/util \
sun/util/cldr/CLDRLocaleDataMetaInfo.class \ sun/util/cldr/CLDRLocaleDataMetaInfo.class \
sun/util/resources/cldr \ sun/util/resources/cldr \
$(LOCALEDATA_INCLUDES) \ $(LOCALEDATA_INCLUDES) \
com/oracle/jrockit/jfr \ com/oracle/jrockit/jfr \
oracle/jrockit/jfr \ oracle/jrockit/jfr \
jdk/jfr jdk/jfr
# Find all files in the classes dir to use as dependencies. This could be more fine granular. # Find all files in the classes dir to use as dependencies. This could be more fine granular.
ALL_FILES_IN_CLASSES := $(call not-containing,_the.,$(filter-out %javac_state,\ ALL_FILES_IN_CLASSES := $(call not-containing, _the., $(filter-out %javac_state, \
$(call CacheFind,$(JDK_OUTPUTDIR)/classes))) $(call CacheFind, $(JDK_OUTPUTDIR)/classes)))
RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar_manifest RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar_manifest
RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar_manifest RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar_manifest
...@@ -226,9 +226,9 @@ RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.j ...@@ -226,9 +226,9 @@ RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.j
$(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST) $(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
-e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
$(MAINMANIFEST) >> $@.tmp $(MAINMANIFEST) >> $@.tmp
$(ECHO) >> $@.tmp $(ECHO) >> $@.tmp
$(CAT) $(BEANMANIFEST) >> $@.tmp $(CAT) $(BEANMANIFEST) >> $@.tmp
$(MV) $@.tmp $@ $(MV) $@.tmp $@
...@@ -236,9 +236,9 @@ $(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST) ...@@ -236,9 +236,9 @@ $(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
$(RESOURCE_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(RESOURCE_JAR_MANIFEST_FILE): $(MAINMANIFEST)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
-e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
$(MAINMANIFEST) >> $@.tmp $(MAINMANIFEST) >> $@.tmp
$(MV) $@.tmp $@ $(MV) $@.tmp $@
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude: $(MAKEFILE) $(PROFILE_MAKEFILES) $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude: $(MAKEFILE) $(PROFILE_MAKEFILES)
...@@ -247,32 +247,32 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude: $(MAKEFILE) $(PROFILE_MAKEF ...@@ -247,32 +247,32 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude: $(MAKEFILE) $(PROFILE_MAKEF
$(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp) $(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp)
$(MV) $@.tmp $@ $(MV) $@.tmp $@
$(IMAGES_OUTPUTDIR)/lib/classlist : $(JDK_TOPDIR)/make/tools/sharing/classlist.$(OPENJDK_TARGET_OS) \ $(IMAGES_OUTPUTDIR)/lib/classlist: $(JDK_TOPDIR)/make/tools/sharing/classlist.$(OPENJDK_TARGET_OS) \
$(MAKEFILE) $(MAKEFILE)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
$(TOOL_ADDJSUM) $< $@.tmp $(TOOL_ADDJSUM) $< $@.tmp
$(MV) $@.tmp $@ $(MV) $@.tmp $@
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude \ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude \
$(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist $(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
($(CD) $(JDK_OUTPUTDIR)/classes && \ ($(CD) $(JDK_OUTPUTDIR)/classes && \
$(TOOL_JARREORDER) \ $(TOOL_JARREORDER) \
-o $@.tmp $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude . ) -o $@.tmp $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude . )
$(MV) $@.tmp $@ $(MV) $@.tmp $@
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
$(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp $(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
ifneq ($(PROFILE),) ifneq ($(PROFILE), )
# # Add back classes from excluded packages (fixing the $ substitution in the process) # # Add back classes from excluded packages (fixing the $ substitution in the process)
for type in $(subst \$$,\, $(RT_JAR_INCLUDE_TYPES)) ; do \ for type in $(subst \$$,\, $(RT_JAR_INCLUDE_TYPES)) ; do \
$(ECHO) $$type >> $@.tmp ; \ $(ECHO) $$type >> $@.tmp ; \
done done
endif endif
$(MV) $@.tmp $@ $(MV) $@.tmp $@
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents
...@@ -281,21 +281,21 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents: $(IMAGES_OUTPUTDI ...@@ -281,21 +281,21 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents: $(IMAGES_OUTPUTDI
$(GREP) -v -e '\.class$$' \ $(GREP) -v -e '\.class$$' \
-e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \ -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
ifneq ($(PROFILE),) ifneq ($(PROFILE), )
# # Strip out all META-INF/services/ entries # # Strip out all META-INF/services/ entries
$(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2 $(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2
# # Add back the required services # # Add back the required services
# # FIXME: On Solaris if PROFILE_INCLUDE_METAINF_SERVICES is not defined # # FIXME: On Solaris if PROFILE_INCLUDE_METAINF_SERVICES is not defined
# # we get a syntax error from sh. That doesn't happen on linux # # we get a syntax error from sh. That doesn't happen on linux
for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \ for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \
$(ECHO) $$service >> $@.tmp2; \ $(ECHO) $$service >> $@.tmp2; \
done done
$(MV) $@.tmp2 $@.tmp $(MV) $@.tmp2 $@.tmp
endif endif
$(MV) $@.tmp $@ $(MV) $@.tmp $@
# This is a hack but I don't know how to make this fit into the existing scheme # This is a hack but I don't know how to make this fit into the existing scheme
$(PROFILE_VERSION_CLASS_TARGETS) : $(PROFILE_VERSION_JAVA_TARGETS) $(PROFILE_VERSION_CLASS_TARGETS): $(PROFILE_VERSION_JAVA_TARGETS)
@$(JAVAC) -d $(@D)/../../ $(@D)/$(VERSION_JAVA_FILE) @$(JAVAC) -d $(@D)/../../ $(@D)/$(VERSION_JAVA_FILE)
...@@ -317,102 +317,102 @@ CLASSES_TO_DEBEAN = \ ...@@ -317,102 +317,102 @@ CLASSES_TO_DEBEAN = \
com/sun/java/util/jar/pack/PackerImpl.class \ com/sun/java/util/jar/pack/PackerImpl.class \
com/sun/java/util/jar/pack/UnpackerImpl.class com/sun/java/util/jar/pack/UnpackerImpl.class
ifneq ($(PROFILE),) ifneq ($(PROFILE), )
BEANLESS_CLASSES_TARGETS := $(addprefix $(BEANLESS_CLASSES)/, $(CLASSES_TO_DEBEAN)) BEANLESS_CLASSES_TARGETS := $(addprefix $(BEANLESS_CLASSES)/, $(CLASSES_TO_DEBEAN))
endif endif
RT_JAR_CREATE_OPTIONS := c0fm RT_JAR_CREATE_OPTIONS := c0fm
RT_JAR_UPDATE_OPTIONS := u0f RT_JAR_UPDATE_OPTIONS := u0f
ifeq ($(COMPRESS_JARS), true) ifeq ($(COMPRESS_JARS), true)
RT_JAR_CREATE_OPTIONS := cfm RT_JAR_CREATE_OPTIONS := cfm
RT_JAR_UPDATE_OPTIONS := uf RT_JAR_UPDATE_OPTIONS := uf
endif endif
# This defines a target-specific variables to make the shell logic easier to see. # This defines a target-specific variables to make the shell logic easier to see.
# We need to find the Version.class file for the profile currently being built # We need to find the Version.class file for the profile currently being built
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: \ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: \
CLASS_FILE = $(if $(PROFILE),$(strip $(foreach class,$(PROFILE_VERSION_CLASS_TARGETS),$(if $(findstring $(PROFILE),$(class)),$(class)))), NO_SUCH_FILE) CLASS_FILE = $(if $(PROFILE), $(strip $(foreach class, $(PROFILE_VERSION_CLASS_TARGETS), $(if $(findstring $(PROFILE), $(class)), $(class)))), NO_SUCH_FILE)
# This is the real target # This is the real target
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE) $(PROFILE_VERSION_CLASS_TARGETS) $(BEANLESS_CLASSES_TARGETS) $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE) $(PROFILE_VERSION_CLASS_TARGETS) $(BEANLESS_CLASSES_TARGETS)
$(ECHO) Creating rt.jar $(PROFILE) Compressed=$(COMPRESS_JARS) $(ECHO) Creating rt.jar $(PROFILE) Compressed=$(COMPRESS_JARS)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
$(CD) $(JDK_OUTPUTDIR)/classes && \ $(CD) $(JDK_OUTPUTDIR)/classes && \
$(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \ $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \
@$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents && \ @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents && \
if [ -f $(CLASS_FILE) ]; then \ if [ -f $(CLASS_FILE) ]; then \
$(ECHO) Updating rt.jar $(PROFILE) && \ $(ECHO) Updating rt.jar $(PROFILE) && \
$(CD) $(patsubst %$(VERSION_CLASS_PATH),%,$(CLASS_FILE)) && \ $(CD) $(patsubst %$(VERSION_CLASS_PATH), %, $(CLASS_FILE)) && \
$(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(VERSION_CLASS_PATH); \ $(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(VERSION_CLASS_PATH); \
$(CD) $(BEANLESS_CLASSES) && \ $(CD) $(BEANLESS_CLASSES) && \
$(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(CLASSES_TO_DEBEAN); \ $(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(CLASSES_TO_DEBEAN); \
fi fi
$(MV) $@.tmp $@ $(MV) $@.tmp $@
$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents \ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents \
$(RESOURCE_JAR_MANIFEST_FILE) $(RESOURCE_JAR_MANIFEST_FILE)
$(ECHO) Creating resources.jar $(ECHO) Creating resources.jar
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
$(CD) $(JDK_OUTPUTDIR)/classes && \ $(CD) $(JDK_OUTPUTDIR)/classes && \
$(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \ $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \
@$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents
$(MV) $@.tmp $@ $(MV) $@.tmp $@
########################################################################################## ##########################################################################################
ifneq ($(OPENJDK_TARGET_OS), windows) ifneq ($(OPENJDK_TARGET_OS), windows)
CHARSETS_EXTRA_FILES:=sun/awt/motif/X11GBK.class \ CHARSETS_EXTRA_FILES := sun/awt/motif/X11GBK.class \
sun/awt/motif/X11GB2312\$$$$Decoder.class \ sun/awt/motif/X11GB2312\$$$$Decoder.class \
sun/awt/motif/X11GB2312.class \ sun/awt/motif/X11GB2312.class \
sun/awt/motif/X11KSC5601\$$$$Decoder.class \ sun/awt/motif/X11KSC5601\$$$$Decoder.class \
sun/awt/motif/X11KSC5601\$$$$Encoder.class \ sun/awt/motif/X11KSC5601\$$$$Encoder.class \
sun/awt/motif/X11GB2312\$$$$Encoder.class \ sun/awt/motif/X11GB2312\$$$$Encoder.class \
sun/awt/motif/X11GBK\$$$$Encoder.class \ sun/awt/motif/X11GBK\$$$$Encoder.class \
sun/awt/motif/X11KSC5601.class sun/awt/motif/X11KSC5601.class
endif endif
$(eval $(call SetupArchive,BUILD_CHARSETS_JAR,,\ $(eval $(call SetupArchive,BUILD_CHARSETS_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes, \ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class .dat,\ SUFFIXES := .class .dat, \
INCLUDES:=sun/nio/cs/ext,\ INCLUDES := sun/nio/cs/ext, \
EXTRA_FILES := sun/awt/HKSCS.class \ EXTRA_FILES := sun/awt/HKSCS.class \
$(CHARSETS_EXTRA_FILES), \ $(CHARSETS_EXTRA_FILES), \
JAR:=$(IMAGES_OUTPUTDIR)/lib/charsets.jar, \ JAR := $(IMAGES_OUTPUTDIR)/lib/charsets.jar, \
SKIP_METAINF := true, \ SKIP_METAINF := true, \
CHECK_COMPRESS_JAR:=true)) CHECK_COMPRESS_JAR := true))
########################################################################################## ##########################################################################################
ifndef OPENJDK ifndef OPENJDK
ifeq ($(ENABLE_JFR), true) ifeq ($(ENABLE_JFR), true)
$(eval $(call SetupArchive,BUILD_JFR_JAR,,\ $(eval $(call SetupArchive,BUILD_JFR_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes,\ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class .jfc .xsd,\ SUFFIXES := .class .jfc .xsd, \
INCLUDES:=com/oracle/jrockit/jfr \ INCLUDES := com/oracle/jrockit/jfr \
oracle/jrockit/jfr \ oracle/jrockit/jfr \
jdk/jfr,\ jdk/jfr, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/jfr.jar,\ JAR := $(IMAGES_OUTPUTDIR)/lib/jfr.jar, \
SKIP_METAINF:=true,\ SKIP_METAINF := true, \
MANIFEST:=$(MAINMANIFEST), \ MANIFEST := $(MAINMANIFEST), \
CHECK_COMPRESS_JAR:=true)) CHECK_COMPRESS_JAR := true))
endif endif
endif endif
########################################################################################## ##########################################################################################
$(eval $(call SetupArchive,BUILD_JSSE_JAR,,\ $(eval $(call SetupArchive,BUILD_JSSE_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes,\ SRCS := $(JDK_OUTPUTDIR)/classes, \
INCLUDES:=sun/security/provider/Sun.class \ INCLUDES := sun/security/provider/Sun.class \
sun/security/rsa/SunRsaSign.class \ sun/security/rsa/SunRsaSign.class \
sun/security/ssl \ sun/security/ssl \
com/sun/net/ssl/internal/ssl,\ com/sun/net/ssl/internal/ssl, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/jsse.jar,\ JAR := $(IMAGES_OUTPUTDIR)/lib/jsse.jar, \
SKIP_METAINF:=true,\ SKIP_METAINF := true, \
MANIFEST:=$(MAINMANIFEST), \ MANIFEST := $(MAINMANIFEST), \
CHECK_COMPRESS_JAR:=true)) CHECK_COMPRESS_JAR := true))
########################################################################################## ##########################################################################################
# Create manifest for security jars # Create manifest for security jars
...@@ -424,9 +424,9 @@ JCE_MANIFEST := $(IMAGES_OUTPUTDIR)/lib/_the.security.manifest.mf ...@@ -424,9 +424,9 @@ JCE_MANIFEST := $(IMAGES_OUTPUTDIR)/lib/_the.security.manifest.mf
$(JCE_MANIFEST): $(MAINMANIFEST) $(JCE_MANIFEST): $(MAINMANIFEST)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
$(SED) -e "s#@@RELEASE@@#$(JDK_VERSION)#" \ $(SED) -e "s#@@RELEASE@@#$(JDK_VERSION)#" \
-e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
$(MAINMANIFEST) >> $@.tmp $(MAINMANIFEST) >> $@.tmp
$(ECHO) "Extension-Name: javax.crypto" >> $@.tmp $(ECHO) "Extension-Name: javax.crypto" >> $@.tmp
$(ECHO) "Implementation-Vendor-Id: com.sun" >> $@.tmp $(ECHO) "Implementation-Vendor-Id: com.sun" >> $@.tmp
$(MV) $@.tmp $@ $(MV) $@.tmp $@
...@@ -445,23 +445,23 @@ $(JCE_MANIFEST): $(MAINMANIFEST) ...@@ -445,23 +445,23 @@ $(JCE_MANIFEST): $(MAINMANIFEST)
SUNPKCS11_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunpkcs11.jar SUNPKCS11_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunpkcs11.jar
SUNPKCS11_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunpkcs11.jar SUNPKCS11_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunpkcs11.jar
$(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR,,\ $(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes, \ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class,\ SUFFIXES := .class, \
INCLUDES:=sun/security/pkcs11,\ INCLUDES := sun/security/pkcs11, \
JAR:=$(SUNPKCS11_JAR_UNSIGNED), \ JAR := $(SUNPKCS11_JAR_UNSIGNED), \
MANIFEST:=$(JCE_MANIFEST), \ MANIFEST := $(JCE_MANIFEST), \
SKIP_METAINF := true)) SKIP_METAINF := true))
$(SUNPKCS11_JAR_UNSIGNED): $(JCE_MANIFEST) $(SUNPKCS11_JAR_UNSIGNED): $(JCE_MANIFEST)
ifndef OPENJDK ifndef OPENJDK
SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar
$(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_SRC) $(SUNPKCS11_JAR_DST): $(SUNPKCS11_JAR_SRC)
@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunPKCS11 provider..." @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunPKCS11 provider..."
$(install-file) $(install-file)
else else
$(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_UNSIGNED) $(SUNPKCS11_JAR_DST): $(SUNPKCS11_JAR_UNSIGNED)
$(install-file) $(install-file)
endif endif
...@@ -472,23 +472,23 @@ JARS += $(SUNPKCS11_JAR_UNSIGNED) ...@@ -472,23 +472,23 @@ JARS += $(SUNPKCS11_JAR_UNSIGNED)
SUNEC_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunec.jar SUNEC_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunec.jar
SUNEC_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunec.jar SUNEC_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunec.jar
$(eval $(call SetupArchive,BUILD_SUNEC_JAR,,\ $(eval $(call SetupArchive,BUILD_SUNEC_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes, \ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class,\ SUFFIXES := .class, \
INCLUDES:=sun/security/ec,\ INCLUDES := sun/security/ec, \
JAR:=$(SUNEC_JAR_UNSIGNED), \ JAR := $(SUNEC_JAR_UNSIGNED), \
MANIFEST:=$(JCE_MANIFEST), \ MANIFEST := $(JCE_MANIFEST), \
SKIP_METAINF := true)) SKIP_METAINF := true))
$(SUNEC_JAR_UNSIGNED): $(JCE_MANIFEST) $(SUNEC_JAR_UNSIGNED): $(JCE_MANIFEST)
ifndef OPENJDK ifndef OPENJDK
SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar
$(SUNEC_JAR_DST) : $(SUNEC_JAR_SRC) $(SUNEC_JAR_DST): $(SUNEC_JAR_SRC)
@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunEC provider..." @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunEC provider..."
$(install-file) $(install-file)
else else
$(SUNEC_JAR_DST) : $(SUNEC_JAR_UNSIGNED) $(SUNEC_JAR_DST): $(SUNEC_JAR_UNSIGNED)
$(install-file) $(install-file)
endif endif
...@@ -496,28 +496,28 @@ JARS += $(SUNEC_JAR_UNSIGNED) ...@@ -496,28 +496,28 @@ JARS += $(SUNEC_JAR_UNSIGNED)
########################################################################################## ##########################################################################################
$(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR,,\ $(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes,\ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=BeanInfo.class .gif,\ SUFFIXES := BeanInfo.class .gif, \
INCLUDES:=javax/swing sun/swing,\ INCLUDES := javax/swing sun/swing, \
EXCLUDES:=javax/swing/plaf,\ EXCLUDES := javax/swing/plaf, \
EXTRA_FILES:=javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class,\ EXTRA_FILES := javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/dt.jar,\ JAR := $(IMAGES_OUTPUTDIR)/lib/dt.jar, \
SKIP_METAINF:=true)) SKIP_METAINF := true))
########################################################################################## ##########################################################################################
SUNJCE_PROVIDER_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunjce_provider.jar SUNJCE_PROVIDER_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunjce_provider.jar
SUNJCE_PROVIDER_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunjce_provider.jar SUNJCE_PROVIDER_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunjce_provider.jar
ifneq ($(BUILD_CRYPTO),no) ifneq ($(BUILD_CRYPTO), no)
$(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR,,\ $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes, \ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class,\ SUFFIXES := .class, \
INCLUDES:= com/sun/crypto/provider,\ INCLUDES := com/sun/crypto/provider, \
JAR:=$(SUNJCE_PROVIDER_JAR_UNSIGNED), \ JAR := $(SUNJCE_PROVIDER_JAR_UNSIGNED), \
MANIFEST:=$(JCE_MANIFEST), \ MANIFEST := $(JCE_MANIFEST), \
SKIP_METAINF := true)) SKIP_METAINF := true))
$(SUNJCE_PROVIDER_JAR_UNSIGNED): $(JCE_MANIFEST) $(SUNJCE_PROVIDER_JAR_UNSIGNED): $(JCE_MANIFEST)
...@@ -525,12 +525,12 @@ ifneq ($(BUILD_CRYPTO),no) ...@@ -525,12 +525,12 @@ ifneq ($(BUILD_CRYPTO),no)
endif endif
ifndef OPENJDK ifndef OPENJDK
SUNJCE_PROVIDER_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/sunjce_provider.jar SUNJCE_PROVIDER_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/sunjce_provider.jar
$(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_SRC) $(SUNJCE_PROVIDER_JAR_DST): $(SUNJCE_PROVIDER_JAR_SRC)
@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunJCE provider..." @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunJCE provider..."
$(install-file) $(install-file)
else else
$(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_UNSIGNED) $(SUNJCE_PROVIDER_JAR_DST): $(SUNJCE_PROVIDER_JAR_UNSIGNED)
$(install-file) $(install-file)
endif endif
...@@ -539,27 +539,27 @@ endif ...@@ -539,27 +539,27 @@ endif
JCE_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/jce.jar JCE_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/jce.jar
JCE_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/jce.jar JCE_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/jce.jar
ifneq ($(BUILD_CRYPTO),no) ifneq ($(BUILD_CRYPTO), no)
$(eval $(call SetupArchive,BUILD_JCE_JAR,,\ $(eval $(call SetupArchive,BUILD_JCE_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes, \ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class,\ SUFFIXES := .class, \
INCLUDES:= javax/crypto sun/security/internal,\ INCLUDES := javax/crypto sun/security/internal, \
JAR:=$(JCE_JAR_UNSIGNED), \ JAR := $(JCE_JAR_UNSIGNED), \
MANIFEST:=$(JCE_MANIFEST), \ MANIFEST := $(JCE_MANIFEST), \
SKIP_METAINF := true)) SKIP_METAINF := true))
$(JCE_JAR_UNSIGNED): $(JCE_MANIFEST) $(JCE_JAR_UNSIGNED): $(JCE_MANIFEST)
JARS += $(JCE_JAR_UNSIGNED) JARS += $(JCE_JAR_UNSIGNED)
endif endif
ifndef OPENJDK ifndef OPENJDK
JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar
$(JCE_JAR_DST) : $(JCE_JAR_SRC) $(JCE_JAR_DST): $(JCE_JAR_SRC)
@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt jce.jar..." @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt jce.jar..."
$(install-file) $(install-file)
else else
$(JCE_JAR_DST) : $(JCE_JAR_UNSIGNED) $(JCE_JAR_DST): $(JCE_JAR_UNSIGNED)
$(install-file) $(install-file)
endif endif
...@@ -568,28 +568,28 @@ endif ...@@ -568,28 +568,28 @@ endif
US_EXPORT_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/US_export_policy.jar US_EXPORT_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/US_export_policy.jar
US_EXPORT_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/US_export_policy.jar US_EXPORT_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/US_export_policy.jar
ifneq ($(BUILD_CRYPTO),no) ifneq ($(BUILD_CRYPTO), no)
# #
# TODO fix so that SetupArchive does not write files into SRCS # TODO fix so that SetupArchive does not write files into SRCS
# then we don't need this extra copying # then we don't need this extra copying
# NOTE: We currently do not place restrictions on our limited export # NOTE: We currently do not place restrictions on our limited export
# policy. This was not a typo. # policy. This was not a typo.
# #
US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
US_EXPORT_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/US_export_policy_jar.tmp US_EXPORT_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/US_export_policy_jar.tmp
$(US_EXPORT_POLICY_JAR_TMP)/% : $(US_EXPORT_POLICY_JAR_SRC_DIR)/% $(US_EXPORT_POLICY_JAR_TMP)/%: $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
$(install-file) $(install-file)
US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy 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),\ $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR, $(US_EXPORT_POLICY_JAR_DEPS), \
SRCS:=$(US_EXPORT_POLICY_JAR_TMP), \ SRCS := $(US_EXPORT_POLICY_JAR_TMP), \
SUFFIXES:= .policy,\ SUFFIXES := .policy, \
JAR:=$(US_EXPORT_POLICY_JAR_UNSIGNED), \ JAR := $(US_EXPORT_POLICY_JAR_UNSIGNED), \
EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \ EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \
SKIP_METAINF := true)) SKIP_METAINF := true))
JARS += $(US_EXPORT_POLICY_JAR_UNSIGNED) JARS += $(US_EXPORT_POLICY_JAR_UNSIGNED)
endif endif
...@@ -608,10 +608,10 @@ endif ...@@ -608,10 +608,10 @@ endif
LOCAL_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/local_policy.jar LOCAL_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/local_policy.jar
LOCAL_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/local_policy.jar LOCAL_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/local_policy.jar
ifneq ($(BUILD_CRYPTO),no) ifneq ($(BUILD_CRYPTO), no)
# #
# TODO fix so that SetupArchive does not write files into SRCS # TODO fix so that SetupArchive does not write files into SRCS
# then we don't need this extra copying # then we don't need this extra copying
# #
LOCAL_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/local_policy_jar.tmp LOCAL_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/local_policy_jar.tmp
...@@ -622,19 +622,19 @@ ifneq ($(BUILD_CRYPTO),no) ...@@ -622,19 +622,19 @@ ifneq ($(BUILD_CRYPTO),no)
else else
LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited
LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \ LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \
$(LOCAL_POLICY_JAR_TMP)/default_local.policy $(LOCAL_POLICY_JAR_TMP)/default_local.policy
LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited
endif endif
$(LOCAL_POLICY_JAR_TMP)/% : $(LOCAL_POLICY_JAR_SRC_DIR)/% $(LOCAL_POLICY_JAR_TMP)/%: $(LOCAL_POLICY_JAR_SRC_DIR)/%
$(install-file) $(install-file)
$(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR,$(LOCAL_POLICY_JAR_DEPS),\ $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR, $(LOCAL_POLICY_JAR_DEPS), \
SRCS:=$(LOCAL_POLICY_JAR_TMP),\ SRCS := $(LOCAL_POLICY_JAR_TMP), \
SUFFIXES:= .policy,\ SUFFIXES := .policy, \
JAR:=$(LOCAL_POLICY_JAR_UNSIGNED), \ JAR := $(LOCAL_POLICY_JAR_UNSIGNED), \
EXTRA_MANIFEST_ATTR := $(LOCAL_POLICY_JAR_ATTR), \ EXTRA_MANIFEST_ATTR := $(LOCAL_POLICY_JAR_ATTR), \
SKIP_METAINF := true)) SKIP_METAINF := true))
JARS += $(LOCAL_POLICY_JAR_UNSIGNED) JARS += $(LOCAL_POLICY_JAR_UNSIGNED)
endif endif
...@@ -650,153 +650,153 @@ endif ...@@ -650,153 +650,153 @@ endif
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
SUNMSCAPI_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar SUNMSCAPI_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar
SUNMSCAPI_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunmscapi.jar SUNMSCAPI_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunmscapi.jar
$(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR,,\ $(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes, \ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class,\ SUFFIXES := .class, \
INCLUDES:= sun/security/mscapi,\ INCLUDES := sun/security/mscapi, \
JAR:=$(SUNMSCAPI_JAR_UNSIGNED), \ JAR := $(SUNMSCAPI_JAR_UNSIGNED), \
MANIFEST:=$(JCE_MANIFEST), \ MANIFEST := $(JCE_MANIFEST), \
SKIP_METAINF:=true)) SKIP_METAINF := true))
$(SUNMSCAPI_JAR_UNSIGNED): $(JCE_MANIFEST) $(SUNMSCAPI_JAR_UNSIGNED): $(JCE_MANIFEST)
ifndef OPENJDK ifndef OPENJDK
SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar
$(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_SRC) $(SUNMSCAPI_JAR_DST): $(SUNMSCAPI_JAR_SRC)
@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunMSCAPI provider..." @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunMSCAPI provider..."
$(install-file) $(install-file)
else else
$(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_UNSIGNED) $(SUNMSCAPI_JAR_DST): $(SUNMSCAPI_JAR_UNSIGNED)
$(install-file) $(install-file)
endif endif
JARS += $(SUNMSCAPI_JAR_UNSIGNED) JARS += $(SUNMSCAPI_JAR_UNSIGNED)
endif endif
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS),solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
ifndef OPENJDK ifndef OPENJDK
UCRYPTO_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/ucrypto.jar UCRYPTO_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/ucrypto.jar
UCRYPTO_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/ucrypto.jar UCRYPTO_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/ucrypto.jar
UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
$(eval $(call SetupArchive,BUILD_UCRYPTO_JAR,,\ $(eval $(call SetupArchive,BUILD_UCRYPTO_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes, \ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class,\ SUFFIXES := .class, \
INCLUDES:=com/oracle/security/ucrypto,\ INCLUDES := com/oracle/security/ucrypto, \
JAR:=$(UCRYPTO_JAR_UNSIGNED), \ JAR := $(UCRYPTO_JAR_UNSIGNED), \
MANIFEST:=$(JCE_MANIFEST), \ MANIFEST := $(JCE_MANIFEST), \
SKIP_METAINF:=true)) SKIP_METAINF := true))
$(UCRYPTO_JAR_UNSIGNED): $(JCE_MANIFEST) $(UCRYPTO_JAR_UNSIGNED): $(JCE_MANIFEST)
$(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC) $(UCRYPTO_JAR_DST): $(UCRYPTO_JAR_SRC)
@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..." @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..."
$(install-file) $(install-file)
JARS += $(UCRYPTO_JAR_UNSIGNED) JARS += $(UCRYPTO_JAR_UNSIGNED)
endif endif
endif endif
########################################################################################## ##########################################################################################
# Get the CLDRVERSION # Get the CLDRVERSION
include GensrcCLDR.gmk include gensrc/GensrcCLDR.gmk
CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar CLDRDATA_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/cldrdata.jar
$(eval $(call SetupArchive,BUILD_CLDRDATA_JAR,,\ $(eval $(call SetupArchive,BUILD_CLDRDATA_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes,\ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class,\ SUFFIXES := .class, \
INCLUDES:=sun/text/resources/cldr \ INCLUDES := sun/text/resources/cldr \
sun/util/cldr \ sun/util/cldr \
sun/util/resources/cldr,\ sun/util/resources/cldr, \
EXCLUDES:=sun/util/cldr/CLDRLocaleProviderAdapter,\ EXCLUDES := sun/util/cldr/CLDRLocaleProviderAdapter, \
JAR:=$(CLDRDATA_JAR_DST),\ JAR := $(CLDRDATA_JAR_DST), \
EXTRA_MANIFEST_ATTR:=CLDR-Version: $(CLDRVERSION),\ EXTRA_MANIFEST_ATTR := CLDR-Version: $(CLDRVERSION), \
SKIP_METAINF:=true)) SKIP_METAINF := true))
########################################################################################## ##########################################################################################
TOOLS_JAR_INCLUDES := \ TOOLS_JAR_INCLUDES := \
com/sun/codemodel \ com/sun/codemodel \
com/sun/istack/internal/tools \ com/sun/istack/internal/tools \
com/sun/jarsigner \ com/sun/jarsigner \
com/sun/javadoc \ com/sun/javadoc \
com/sun/jdi \ com/sun/jdi \
com/sun/source \ com/sun/source \
com/sun/tools/attach \ com/sun/tools/attach \
com/sun/tools/classfile \ com/sun/tools/classfile \
com/sun/tools/corba \ com/sun/tools/corba \
com/sun/tools/doclets \ com/sun/tools/doclets \
com/sun/tools/doclint \ com/sun/tools/doclint \
com/sun/tools/example/debug/expr \ com/sun/tools/example/debug/expr \
com/sun/tools/example/debug/tty \ com/sun/tools/example/debug/tty \
com/sun/tools/extcheck \ com/sun/tools/extcheck \
com/sun/tools/hat \ com/sun/tools/hat \
com/sun/tools/internal/jxc \ com/sun/tools/internal/jxc \
com/sun/tools/internal/jxc/ap \ com/sun/tools/internal/jxc/ap \
com/sun/tools/internal/ws \ com/sun/tools/internal/ws \
com/sun/tools/internal/ws/wscompile/plugin/at_generated \ com/sun/tools/internal/ws/wscompile/plugin/at_generated \
com/sun/tools/internal/xjc \ com/sun/tools/internal/xjc \
com/sun/tools/javac \ com/sun/tools/javac \
com/sun/tools/javadoc \ com/sun/tools/javadoc \
com/sun/tools/javah \ com/sun/tools/javah \
com/sun/tools/javap \ com/sun/tools/javap \
com/sun/tools/jdeps \ com/sun/tools/jdeps \
com/sun/tools/jdi \ com/sun/tools/jdi \
com/sun/tools/script/shell \ com/sun/tools/script/shell \
com/sun/xml/internal/dtdparser \ com/sun/xml/internal/dtdparser \
com/sun/xml/internal/rngom \ com/sun/xml/internal/rngom \
com/sun/xml/internal/xsom \ com/sun/xml/internal/xsom \
org/relaxng/datatype \ org/relaxng/datatype \
sun/applet \ sun/applet \
sun/jvmstat \ sun/jvmstat \
sun/rmi/rmic \ sun/rmi/rmic \
sun/security/tools/jarsigner \ sun/security/tools/jarsigner \
sun/tools/asm \ sun/tools/asm \
sun/tools/attach \ sun/tools/attach \
sun/tools/jar \ sun/tools/jar \
sun/tools/java \ sun/tools/java \
sun/tools/javac \ sun/tools/javac \
sun/tools/jcmd \ sun/tools/jcmd \
sun/tools/jinfo \ sun/tools/jinfo \
sun/tools/jmap \ sun/tools/jmap \
sun/tools/jps \ sun/tools/jps \
sun/tools/jstack \ sun/tools/jstack \
sun/tools/jstat \ sun/tools/jstat \
sun/tools/jstatd \ sun/tools/jstatd \
sun/tools/native2ascii \ sun/tools/native2ascii \
sun/tools/serialver \ sun/tools/serialver \
sun/tools/tree \ sun/tools/tree \
sun/tools/util sun/tools/util
# The sjavac tools is not ready for public consumption. # The sjavac tools is not ready for public consumption.
TOOLS_JAR_EXCLUDES=com/sun/tools/sjavac TOOLS_JAR_EXCLUDES = com/sun/tools/sjavac
$(eval $(call SetupArchive,BUILD_TOOLS_JAR,,\ $(eval $(call SetupArchive,BUILD_TOOLS_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes,\ SRCS := $(JDK_OUTPUTDIR)/classes, \
SUFFIXES:=.class .prp .gif .properties .xml .css .xsd .js .html .txt .java \ SUFFIXES := .class .prp .gif .properties .xml .css .xsd .js .html .txt .java \
Tool aliasmap options,\ Tool aliasmap options, \
INCLUDES:=$(TOOLS_JAR_INCLUDES),\ INCLUDES := $(TOOLS_JAR_INCLUDES), \
EXCLUDES:=$(TOOLS_JAR_EXCLUDES),\ EXCLUDES := $(TOOLS_JAR_EXCLUDES), \
EXTRA_FILES:=META-INF/services/com.sun.jdi.connect.Connector \ EXTRA_FILES := META-INF/services/com.sun.jdi.connect.Connector \
META-INF/services/com.sun.jdi.connect.spi.TransportService \ META-INF/services/com.sun.jdi.connect.spi.TransportService \
META-INF/services/com.sun.tools.attach.spi.AttachProvider \ 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.ws.wscompile.Plugin \
META-INF/services/com.sun.tools.internal.xjc.Plugin,\ META-INF/services/com.sun.tools.internal.xjc.Plugin, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/tools.jar,\ JAR := $(IMAGES_OUTPUTDIR)/lib/tools.jar, \
SKIP_METAINF:=true, \ SKIP_METAINF := true, \
CHECK_COMPRESS_JAR:=true)) CHECK_COMPRESS_JAR := true))
########################################################################################## ##########################################################################################
...@@ -816,9 +816,9 @@ include javadoc/NON_CORE_PKGS.gmk ...@@ -816,9 +816,9 @@ include javadoc/NON_CORE_PKGS.gmk
# Swing has taken this approach only as a temporary measure to avoid # Swing has taken this approach only as a temporary measure to avoid
# the compiler warnings until we can properly document these packages. # the compiler warnings until we can properly document these packages.
# This is covered under 6491853. # This is covered under 6491853.
EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \ EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \
com.sun.java.swing.plaf.motif \ com.sun.java.swing.plaf.motif \
com.sun.java.swing.plaf.gtk com.sun.java.swing.plaf.gtk
# #
# Include the exported private packages in ct.sym. # Include the exported private packages in ct.sym.
...@@ -826,7 +826,7 @@ EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \ ...@@ -826,7 +826,7 @@ EXCLUDE_PROPWARN_PKGS = com.sun.java.swing.plaf.windows \
# with a new module system (being discussed for JDK 8). # with a new module system (being discussed for JDK 8).
# #
EXPORTED_PRIVATE_PKGS = com.oracle.net \ EXPORTED_PRIVATE_PKGS = com.oracle.net \
com.oracle.nio com.oracle.nio
$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar $(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar
$(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym $(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
...@@ -841,50 +841,50 @@ $(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar ...@@ -841,50 +841,50 @@ $(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar
$(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS) $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
$(TOUCH) $@ $(TOUCH) $@
$(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/symbols)) $(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/symbols))
$(eval $(call SetupArchive,BUILD_CT_SYM,$(IMAGES_OUTPUTDIR)/symbols/_the.symbols,\ $(eval $(call SetupArchive,BUILD_CT_SYM, $(IMAGES_OUTPUTDIR)/symbols/_the.symbols, \
SRCS:=$(IMAGES_OUTPUTDIR)/symbols,\ SRCS := $(IMAGES_OUTPUTDIR)/symbols, \
INCLUDES:=META-INF/sym,\ INCLUDES := META-INF/sym, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/ct.sym, \ JAR := $(IMAGES_OUTPUTDIR)/lib/ct.sym, \
CHECK_COMPRESS_JAR:=true)) CHECK_COMPRESS_JAR := true))
########################################################################################## ##########################################################################################
SRC_ZIP_INCLUDES = \ SRC_ZIP_INCLUDES = \
com/sun/corba \ com/sun/corba \
com/sun/image/codec/jpeg \ com/sun/image/codec/jpeg \
com/sun/imageio \ com/sun/imageio \
com/sun/java_cup \ com/sun/java_cup \
com/sun/javadoc \ com/sun/javadoc \
com/sun/java/swing \ com/sun/java/swing \
com/sun/jmx \ com/sun/jmx \
com/sun/naming \ com/sun/naming \
com/sun/org/apache \ com/sun/org/apache \
com/sun/security/auth \ com/sun/security/auth \
com/sun/security/jgss \ com/sun/security/jgss \
com/sun/source \ com/sun/source \
java \ java \
javax/accessibility \ javax/accessibility \
javax/annotation \ javax/annotation \
javax/imageio \ javax/imageio \
javax/lang \ javax/lang \
javax/management \ javax/management \
javax/naming \ javax/naming \
javax/print \ javax/print \
javax/rmi \ javax/rmi \
javax/script \ javax/script \
javax/security \ javax/security \
javax/sound \ javax/sound \
javax/sql \ javax/sql \
javax/swing \ javax/swing \
javax/tools \ javax/tools \
javax/xml \ javax/xml \
org/ietf \ org/ietf \
org/omg \ org/omg \
org/w3c/dom \ org/w3c/dom \
org/xml/sax \ org/xml/sax \
# #
SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes SRC_ZIP_SRCS = $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes
SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc SRC_ZIP_SRCS += $(JDK_OUTPUTDIR)/gensrc
...@@ -897,10 +897,10 @@ endif ...@@ -897,10 +897,10 @@ endif
# Need to copy launcher src files into desired directory structure # Need to copy launcher src files into desired directory structure
# before zipping the sources. # before zipping the sources.
LAUNCHER_SRC_FILES := $(wildcard $(JDK_TOPDIR)/src/share/bin/*) \ LAUNCHER_SRC_FILES := $(wildcard $(JDK_TOPDIR)/src/share/bin/*) \
$(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/java_md*) $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/java_md*)
LAUNCHER_ZIP_SRC := $(patsubst $(JDK_TOPDIR)/src/share/bin/%,$(IMAGES_OUTPUTDIR)/src/launcher/%,\ LAUNCHER_ZIP_SRC := $(patsubst $(JDK_TOPDIR)/src/share/bin/%, $(IMAGES_OUTPUTDIR)/src/launcher/%, \
$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%,$(IMAGES_OUTPUTDIR)/src/launcher/%,\ $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/%, $(IMAGES_OUTPUTDIR)/src/launcher/%, \
$(LAUNCHER_SRC_FILES))) $(LAUNCHER_SRC_FILES)))
$(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/share/bin/% $(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/share/bin/%
$(install-file) $(install-file)
...@@ -911,76 +911,76 @@ $(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DI ...@@ -911,76 +911,76 @@ $(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DI
$(IMAGES_OUTPUTDIR)/src.zip: $(LAUNCHER_ZIP_SRC) $(IMAGES_OUTPUTDIR)/src.zip: $(LAUNCHER_ZIP_SRC)
# This dir needs to exist before macro is evaluated to avoid warning from find. # This dir needs to exist before macro is evaluated to avoid warning from find.
$(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/src)) $(eval $(call MakeDir, $(IMAGES_OUTPUTDIR)/src))
$(eval $(call SetupZipArchive,BUILD_SRC_ZIP,\ $(eval $(call SetupZipArchive,BUILD_SRC_ZIP, \
SRC:=$(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src,\ SRC := $(SRC_ZIP_SRCS) $(IMAGES_OUTPUTDIR)/src, \
INCLUDES:=$(SRC_ZIP_INCLUDES) launcher,\ INCLUDES := $(SRC_ZIP_INCLUDES) launcher, \
EXCLUDES:=javax/swing/beaninfo,\ EXCLUDES := javax/swing/beaninfo, \
SUFFIXES:=.java .c .h,\ SUFFIXES := .java .c .h, \
ZIP:=$(IMAGES_OUTPUTDIR)/src.zip,\ ZIP := $(IMAGES_OUTPUTDIR)/src.zip, \
EXTRA_DEPS:=$(LAUNCHER_ZIP_SRC))) EXTRA_DEPS := $(LAUNCHER_ZIP_SRC)))
########################################################################################## ##########################################################################################
ifndef OPENJDK ifndef OPENJDK
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call SetupArchive,BUILD_JACCESS_JAR,,\ $(eval $(call SetupArchive,BUILD_JACCESS_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes,\ SRCS := $(JDK_OUTPUTDIR)/classes, \
INCLUDES:=com/sun/java/accessibility/util,\ INCLUDES := com/sun/java/accessibility/util, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar,\ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar, \
SKIP_METAINF:=true)) SKIP_METAINF := true))
JARS += $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar JARS += $(IMAGES_OUTPUTDIR)/lib/ext/jaccess.jar
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
$(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR,,\ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_32_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes_ab/32bit,\ SRCS := $(JDK_OUTPUTDIR)/classes_ab/32bit, \
INCLUDES:=com/sun/java/accessibility,\ INCLUDES := com/sun/java/accessibility, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar,\ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar, \
SKIP_METAINF:=true)) SKIP_METAINF := true))
$(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_LEGACY_JAR,,\ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_LEGACY_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes_ab/legacy,\ SRCS := $(JDK_OUTPUTDIR)/classes_ab/legacy, \
INCLUDES:=com/sun/java/accessibility,\ INCLUDES := com/sun/java/accessibility, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar,\ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar, \
SKIP_METAINF:=true)) SKIP_METAINF := true))
JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar \ JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-32.jar \
$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge.jar
else else
$(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_64_JAR,,\ $(eval $(call SetupArchive,BUILD_ACCESSBRIDGE_64_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/classes_ab/64bit,\ SRCS := $(JDK_OUTPUTDIR)/classes_ab/64bit, \
INCLUDES:=com/sun/java/accessibility,\ INCLUDES := com/sun/java/accessibility, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar,\ JAR := $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar, \
SKIP_METAINF:=true)) SKIP_METAINF := true))
JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar JARS += $(IMAGES_OUTPUTDIR)/lib/ext/access-bridge-64.jar
endif endif
endif endif
endif endif
########################################################################################## ##########################################################################################
# #
# This is an empty jar (only contains manifest) and fits poorly into framework... # This is an empty jar (only contains manifest) and fits poorly into framework...
# create simple rule instead # create simple rule instead
# #
$(IMAGES_OUTPUTDIR)/lib/management-agent.jar : $(JDK_TOPDIR)/src/share/classes/sun/management/manifest $(IMAGES_OUTPUTDIR)/lib/management-agent.jar: $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
$(JAR) cfm $@ $< $(JAR) cfm $@ $<
########################################################################################## ##########################################################################################
$(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar : $(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar $(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar: $(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar
$(install-file) $(install-file)
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
$(eval $(call SetupArchive,BUILD_JOBJC_JAR,,\ $(eval $(call SetupArchive,BUILD_JOBJC_JAR, , \
SRCS:=$(JDK_OUTPUTDIR)/jobjc_classes,\ SRCS := $(JDK_OUTPUTDIR)/jobjc_classes, \
JAR:=$(IMAGES_OUTPUTDIR)/lib/JObjC.jar, \ JAR := $(IMAGES_OUTPUTDIR)/lib/JObjC.jar, \
JARINDEX:=true)) JARINDEX := true))
endif endif
# This file is imported from hotspot in Import.gmk. Copying it into images/lib so that # This file is imported from hotspot in Import.gmk. Copying it into images/lib so that
...@@ -993,25 +993,25 @@ $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar ...@@ -993,25 +993,25 @@ $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar
# #
# sec-bin.zip is used by builds where the corresponding sources are not available # sec-bin.zip is used by builds where the corresponding sources are not available
# #
$(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP,\ $(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP, \
SRC:=$(JDK_OUTPUTDIR),\ SRC := $(JDK_OUTPUTDIR), \
INCLUDES:=classes/javax/net \ INCLUDES := classes/javax/net \
classes/javax/security/cert \ classes/javax/security/cert \
classes/com/sun/net/ssl \ classes/com/sun/net/ssl \
classes/com/sun/security/cert \ classes/com/sun/security/cert \
classes/sun/net/www/protocol/https \ classes/sun/net/www/protocol/https \
classes/sun/security/pkcs12 \ classes/sun/security/pkcs12 \
classes/sun/security/ssl \ classes/sun/security/ssl \
classes/sun/security/krb5 \ classes/sun/security/krb5 \
classes/sun/security/krb5/internal \ classes/sun/security/krb5/internal \
classes/sun/security/krb5/internal/ccache \ classes/sun/security/krb5/internal/ccache \
classes/sun/security/krb5/internal/crypto \ classes/sun/security/krb5/internal/crypto \
classes/sun/security/krb5/internal/ktab \ classes/sun/security/krb5/internal/ktab \
classes/sun/security/krb5/internal/rcache \ classes/sun/security/krb5/internal/rcache \
classes/sun/security/krb5/internal/util,\ classes/sun/security/krb5/internal/util, \
INCLUDE_FILES:=classes/sun/security/jgss/spi/GSSContextSpi.class,\ INCLUDE_FILES := classes/sun/security/jgss/spi/GSSContextSpi.class, \
EXCLUDES:=classes/sun/security/krb5/internal/tools,\ EXCLUDES := classes/sun/security/krb5/internal/tools, \
ZIP:=$(IMAGES_OUTPUTDIR)/sec-bin.zip)) ZIP := $(IMAGES_OUTPUTDIR)/sec-bin.zip))
JARS += $(IMAGES_OUTPUTDIR)/sec-bin.zip JARS += $(IMAGES_OUTPUTDIR)/sec-bin.zip
...@@ -1019,30 +1019,30 @@ JARS += $(IMAGES_OUTPUTDIR)/sec-bin.zip ...@@ -1019,30 +1019,30 @@ JARS += $(IMAGES_OUTPUTDIR)/sec-bin.zip
# #
# Windows specific binary security packages. # Windows specific binary security packages.
# #
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
# sec-windows-bin.zip is used by builds where the corresponding sources are not available # sec-windows-bin.zip is used by builds where the corresponding sources are not available
$(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP,\ $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP, \
SRC:=$(JDK_OUTPUTDIR),\ SRC := $(JDK_OUTPUTDIR), \
INCLUDES:=classes/sun/security/krb5/internal/tools,\ INCLUDES := classes/sun/security/krb5/internal/tools, \
ZIP:=$(IMAGES_OUTPUTDIR)/sec-windows-bin.zip)) ZIP := $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip))
JARS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip JARS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip
# JGSS files contain the native Kerberos library # JGSS files contain the native Kerberos library
ifeq ($(OPENJDK_TARGET_CPU),x86_64) ifeq ($(OPENJDK_TARGET_CPU), x86_64)
JGSS_ZIP_NAME=jgss-windows-x64-bin.zip JGSS_ZIP_NAME = jgss-windows-x64-bin.zip
else else
JGSS_ZIP_NAME=jgss-windows-i586-bin.zip JGSS_ZIP_NAME = jgss-windows-i586-bin.zip
endif endif
$(eval $(call SetupZipArchive,BUILD_JGSS_BIN_ZIP,\ $(eval $(call SetupZipArchive,BUILD_JGSS_BIN_ZIP, \
SRC:=$(JDK_OUTPUTDIR),\ SRC := $(JDK_OUTPUTDIR), \
INCLUDE_FILES:=bin/w2k_lsa_auth.dll \ INCLUDE_FILES := bin/w2k_lsa_auth.dll \
bin/w2k_lsa_auth.map \ bin/w2k_lsa_auth.map \
bin/w2k_lsa_auth.pdb,\ bin/w2k_lsa_auth.pdb, \
ZIP:=$(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME))) ZIP := $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)))
JARS += $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME) JARS += $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)
endif endif
########################################################################################## ##########################################################################################
......
makefiles/GenerateClasses.gmk
浏览文件 @ e864d64d
...@@ -57,58 +57,58 @@ BTRMIC_ARGS := "-Xbootclasspath/p:$(BTRMIC_CP)" -cp "$(BTRMIC_CP)" ...@@ -57,58 +57,58 @@ BTRMIC_ARGS := "-Xbootclasspath/p:$(BTRMIC_CP)" -cp "$(BTRMIC_CP)"
RMIC := $(JAVA) $(BTRMIC_ARGS) sun.rmi.rmic.Main RMIC := $(JAVA) $(BTRMIC_ARGS) sun.rmi.rmic.Main
CLASSES_DIR := $(JDK_OUTPUTDIR)/classes CLASSES_DIR := $(JDK_OUTPUTDIR)/classes
# NOTE: If the smart javac dependency management is reintroduced, these classes risk # 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. # interfering with the dependency checking. In that case they will need to be kept separate.
STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/classes STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/classes
RMIC_GENSRC_DIR := $(JDK_OUTPUTDIR)/gendocsrc_rmic RMIC_GENSRC_DIR := $(JDK_OUTPUTDIR)/gendocsrc_rmic
GENCLASSES := GENCLASSES :=
########################################################################################## ##########################################################################################
# #
# Generate RMI stubs # Generate RMI stubs
# #
$(eval $(call SetupRMICompilation,RMI_12,\ $(eval $(call SetupRMICompilation,RMI_12, \
CLASSES:=sun.rmi.server.Activation$$$$ActivationSystemImpl\ CLASSES := sun.rmi.server.Activation$$$$ActivationSystemImpl \
java.rmi.activation.ActivationGroup\ java.rmi.activation.ActivationGroup \
com.sun.jndi.rmi.registry.ReferenceWrapper,\ com.sun.jndi.rmi.registry.ReferenceWrapper, \
CLASSES_DIR:=$(CLASSES_DIR),\ CLASSES_DIR := $(CLASSES_DIR), \
STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\ STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
RUN_V12:=true)) RUN_V12 := true))
GENCLASSES += $(RMI_12) GENCLASSES += $(RMI_12)
$(eval $(call SetupRMICompilation,RMI_11,\ $(eval $(call SetupRMICompilation,RMI_11, \
CLASSES:=sun.rmi.registry.RegistryImpl\ CLASSES := sun.rmi.registry.RegistryImpl \
sun.rmi.transport.DGCImpl,\ sun.rmi.transport.DGCImpl, \
CLASSES_DIR:=$(CLASSES_DIR),\ CLASSES_DIR := $(CLASSES_DIR), \
STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\ STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
RUN_V11:=true)) RUN_V11 := true))
GENCLASSES += $(RMI_11) GENCLASSES += $(RMI_11)
# For RMI/IIOP call rmic a second time with -standardPackage option # For RMI/IIOP call rmic a second time with -standardPackage option
# so that *_tie classes are generated in package without the prefix # so that *_tie classes are generated in package without the prefix
# org.omg.stub (6375696) # org.omg.stub (6375696)
JMAN_RMI_CLASSES:=javax.management.remote.rmi.RMIConnectionImpl\ JMAN_RMI_CLASSES := javax.management.remote.rmi.RMIConnectionImpl \
javax.management.remote.rmi.RMIServerImpl javax.management.remote.rmi.RMIServerImpl
$(eval $(call SetupRMICompilation,RMI_IIOP,\ $(eval $(call SetupRMICompilation,RMI_IIOP, \
CLASSES:=$(JMAN_RMI_CLASSES),\ CLASSES := $(JMAN_RMI_CLASSES), \
CLASSES_DIR:=$(CLASSES_DIR),\ CLASSES_DIR := $(CLASSES_DIR), \
STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\ STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
RUN_V12:=true,\ RUN_V12 := true, \
RUN_IIOP:=true,\ RUN_IIOP := true, \
RUN_IIOP_STDPKG:=true)) RUN_IIOP_STDPKG := true))
GENCLASSES += $(RMI_IIOP) GENCLASSES += $(RMI_IIOP)
# Keep generated RMI/JRMP Stub source files and copy them to RMIC_GENSRC_DIR # Keep generated RMI/JRMP Stub source files and copy them to RMIC_GENSRC_DIR
# so that javadoc can include them in the API (4997471) # so that javadoc can include them in the API (4997471)
$(eval $(call SetupRMICompilation,RMI_SRC,\ $(eval $(call SetupRMICompilation,RMI_SRC, \
CLASSES:=$(JMAN_RMI_CLASSES),\ CLASSES := $(JMAN_RMI_CLASSES), \
CLASSES_DIR:=$(CLASSES_DIR),\ CLASSES_DIR := $(CLASSES_DIR), \
STUB_CLASSES_DIR:=$(RMIC_GENSRC_DIR),\ STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR), \
RUN_V12:=true,\ RUN_V12 := true, \
KEEP_GENERATED:=true)) KEEP_GENERATED := true))
GENCLASSES += $(filter %.java,$(RMI_SRC)) GENCLASSES += $(filter %.java, $(RMI_SRC))
########################################################################################## ##########################################################################################
......
makefiles/GenerateData.gmk
浏览文件 @ e864d64d
...@@ -38,16 +38,16 @@ include Tools.gmk ...@@ -38,16 +38,16 @@ include Tools.gmk
# These are written directly into classes dir. # These are written directly into classes dir.
GENDATA := GENDATA :=
include GendataBreakIterator.gmk include gendata/GendataBreakIterator.gmk
GENDATA += $(BREAK_ITERATOR) GENDATA += $(BREAK_ITERATOR)
include GendataFontConfig.gmk include gendata/GendataFontConfig.gmk
GENDATA += $(GENDATA_FONT_CONFIG) GENDATA += $(GENDATA_FONT_CONFIG)
include GendataTZDB.gmk include gendata/GendataTZDB.gmk
GENDATA += $(GENDATA_TZDB) GENDATA += $(GENDATA_TZDB)
include GendataHtml32dtd.gmk include gendata/GendataHtml32dtd.gmk
GENDATA += $(GENDATA_HTML32DTD) GENDATA += $(GENDATA_HTML32DTD)
########################################################################################## ##########################################################################################
...@@ -75,9 +75,9 @@ GENDATA += $(GENDATA_CURDATA) ...@@ -75,9 +75,9 @@ GENDATA += $(GENDATA_CURDATA)
########################################################################################## ##########################################################################################
$(GENDATA) : $(BUILD_TOOLS) $(GENDATA): $(BUILD_TOOLS)
$(JDK_OUTPUTDIR)/classes/_the.gendata : $(GENDATA) $(JDK_OUTPUTDIR)/classes/_the.gendata: $(GENDATA)
$(TOUCH) $@ $(TOUCH) $@
all: $(JDK_OUTPUTDIR)/classes/_the.gendata all: $(JDK_OUTPUTDIR)/classes/_the.gendata
......
makefiles/GenerateJavaSources.gmk → makefiles/GenerateSources.gmk
浏览文件 @ e864d64d
...@@ -38,57 +38,57 @@ include Tools.gmk ...@@ -38,57 +38,57 @@ include Tools.gmk
# Now include all the rules that generate Java sources. # Now include all the rules that generate Java sources.
# The Java sources are written into the gensrc_.... directories. # The Java sources are written into the gensrc_.... directories.
include GensrcProperties.gmk include gensrc/GensrcProperties.gmk
GENSRC += $(GENSRC_PROPERTIES) GENSRC += $(GENSRC_PROPERTIES)
include GensrcLocaleDataMetaInfo.gmk include gensrc/GensrcLocaleDataMetaInfo.gmk
GENSRC += $(GENSRC_LOCALEDATAMETAINFO) GENSRC += $(GENSRC_LOCALEDATAMETAINFO)
include GensrcCharacterData.gmk include gensrc/GensrcCharacterData.gmk
GENSRC += $(GENSRC_CHARACTERDATA) GENSRC += $(GENSRC_CHARACTERDATA)
include GensrcJDWP.gmk include gensrc/GensrcJDWP.gmk
GENSRC += $(GENSRC_JDWP) GENSRC += $(GENSRC_JDWP)
include GensrcMisc.gmk include gensrc/GensrcMisc.gmk
GENSRC += $(GENSRC_MISC) GENSRC += $(GENSRC_MISC)
include GensrcCharsetMapping.gmk include gensrc/GensrcCharsetMapping.gmk
GENSRC += $(GENSRC_CHARSETMAPPING) GENSRC += $(GENSRC_CHARSETMAPPING)
include GensrcCharsetCoder.gmk include gensrc/GensrcCharsetCoder.gmk
GENSRC += $(GENSRC_CHARSETCODER) GENSRC += $(GENSRC_CHARSETCODER)
include GensrcBuffer.gmk include gensrc/GensrcBuffer.gmk
GENSRC += $(GENSRC_BUFFER) GENSRC += $(GENSRC_BUFFER)
include GensrcExceptions.gmk include gensrc/GensrcExceptions.gmk
GENSRC += $(GENSRC_EXCEPTIONS) GENSRC += $(GENSRC_EXCEPTIONS)
ifneq ($(OPENJDK_TARGET_OS),windows) ifneq ($(OPENJDK_TARGET_OS), windows)
include GensrcIcons.gmk include gensrc/GensrcIcons.gmk
GENSRC += $(GENSRC_AWT_ICONS) GENSRC += $(GENSRC_AWT_ICONS)
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
GENSRC += $(GENSRC_OSX_ICONS) GENSRC += $(GENSRC_OSX_ICONS)
endif endif
include GensrcX11Wrappers.gmk include gensrc/GensrcX11Wrappers.gmk
GENSRC += $(GENSRC_X11WRAPPERS) GENSRC += $(GENSRC_X11WRAPPERS)
endif endif
include GensrcCLDR.gmk include gensrc/GensrcCLDR.gmk
GENSRC += $(GENSRC_CLDR) GENSRC += $(GENSRC_CLDR)
include GensrcSwing.gmk include gensrc/GensrcSwing.gmk
GENSRC += $(GENSRC_SWING_BEANINFO) $(GENSRC_SWING_NIMBUS) GENSRC += $(GENSRC_SWING_BEANINFO) $(GENSRC_SWING_NIMBUS)
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
include GensrcJObjC.gmk include gensrc/GensrcJObjC.gmk
GENSRC += $(GENSRC_JOBJC) GENSRC += $(GENSRC_JOBJC)
endif endif
$(GENSRC) : $(BUILD_TOOLS) $(GENSRC): $(BUILD_TOOLS)
all: $(GENSRC) all: $(GENSRC)
......
makefiles/Images.gmk
浏览文件 @ e864d64d
...@@ -31,13 +31,13 @@ include Setup.gmk ...@@ -31,13 +31,13 @@ include Setup.gmk
default: images default: images
# Prepare the find cache. Only used if running on windows. # Prepare the find cache. Only used if running on windows.
$(eval $(call FillCacheFind,\ $(eval $(call FillCacheFind, \
$(wildcard $(JDK_OUTPUTDIR)/bin \ $(wildcard $(JDK_OUTPUTDIR)/bin \
$(JDK_OUTPUTDIR)/lib \ $(JDK_OUTPUTDIR)/lib \
$(IMAGES_OUTPUTDIR)/lib \ $(IMAGES_OUTPUTDIR)/lib \
$(JDK_OUTPUTDIR)/include \ $(JDK_OUTPUTDIR)/include \
$(JDK_OUTPUTDIR)/sample \ $(JDK_OUTPUTDIR)/sample \
$(JDK_OUTPUTDIR)/demo))) $(JDK_OUTPUTDIR)/demo)))
include Tools.gmk include Tools.gmk
...@@ -92,102 +92,102 @@ endef ...@@ -92,102 +92,102 @@ endef
################################################################################ ################################################################################
# /bin dir # /bin dir
ifeq ($(PROFILE),) ifeq ($(PROFILE), )
NOT_JRE_BIN_FILES := \ NOT_JRE_BIN_FILES := \
appletviewer$(EXE_SUFFIX) \ appletviewer$(EXE_SUFFIX) \
extcheck$(EXE_SUFFIX) \ extcheck$(EXE_SUFFIX) \
idlj$(EXE_SUFFIX) \ idlj$(EXE_SUFFIX) \
jar$(EXE_SUFFIX) \ jar$(EXE_SUFFIX) \
jarsigner$(EXE_SUFFIX) \ jarsigner$(EXE_SUFFIX) \
java-rmi.cgi \ java-rmi.cgi \
javac$(EXE_SUFFIX) \ javac$(EXE_SUFFIX) \
javadoc$(EXE_SUFFIX) \ javadoc$(EXE_SUFFIX) \
javah$(EXE_SUFFIX) \ javah$(EXE_SUFFIX) \
javap$(EXE_SUFFIX) \ javap$(EXE_SUFFIX) \
jdeps$(EXE_SUFFIX) \ jdeps$(EXE_SUFFIX) \
jcmd$(EXE_SUFFIX) \ jcmd$(EXE_SUFFIX) \
jdb$(EXE_SUFFIX) \ jdb$(EXE_SUFFIX) \
jps$(EXE_SUFFIX) \ jps$(EXE_SUFFIX) \
jrunscript$(EXE_SUFFIX) \ jrunscript$(EXE_SUFFIX) \
jstat$(EXE_SUFFIX) \ jstat$(EXE_SUFFIX) \
jstatd$(EXE_SUFFIX) \ jstatd$(EXE_SUFFIX) \
jstack$(EXE_SUFFIX) \ jstack$(EXE_SUFFIX) \
packagebean$(SCRIPT_SUFFIX) \ packagebean$(SCRIPT_SUFFIX) \
rmic$(EXE_SUFFIX) \ rmic$(EXE_SUFFIX) \
serialver$(EXE_SUFFIX) \ serialver$(EXE_SUFFIX) \
unregbean$(EXE_SUFFIX) \ unregbean$(EXE_SUFFIX) \
jconsole$(EXE_SUFFIX) \ jconsole$(EXE_SUFFIX) \
jinfo$(EXE_SUFFIX) \ jinfo$(EXE_SUFFIX) \
jmap$(EXE_SUFFIX) \ jmap$(EXE_SUFFIX) \
native2ascii$(EXE_SUFFIX) \ native2ascii$(EXE_SUFFIX) \
xjc$(EXE_SUFFIX) \ xjc$(EXE_SUFFIX) \
wsgen$(EXE_SUFFIX) \ wsgen$(EXE_SUFFIX) \
wsimport$(EXE_SUFFIX) \ wsimport$(EXE_SUFFIX) \
schemagen$(EXE_SUFFIX) \ schemagen$(EXE_SUFFIX) \
jsadebugd$(EXE_SUFFIX) \ jsadebugd$(EXE_SUFFIX) \
jhat$(EXE_SUFFIX) jhat$(EXE_SUFFIX)
endif endif
WINDOWS_JDK_BIN_FILES = \ WINDOWS_JDK_BIN_FILES = \
$(EXE_SUFFIX) \ $(EXE_SUFFIX) \
$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \ $(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) \
$(notdir $(MSVCR_DLL)) $(notdir $(MSVCR_DLL))
WINDOWS_JDKJRE_BIN_FILES := \ WINDOWS_JDKJRE_BIN_FILES := \
$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \ $(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
$(SALIB_NAME) $(SALIB_NAME)
# Find all files in bin dir # Find all files in bin dir
ALL_BIN_LIST := $(call CacheFind,$(JDK_OUTPUTDIR)/bin) ALL_BIN_LIST := $(call CacheFind, $(JDK_OUTPUTDIR)/bin)
# Prevent sjavac from entering the images. # Prevent sjavac from entering the images.
ALL_BIN_LIST := $(filter-out %/sjavac,$(ALL_BIN_LIST)) ALL_BIN_LIST := $(filter-out %/sjavac, $(ALL_BIN_LIST))
# For unknown reason the debuginfo files for executables are not put into images # For unknown reason the debuginfo files for executables are not put into images
# e.g filter them out # e.g filter them out
ifneq ($(OPENJDK_TARGET_OS),windows) ifneq ($(OPENJDK_TARGET_OS), windows)
ALL_BIN_LIST := $(filter-out %.debuginfo %.diz, $(ALL_BIN_LIST)) ALL_BIN_LIST := $(filter-out %.debuginfo %.diz, $(ALL_BIN_LIST))
else else
# On windows, the libraries are in the bin dir, only filter out debuginfo files # On windows, the libraries are in the bin dir, only filter out debuginfo files
# for executables. "java" is both a library and executable. # for executables. "java" is both a library and executable.
ALL_BIN_EXEC_FILES := $(filter-out java.exe,$(notdir $(filter %.exe,$(ALL_BIN_LIST)))) ALL_BIN_EXEC_FILES := $(filter-out java.exe, $(notdir $(filter %.exe, $(ALL_BIN_LIST))))
ALL_BIN_DEBUG_FILTER := $(addprefix %,$(patsubst %.exe,%.debuginfo,$(ALL_BIN_EXEC_FILES)) \ ALL_BIN_DEBUG_FILTER := $(addprefix %, $(patsubst %.exe, %.debuginfo, $(ALL_BIN_EXEC_FILES)) \
$(patsubst %.exe,%.diz,$(ALL_BIN_EXEC_FILES))) %.pdb $(patsubst %.exe, %.diz, $(ALL_BIN_EXEC_FILES))) %.pdb
ALL_BIN_LIST := $(filter-out $(ALL_BIN_DEBUG_FILTER),$(ALL_BIN_LIST)) ALL_BIN_LIST := $(filter-out $(ALL_BIN_DEBUG_FILTER), $(ALL_BIN_LIST))
endif endif
JDKJRE_BIN_LIST := $(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST)) JDKJRE_BIN_LIST := $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES)), $(ALL_BIN_LIST))
JRE_BIN_LIST := $(filter-out $(addprefix %,$(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST)) JRE_BIN_LIST := $(filter-out $(addprefix %, $(WINDOWS_JDKJRE_BIN_FILES)), $(JDKJRE_BIN_LIST))
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
JDK_BIN_LIST := $(filter $(addprefix %,$(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST)) JDK_BIN_LIST := $(filter $(addprefix %, $(WINDOWS_JDK_BIN_FILES)), $(ALL_BIN_LIST))
# On windows x86, the server jvm is filtered out from the j2re image. This could possibly # On windows x86, the server jvm is filtered out from the j2re image. This could possibly
# be handled by profiles in the future. If no client jvm is built, leave server in. # be handled by profiles in the future. If no client jvm is built, leave server in.
ifeq ($(OPENJDK_TARGET_CPU),x86) ifeq ($(OPENJDK_TARGET_CPU), x86)
ifeq ($(JVM_VARIANT_CLIENT),true) ifeq ($(JVM_VARIANT_CLIENT), true)
JRE_BIN_LIST := $(filter-out $(JDK_OUTPUTDIR)/bin/server/%,$(JRE_BIN_LIST)) JRE_BIN_LIST := $(filter-out $(JDK_OUTPUTDIR)/bin/server/%, $(JRE_BIN_LIST))
endif
endif endif
endif
else else
JDK_BIN_LIST := $(ALL_BIN_LIST) JDK_BIN_LIST := $(ALL_BIN_LIST)
endif endif
ifneq ($(OPENJDK_TARGET_CPU_ISADIR),) ifneq ($(OPENJDK_TARGET_CPU_ISADIR), )
OVERLAY_FILTER := $(JDK_OUTPUTDIR)/bin$(OPENJDK_TARGET_CPU_ISADIR)% OVERLAY_FILTER := $(JDK_OUTPUTDIR)/bin$(OPENJDK_TARGET_CPU_ISADIR)%
endif endif
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\ $(foreach f,$(filter-out $(OVERLAY_FILTER),$(JRE_BIN_LIST)), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_BIN_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_BIN_TARGETS)))
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\ $(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDK_BIN_LIST)), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_BIN_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_BIN_TARGETS)))
$(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\ $(foreach f,$(filter-out $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
$(foreach f,$(filter $(OVERLAY_FILTER),$(JRE_BIN_LIST)),\ $(foreach f,$(filter $(OVERLAY_FILTER),$(JRE_BIN_LIST)), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_BIN_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_BIN_TARGETS)))
$(foreach f,$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)),\ $(foreach f,$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_BIN_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_BIN_TARGETS)))
$(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)),\ $(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
...@@ -213,29 +213,29 @@ endif ...@@ -213,29 +213,29 @@ endif
################################################################################ ################################################################################
# /lib dir # /lib dir
ifneq ($(OPENJDK_TARGET_OS), macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
JDKJRE_LIB_FILES := \ JDKJRE_LIB_FILES := \
$(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \ $(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
$(SALIB_NAME) $(SALIB_NAME)
endif endif
ifeq ($(PROFILE),) ifeq ($(PROFILE), )
NOT_JRE_LIB_FILES := \ NOT_JRE_LIB_FILES := \
tools.jar \ tools.jar \
jconsole.jar \ jconsole.jar \
sa-jdi.jar \ sa-jdi.jar \
dt.jar \ dt.jar \
orb.idl \ orb.idl \
ir.idl \ ir.idl \
ct.sym ct.sym
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
NOT_JRE_LIB_FILES += jawt.lib jvm.lib NOT_JRE_LIB_FILES += jawt.lib jvm.lib
endif endif
endif endif
JDK_LIB_FILES := $(NOT_JRE_LIB_FILES) JDK_LIB_FILES := $(NOT_JRE_LIB_FILES)
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
JDK_LIB_FILES += jexec JDK_LIB_FILES += jexec
endif endif
ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),) # If Linux or Solaris ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),) # If Linux or Solaris
...@@ -245,61 +245,61 @@ endif ...@@ -245,61 +245,61 @@ endif
# Find all files to copy from $(JDK_OUTPUTDIR)/lib # Find all files to copy from $(JDK_OUTPUTDIR)/lib
# Jar files are not expected to be here # Jar files are not expected to be here
ALL_JDKOUT_LIB_LIST := $(call not-containing,_the.,$(filter-out %.jar,\ ALL_JDKOUT_LIB_LIST := $(call not-containing,_the., $(filter-out %.jar, \
$(call CacheFind,$(JDK_OUTPUTDIR)/lib))) $(call CacheFind, $(JDK_OUTPUTDIR)/lib)))
# Find all files to copy from $(IMAGES_OUTPUTDIR)/lib # Find all files to copy from $(IMAGES_OUTPUTDIR)/lib
# This is were the jar files are and might not exist if building overlay-images # This is were the jar files are and might not exist if building overlay-images
ifneq ($(wildcard $(IMAGES_OUTPUTDIR)/lib),) ifneq ($(wildcard $(IMAGES_OUTPUTDIR)/lib), )
ALL_IMAGES_LIB_LIST := $(call not-containing,_the.,\ ALL_IMAGES_LIB_LIST := $(call not-containing,_the., \
$(call CacheFind,$(IMAGES_OUTPUTDIR)/lib)) $(call CacheFind, $(IMAGES_OUTPUTDIR)/lib))
endif endif
# Filter files to copy for each destination # Filter files to copy for each destination
JRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\ JRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %, $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)), \
$(ALL_JDKOUT_LIB_LIST)) $(ALL_JDKOUT_LIB_LIST))
JDKJRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_JDKOUT_LIB_LIST)) JDKJRE_JDKOUT_LIB_LIST := $(filter-out $(addprefix %, $(NOT_JRE_LIB_FILES)), $(ALL_JDKOUT_LIB_LIST))
JDK_JDKOUT_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_JDKOUT_LIB_LIST)) JDK_JDKOUT_LIB_LIST := $(filter $(addprefix %, $(JDK_LIB_FILES)), $(ALL_JDKOUT_LIB_LIST))
JRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\ JRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %, $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)), \
$(ALL_IMAGES_LIB_LIST)) $(ALL_IMAGES_LIB_LIST))
JDKJRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %,$(NOT_JRE_LIB_FILES)),$(ALL_IMAGES_LIB_LIST)) JDKJRE_IMAGES_LIB_LIST := $(filter-out $(addprefix %, $(NOT_JRE_LIB_FILES)), $(ALL_IMAGES_LIB_LIST))
JDK_IMAGES_LIB_LIST := $(filter $(addprefix %,$(JDK_LIB_FILES)),$(ALL_IMAGES_LIB_LIST)) JDK_IMAGES_LIB_LIST := $(filter $(addprefix %, $(JDK_LIB_FILES)), $(ALL_IMAGES_LIB_LIST))
# Iterate over files to copy to create rules for each one # Iterate over files to copy to create rules for each one
$(foreach f,$(JRE_JDKOUT_LIB_LIST),\ $(foreach f,$(JRE_JDKOUT_LIB_LIST), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS)))
$(foreach f,$(JDK_JDKOUT_LIB_LIST),\ $(foreach f,$(JDK_JDKOUT_LIB_LIST), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS)))
$(foreach f,$(JDKJRE_JDKOUT_LIB_LIST),\ $(foreach f,$(JDKJRE_JDKOUT_LIB_LIST), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS)))
$(foreach f,$(JRE_IMAGES_LIB_LIST),\ $(foreach f,$(JRE_IMAGES_LIB_LIST), \
$(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS))) $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JRE_IMAGE_DIR),$f,JRE_LIB_TARGETS)))
$(foreach f,$(JDK_IMAGES_LIB_LIST),\ $(foreach f,$(JDK_IMAGES_LIB_LIST), \
$(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS))) $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_LIB_TARGETS)))
$(foreach f,$(JDKJRE_IMAGES_LIB_LIST),\ $(foreach f,$(JDKJRE_IMAGES_LIB_LIST), \
$(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS))) $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR),$(JDK_IMAGE_DIR)/jre,$f,JDKJRE_LIB_TARGETS)))
$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JRE_JDKOUT_LIB_LIST)),\ $(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JRE_JDKOUT_LIB_LIST)), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_OVERLAY_LIB_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JRE_OVERLAY_IMAGE_DIR),$f,JRE_OVERLAY_LIB_TARGETS)))
$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDK_JDKOUT_LIB_LIST)),\ $(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDK_JDKOUT_LIB_LIST)), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_OVERLAY_LIB_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_OVERLAY_LIB_TARGETS)))
$(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDKJRE_JDKOUT_LIB_LIST)),\ $(foreach f,$(filter $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_ISADIR)/%,$(JDKJRE_JDKOUT_LIB_LIST)), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_OVERLAY_LIB_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_OVERLAY_LIB_TARGETS)))
ifneq ($(PROFILE),) ifneq ($(PROFILE), )
# Files in lib$(PROFILE) are excluded from the generic copying routines so # Files in lib$(PROFILE) are excluded from the generic copying routines so
# we have to add them back in here # we have to add them back in here
$(foreach f,$(CUSTOM_PROFILE_JARS),\ $(foreach f,$(CUSTOM_PROFILE_JARS), \
$(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR)/lib$(PROFILE),$(JRE_IMAGE_DIR)/lib,$f,JRE_LIB_TARGETS))) $(eval $(call AddFileToCopy,$(IMAGES_OUTPUTDIR)/lib$(PROFILE),$(JRE_IMAGE_DIR)/lib,$f,JRE_LIB_TARGETS)))
endif endif
# CTE plugin security change require new empty directory lib/applet # CTE plugin security change require new empty directory lib/applet
$(JRE_IMAGE_DIR)/lib/applet: $(JRE_IMAGE_DIR)/lib/applet:
$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $@ $(MKDIR) -p $@
$(JDK_IMAGE_DIR)/jre/lib/applet: $(JDK_IMAGE_DIR)/jre/lib/applet:
$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $@ $(MKDIR) -p $@
...@@ -323,185 +323,187 @@ $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index: $(JDKJRE_LIB_TARGETS) ...@@ -323,185 +323,187 @@ $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index: $(JDKJRE_LIB_TARGETS)
################################################################################ ################################################################################
# /man dir # /man dir
# Avoid evaluating this whole section on windows for speed and stability # Avoid evaluating this whole section on windows for speed and stability
ifneq ($(OPENJDK_TARGET_OS),windows) ifneq ($(OPENJDK_TARGET_OS), windows)
JRE_MAN_PAGES := \ JRE_MAN_PAGES := \
java.1 \ java.1 \
keytool.1 \ keytool.1 \
orbd.1 \ orbd.1 \
pack200.1 \ pack200.1 \
policytool.1 \ policytool.1 \
rmid.1 \ rmid.1 \
rmiregistry.1 \ rmiregistry.1 \
servertool.1 \ servertool.1 \
tnameserv.1 \ tnameserv.1 \
unpack200.1 unpack200.1
ifndef OPENJDK ifndef OPENJDK
JRE_MAN_PAGES += javaws.1 ifneq ($(OPENJDK_TARGET_OS), solaris)
endif JRE_MAN_PAGES += javaws.1
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 \
native2ascii.1 \
rmic.1 \
schemagen.1 \
serialver.1 \
wsgen.1 \
wsimport.1 \
xjc.1
ifndef OPENJDK
JDK_MAN_PAGES += jvisualvm.1
endif
# This variable is potentially overridden in the closed makefile.
MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
ifeq ($(OPENJDK_TARGET_OS), linux)
MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/linux/doc
MAN1_SUBDIR:=man
endif
ifeq ($(OPENJDK_TARGET_OS), solaris)
MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/solaris/doc
MAN1_SUBDIR:=sun/man/man1
endif
ifeq ($(OPENJDK_TARGET_OS), macosx)
MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/bsd/doc
MAN1_SUBDIR:=man
JDK_MAN_PAGES := $(filter-out jcmd.1, $(JDK_MAN_PAGES))
JDK_MAN_PAGES := $(filter-out jvisualvm.1, $(JDK_MAN_PAGES))
endif endif
endif
$(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/% 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 \
native2ascii.1 \
rmic.1 \
schemagen.1 \
serialver.1 \
wsgen.1 \
wsimport.1 \
xjc.1
ifndef OPENJDK
JDK_MAN_PAGES += jvisualvm.1
endif
# This variable is potentially overridden in the closed makefile.
MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
ifeq ($(OPENJDK_TARGET_OS), linux)
MAN_SRC_DIR := $(MAN_SRC_BASEDIR)/linux/doc
MAN1_SUBDIR := man
endif
ifeq ($(OPENJDK_TARGET_OS), solaris)
MAN_SRC_DIR := $(MAN_SRC_BASEDIR)/solaris/doc
MAN1_SUBDIR := sun/man/man1
endif
ifeq ($(OPENJDK_TARGET_OS), macosx)
MAN_SRC_DIR := $(MAN_SRC_BASEDIR)/bsd/doc
MAN1_SUBDIR := man
JDK_MAN_PAGES := $(filter-out jcmd.1, $(JDK_MAN_PAGES))
JDK_MAN_PAGES := $(filter-out jvisualvm.1, $(JDK_MAN_PAGES))
endif
$(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file) $(install-file)
$(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/% $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file) $(install-file)
$(JRE_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/% $(JRE_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file) $(install-file)
$(JDK_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/% $(JDK_IMAGE_DIR)/man/man1/%: $(JDK_OUTPUTDIR)/impdoc/$(MAN1_SUBDIR)/%
$(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file) $(install-file)
define install-ja-manpage define install-ja-manpage
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(CAT) $< \ $(CAT) $< \
| $(NATIVE2ASCII) -encoding eucJP \ | $(NATIVE2ASCII) -encoding eucJP \
| $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \ | $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \
| $(NATIVE2ASCII) -reverse -encoding $1 \ | $(NATIVE2ASCII) -reverse -encoding $1 \
> $@ > $@
endef endef
$(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call install-ja-manpage,UTF-8) $(call install-ja-manpage, UTF-8)
$(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call install-ja-manpage,UTF-8) $(call install-ja-manpage, UTF-8)
$(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call install-ja-manpage,PCK) $(call install-ja-manpage, PCK)
$(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call install-ja-manpage,PCK) $(call install-ja-manpage, PCK)
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
$(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file) $(install-file)
$(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/% $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
$(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Converting $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file) $(install-file)
endif endif
# Old build creates empty man page for this, mimicing behaviour. # 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: $(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) $(LOG_INFO) Creating dummy $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Creating dummy $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(TOUCH) $@ $(TOUCH) $@
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
$(JRE_IMAGE_DIR)/man/ja: $(JRE_IMAGE_DIR)/man/ja:
$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
$(JDK_IMAGE_DIR)/man/ja:
$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
endif
ifeq ($(OPENJDK_TARGET_OS), macosx)
$(JRE_IMAGE_DIR)/man/ja:
$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
$(JDK_IMAGE_DIR)/man/ja:
$(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
endif
ifeq ($(OPENJDK_TARGET_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 ($(OPENJDK_TARGET_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)) \ $(JDK_IMAGE_DIR)/man/ja:
$(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/,$(JDK_MAN_PAGES)) \ $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \ $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
$(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/,$(JDK_MAN_PAGES)) endif
endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \ $(JRE_IMAGE_DIR)/man/ja:
$(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JRE_MAN_PAGES)) \ $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(JRE_IMAGE_DIR)/man/ja $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \ $(JDK_IMAGE_DIR)/man/ja:
$(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/,$(JDK_MAN_PAGES)) \ $(ECHO) $(LOG_INFO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(JDK_IMAGE_DIR)/man/ja $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
endif endif
ifeq ($(OPENJDK_TARGET_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 ($(OPENJDK_TARGET_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
ifeq ($(OPENJDK_TARGET_OS), macosx)
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
endif # Windows endif # Windows
...@@ -510,9 +512,9 @@ endif # Windows ...@@ -510,9 +512,9 @@ endif # Windows
# FIXME: demo/applets/GraphLayout/GraphPanel$2.class is sometimes not copied. # FIXME: demo/applets/GraphLayout/GraphPanel$2.class is sometimes not copied.
# The db demo contains an empty dir that needs to be copied. The other # The db demo contains an empty dir that needs to be copied. The other
# directories will always trigger the rule for recompile since # directories will always trigger the rule for recompile since
# _the.list_of_packages files are touched. # _the.list_of_packages files are touched.
$(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/% $(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/%
if [ ! -d "$@" ]; then \ if [ ! -d "$@" ]; then \
$(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \ $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'; \
...@@ -520,36 +522,36 @@ $(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/% ...@@ -520,36 +522,36 @@ $(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/%
if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) '$<' '$@'; fi \ if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) '$<' '$@'; fi \
fi fi
# Find all files including directories # Find all files including directories
JDK_DEMO_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/demo/%,$(JDK_IMAGE_DIR)/demo/%,\ JDK_DEMO_TARGETS := $(patsubst $(JDK_OUTPUTDIR)/demo/%, $(JDK_IMAGE_DIR)/demo/%, \
$(shell $(FIND) $(JDK_OUTPUTDIR)/demo ! \( -name "_the*" -o -name "javac_state" \) )) $(shell $(FIND) $(JDK_OUTPUTDIR)/demo ! \( -name "_the*" -o -name "javac_state" \) ))
# Param 1 is source file # Param 1 is source file
define CreateOverlayDemoRule define CreateOverlayDemoRule
$1_TARGET:=$$(subst $(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),\ $1_TARGET := $$(subst $(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR), \
$$(dir $1)$(OPENJDK_TARGET_CPU_ISADIR)/$$(notdir $1)) $$(dir $1)$(OPENJDK_TARGET_CPU_ISADIR)/$$(notdir $1))
$$($1_TARGET): $1 $$($1_TARGET): $1
$(ECHO) $(LOG_INFO) Copying '$$(patsubst $(OUTPUT_ROOT)/%,%,$$@)' $(ECHO) $(LOG_INFO) Copying '$$(patsubst $(OUTPUT_ROOT)/%,%,$$@)'
$$(call install-file) $$(call install-file)
JDK_OVERLAY_DEMO_TARGETS += $$($1_TARGET) JDK_OVERLAY_DEMO_TARGETS += $$($1_TARGET)
endef endef
JDK_OVERLAY_DEMO_SOURCES := $(filter %$(SHARED_LIBRARY_SUFFIX),$(call CacheFind,$(JDK_OUTPUTDIR)/demo)) JDK_OVERLAY_DEMO_SOURCES := $(filter %$(SHARED_LIBRARY_SUFFIX), $(call CacheFind, $(JDK_OUTPUTDIR)/demo))
$(foreach lib,$(JDK_OVERLAY_DEMO_SOURCES),$(eval $(call CreateOverlayDemoRule,$(lib)))) $(foreach lib, $(JDK_OVERLAY_DEMO_SOURCES), $(eval $(call CreateOverlayDemoRule, $(lib))))
################################################################################ ################################################################################
# /sample dir # /sample dir
$(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/sample),\ $(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/sample), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_SAMPLE_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_SAMPLE_TARGETS)))
################################################################################ ################################################################################
# /db dir # /db dir
ifndef OPENJDK ifndef OPENJDK
$(IMAGES_OUTPUTDIR)/_unzip/%.unzipped: $(JDK_TOPDIR)/src/closed/share/db/% $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped: $(JDK_TOPDIR)/src/closed/share/db/%
$(ECHO) Unzipping $(patsubst $(SRC_ROOT)/%,%,$<) $(ECHO) Unzipping $(patsubst $(SRC_ROOT)/%,%,$<)
$(MKDIR) -p $(JDK_IMAGE_DIR)/db $(MKDIR) -p $(JDK_IMAGE_DIR)/db
cd $(JDK_IMAGE_DIR)/db && $(UNZIP) -q -o $< -x */index.html */KEYS */test/* *javadoc/* */docs/* */demo/* 2> /dev/null cd $(JDK_IMAGE_DIR)/db && $(UNZIP) -q -o $< -x */index.html */KEYS */test/* *javadoc/* */docs/* */demo/* 2> /dev/null
...@@ -557,49 +559,51 @@ ifndef OPENJDK ...@@ -557,49 +559,51 @@ ifndef OPENJDK
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(TOUCH) $@ $(TOUCH) $@
$(JDK_IMAGE_DIR)/db/README-JDK.html: $(JDK_TOPDIR)/src/closed/share/db/README-JDK.html $(JDK_IMAGE_DIR)/db/README-JDK.html: $(JDK_TOPDIR)/src/closed/share/db/README-JDK.html
$(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)' $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
$(MKDIR) -p $(@D)
$(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@ $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@
$(JDK_IMAGE_DIR)/db/3RDPARTY: $(JDK_TOPDIR)/src/closed/share/db/3RDPARTY $(JDK_IMAGE_DIR)/db/3RDPARTY: $(JDK_TOPDIR)/src/closed/share/db/3RDPARTY
$(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)' $(ECHO) $(LOG_INFO) Copying '$(patsubst $(OUTPUT_ROOT)/%,%,$@)'
$(MKDIR) -p $(@D)
$(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@ $(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@
JDK_DB_TARGETS := $(patsubst $(JDK_TOPDIR)/src/closed/share/db/%,$(IMAGES_OUTPUTDIR)/_unzip/%.unzipped,\ JDK_DB_TARGETS := $(patsubst $(JDK_TOPDIR)/src/closed/share/db/%, $(IMAGES_OUTPUTDIR)/_unzip/%.unzipped, \
$(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip)) \ $(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip)) \
$(JDK_IMAGE_DIR)/db/README-JDK.html $(JDK_IMAGE_DIR)/db/3RDPARTY $(JDK_IMAGE_DIR)/db/README-JDK.html $(JDK_IMAGE_DIR)/db/3RDPARTY
endif endif
################################################################################ ################################################################################
# /include dir # /include dir
$(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/include),\ $(foreach f,$(call CacheFind,$(JDK_OUTPUTDIR)/include), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_INCLUDE_TARGETS))) $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_IMAGE_DIR),$f,JDK_INCLUDE_TARGETS)))
################################################################################ ################################################################################
# doc files # doc files
ifdef OPENJDK ifdef OPENJDK
JRE_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README JRE_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
JDK_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README JDK_DOC_FILES := LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
JRE_DOC_LOCATION := $(JDK_TOPDIR) JRE_DOC_LOCATION := $(JDK_TOPDIR)
JDK_DOC_LOCATION := $(JDK_TOPDIR) JDK_DOC_LOCATION := $(JDK_TOPDIR)
else else
JRE_DOC_FILES := COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt JRE_DOC_FILES := COPYRIGHT Welcome.html LICENSE THIRDPARTYLICENSEREADME.txt
JDK_DOC_FILES := COPYRIGHT README.html LICENSE THIRDPARTYLICENSEREADME.txt JDK_DOC_FILES := COPYRIGHT README.html LICENSE THIRDPARTYLICENSEREADME.txt
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
JRE_DOC_FILES += README.txt JRE_DOC_FILES += README.txt
else else
JRE_DOC_FILES += README JRE_DOC_FILES += README
endif endif
JDK_DOC_FILES += demo/DEMOS_LICENSE sample/SAMPLES_LICENSE JDK_DOC_FILES += demo/DEMOS_LICENSE sample/SAMPLES_LICENSE
JRE_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jre JRE_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jre
JDK_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jdk JDK_DOC_LOCATION := $(JDK_TOPDIR)/src/closed/share/doc/jdk
endif endif
JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/,$(JRE_DOC_FILES)) JRE_DOC_TARGETS := $(addprefix $(JRE_IMAGE_DIR)/, $(JRE_DOC_FILES))
JDKJRE_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/jre/,$(JRE_DOC_FILES)) JDKJRE_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/jre/, $(JRE_DOC_FILES))
JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/,$(JDK_DOC_FILES)) JDK_DOC_TARGETS := $(addprefix $(JDK_IMAGE_DIR)/, $(JDK_DOC_FILES))
$(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/% $(JRE_IMAGE_DIR)/%: $(JRE_DOC_LOCATION)/%
$(process-doc-file) $(process-doc-file)
...@@ -630,31 +634,31 @@ JDK_OVERLAY_INFO_FILE := $(JDK_OVERLAY_IMAGE_DIR)/release ...@@ -630,31 +634,31 @@ JDK_OVERLAY_INFO_FILE := $(JDK_OVERLAY_IMAGE_DIR)/release
# Common way to emit a line into the release or info file # Common way to emit a line into the release or info file
define info-file-item # name value define info-file-item # name value
$(PRINTF) '%s="%s"\n' $1 $2 >> $@ $(PRINTF) '%s="%s"\n' $1 $2 >> $@
endef endef
define create-info-file define create-info-file
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)") $(call info-file-item, "JAVA_VERSION", "$(JDK_VERSION)")
$(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)") $(call info-file-item, "OS_NAME", "$(REQUIRED_OS_NAME)")
$(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)") $(call info-file-item, "OS_VERSION", "$(REQUIRED_OS_VERSION)")
$(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)") $(call info-file-item, "OS_ARCH", "$(OPENJDK_TARGET_CPU_LEGACY)")
if [ -n "$(JDK_ARCH_ABI_PROP_NAME)" ]; then $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"); fi if [ -n "$(JDK_ARCH_ABI_PROP_NAME)" ]; then $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)"); fi
$(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)") $(call info-file-item, "SOURCE", "$(ALL_SOURCE_TIPS)")
endef endef
ALL_SOURCE_TIPS = $(shell \ ALL_SOURCE_TIPS = $(shell \
if [ -f $(OUTPUT_ROOT)/source_tips ] ; then \ if [ -f $(OUTPUT_ROOT)/source_tips ] ; then \
$(CAT) $(OUTPUT_ROOT)/source_tips ; \ $(CAT) $(OUTPUT_ROOT)/source_tips ; \
fi) fi)
$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips $(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(call create-info-file) $(call create-info-file)
ifneq ($(PROFILE),) ifneq ($(PROFILE), )
$(call info-file-item, "JAVA_PROFILE", "$(call profile_name, $(call profile_number, $(PROFILE)))") $(call info-file-item, "JAVA_PROFILE", "$(call profile_name, $(call profile_number, $(PROFILE)))")
endif endif
$(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips $(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
$(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
...@@ -675,57 +679,57 @@ $(JDK_IMAGE_DIR)/src.zip: $(IMAGES_OUTPUTDIR)/src.zip ...@@ -675,57 +679,57 @@ $(JDK_IMAGE_DIR)/src.zip: $(IMAGES_OUTPUTDIR)/src.zip
################################################################################ ################################################################################
# Post processing (strip etc) # Post processing (strip etc)
ifneq ($(POST_STRIP_CMD),) ifneq ($(POST_STRIP_CMD), )
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
EXEC_LIST_BIN:=$(filter-out %$(notdir $(MSVCR_DLL)),$(filter %.exe %.dll,$(ALL_BIN_LIST))) EXEC_LIST_BIN := $(filter-out %$(notdir $(MSVCR_DLL)), $(filter %.exe %.dll, $(ALL_BIN_LIST)))
else else
# Find all executables in JDK_OUTPUTDIR since they exist when this makefile is parsed # Find all executables in JDK_OUTPUTDIR since they exist when this makefile is parsed
EXEC_LIST_BIN:=$(shell $(FILE) `$(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*$(EXE_SUFFIX) ! -name \*.debuginfo` \ EXEC_LIST_BIN := $(shell $(FILE) `$(FIND) $(JDK_OUTPUTDIR)/bin -type f -name \*$(EXE_SUFFIX) ! -name \*.debuginfo` \
| $(EGREP) 'ELF' | $(CUT) -d':' -f1) | $(EGREP) 'ELF' | $(CUT) -d':' -f1)
# On mac, the old build searches for static libraries for stripping instead of shared. # On mac, the old build searches for static libraries for stripping instead of shared.
# Not clear if it's intentional. # Not clear if it's intentional.
ifneq ($(OPENJDK_TARGET_OS), macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
EXEC_LIST_LIB:=$(shell $(FIND) $(JDK_OUTPUTDIR)/lib -type f -name \*$(SHARED_LIBRARY_SUFFIX)) EXEC_LIST_LIB := $(shell $(FIND) $(JDK_OUTPUTDIR)/lib -type f -name \*$(SHARED_LIBRARY_SUFFIX))
endif
endif endif
# Filter out sjavac endif
EXEC_LIST_BIN:=$(filter-out %sjavac$(EXE_SUFFIX),$(EXEC_LIST_BIN)) # Filter out sjavac
EXEC_LIST_BIN := $(filter-out %sjavac$(EXE_SUFFIX), $(EXEC_LIST_BIN))
# Filter out the overlay specific bin files
EXEC_LIST:=$(filter-out $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB) # Filter out the overlay specific bin files
EXEC_LIST_OVERLAY:=$(filter $(OVERLAY_FILTER),$(EXEC_LIST_BIN)) $(EXEC_LIST_LIB) EXEC_LIST := $(filter-out $(OVERLAY_FILTER), $(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
EXEC_LIST_OVERLAY := $(filter $(OVERLAY_FILTER), $(EXEC_LIST_BIN)) $(EXEC_LIST_LIB)
# Filter out non JRE files and convert to unique touch files to depend on
JRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped,\ # Filter out non JRE files and convert to unique touch files to depend on
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\ JRE_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, $(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped, \
$(EXEC_LIST))) $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)), \
$(EXEC_LIST)))
JDKJRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
$(IMAGES_OUTPUTDIR)/_strip_jdk/jre/%.stripped, \ JDKJRE_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST))) $(IMAGES_OUTPUTDIR)/_strip_jdk/jre/%.stripped, \
$(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST)))
JDK_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
$(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped, \ JDK_BIN_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
$(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST))) $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped, \
$(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST)))
# Do the same for overlay image
JRE_OVERLAY_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped,\ # Do the same for overlay image
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\ JRE_OVERLAY_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, $(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped, \
$(EXEC_LIST_OVERLAY))) $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)), \
$(EXEC_LIST_OVERLAY)))
JDKJRE_OVERLAY_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
$(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/jre/%.stripped, \ JDKJRE_OVERLAY_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST_OVERLAY))) $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/jre/%.stripped, \
$(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST_OVERLAY)))
JDK_OVERLAY_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \
$(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped, \ JDK_OVERLAY_BIN_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
$(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST_OVERLAY))) $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped, \
$(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST_OVERLAY)))
define mcs-file
$(if $(POST_MCS_CMD),$(POST_MCS_CMD) $<) define mcs-file
endef $(if $(POST_MCS_CMD), $(POST_MCS_CMD) $<)
endef
define strip-file define strip-file
$(ECHO) Stripping $(LOG_INFO) $(patsubst $(OUTPUT_ROOT)/%,%,$<) $(ECHO) Stripping $(LOG_INFO) $(patsubst $(OUTPUT_ROOT)/%,%,$<)
$(CHMOD) u+w $< $(CHMOD) u+w $<
$(POST_STRIP_CMD) $< $(POST_STRIP_CMD) $<
...@@ -733,19 +737,19 @@ ifneq ($(POST_STRIP_CMD),) ...@@ -733,19 +737,19 @@ ifneq ($(POST_STRIP_CMD),)
$(CHMOD) go-w $< $(CHMOD) go-w $<
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(TOUCH) $@ $(TOUCH) $@
endef endef
# Setup a rule for stripping files based on touch files # Setup a rule for stripping files based on touch files
$(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped: $(JRE_IMAGE_DIR)/% $(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped: $(JRE_IMAGE_DIR)/%
$(call strip-file) $(call strip-file)
$(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped: $(JDK_IMAGE_DIR)/% $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped: $(JDK_IMAGE_DIR)/%
$(call strip-file) $(call strip-file)
$(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped: $(JRE_OVERLAY_IMAGE_DIR)/% $(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped: $(JRE_OVERLAY_IMAGE_DIR)/%
$(call strip-file) $(call strip-file)
$(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped: $(JDK_OVERLAY_IMAGE_DIR)/% $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped: $(JDK_OVERLAY_IMAGE_DIR)/%
$(call strip-file) $(call strip-file)
endif endif
...@@ -754,45 +758,45 @@ endif ...@@ -754,45 +758,45 @@ endif
# Main targets # Main targets
jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \ 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_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \
$(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST) \ $(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST) \
$(JRE_BIN_ISADIR_LINK_TARGETS) $(JRE_BIN_ISADIR_LINK_TARGETS)
jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \ jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \
$(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \ $(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \
$(JDK_IMAGE_DIR)/jre/lib/applet \ $(JDK_IMAGE_DIR)/jre/lib/applet \
$(JDK_DEMO_TARGETS) \ $(JDK_DEMO_TARGETS) \
$(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \ $(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \
$(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \ $(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \
$(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \ $(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \
$(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \ $(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \
$(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \ $(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \
$(JDK_IMAGE_DIR)/src.zip \ $(JDK_IMAGE_DIR)/src.zip \
$(JDK_BIN_ISADIR_LINK_TARGETS) $(JDKJRE_BIN_ISADIR_LINK_TARGETS) $(JDK_BIN_ISADIR_LINK_TARGETS) $(JDKJRE_BIN_ISADIR_LINK_TARGETS)
jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \ jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \
$(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST) $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST)
jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \ jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \
$(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \ $(JDK_OVERLAY_LIB_TARGETS) $(JDKJRE_OVERLAY_LIB_TARGETS) \
$(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \ $(JDK_OVERLAY_DEMO_TARGETS) $(JDK_OVERLAY_INFO_FILE) \
$(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST) $(JDKJRE_OVERLAY_STRIP_LIST) $(JDK_OVERLAY_BIN_STRIP_LIST)
ifneq ($(PROFILE),) ifneq ($(PROFILE), )
PROFILE_IMAGE_JARS := $(filter %.jar, $(JRE_LIB_TARGETS)) PROFILE_IMAGE_JARS := $(filter %.jar, $(JRE_LIB_TARGETS))
PROFILE_IMAGE_JARS_CHECKED := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_jars_checked PROFILE_IMAGE_JARS_CHECKED := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_jars_checked
$(PROFILE_IMAGE_JARS_CHECKED) : $(PROFILE_IMAGE_JARS) $(PROFILE_IMAGE_JARS_CHECKED) : $(PROFILE_IMAGE_JARS)
$(TOOL_CHECKDEPS) $(JRE_IMAGE_DIR) \ $(TOOL_CHECKDEPS) $(JRE_IMAGE_DIR) \
$(call profile_name, $(call profile_number, $(PROFILE))) $(call profile_name, $(call profile_number, $(PROFILE)))
$(TOUCH) $@ $(TOUCH) $@
profile-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) \ profile-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) \
$(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \ $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \
$(JRE_INFO_FILE) $(JRE_STRIP_LIST) $(PROFILE_IMAGE_JARS_CHECKED) $(JRE_INFO_FILE) $(JRE_STRIP_LIST) $(PROFILE_IMAGE_JARS_CHECKED)
.PHONY: profile-image .PHONY: profile-image
endif # Profile endif # Profile
......
makefiles/Import.gmk
浏览文件 @ e864d64d
...@@ -40,25 +40,25 @@ IMPORT_BINARIES := CORBA ...@@ -40,25 +40,25 @@ IMPORT_BINARIES := CORBA
####### #######
# Put the libraries here. Different locations for different target apis. # Put the libraries here. Different locations for different target apis.
ifeq ($(OPENJDK_TARGET_OS_API),posix) ifeq ($(OPENJDK_TARGET_OS_API), posix)
INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
HOTSPOT_LIB_DIR:=$(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR) HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)
else else
INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/bin INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/bin
HOTSPOT_LIB_DIR:=$(HOTSPOT_DIST)/jre/bin HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/bin
endif endif
####### #######
# #
# jar xf/unzip fails when executing them all in parallel # jar xf/unzip fails when executing them all in parallel
# introduce artificial dependency (_DEP) buuhhh # introduce artificial dependency (_DEP) buuhhh
define ImportClasses define ImportClasses
$1_CLASSES_DEP := $$(IMPORT_TARGET_CLASSES) $1_CLASSES_DEP := $$(IMPORT_TARGET_CLASSES)
IMPORT_TARGET_CLASSES += $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported IMPORT_TARGET_CLASSES += $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported
$(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported : $$($1_DIST)/lib/classes.jar $$($1_CLASSES_DEP) $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported: $$($1_DIST)/lib/classes.jar $$($1_CLASSES_DEP)
$(ECHO) Importing $1 classes.jar $(ECHO) Importing $1 classes.jar
$(MKDIR) -p $$(@D) $(MKDIR) -p $$(@D)
$(RM) $$@ $$@.tmp $(RM) $$@ $$@.tmp
...@@ -67,10 +67,10 @@ $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported : $$($1_DIST)/lib/classes.jar ...@@ -67,10 +67,10 @@ $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported : $$($1_DIST)/lib/classes.jar
endef endef
define ImportSources define ImportSources
$1_SOURCES_DEP := $$(IMPORT_TARGET_SOURCES) $1_SOURCES_DEP := $$(IMPORT_TARGET_SOURCES)
IMPORT_TARGET_SOURCES += $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported IMPORT_TARGET_SOURCES += $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported
$(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported : $$($1_DIST)/lib/src.zip $$($1_SOURCES_DEP) $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported: $$($1_DIST)/lib/src.zip $$($1_SOURCES_DEP)
$(ECHO) Importing $1 src.zip $(ECHO) Importing $1 src.zip
$(MKDIR) -p $$(@D) $(MKDIR) -p $$(@D)
$(RM) $$@ $$@.tmp $(RM) $$@ $$@.tmp
...@@ -79,10 +79,10 @@ $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported : $$($1_DIST)/lib/src.zip $$($1_SOU ...@@ -79,10 +79,10 @@ $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported : $$($1_DIST)/lib/src.zip $$($1_SOU
endef endef
define ImportBinaries define ImportBinaries
$1_BINARIES_DEP := $$(IMPORT_TARGET_BINARIES) $1_BINARIES_DEP := $$(IMPORT_TARGET_BINARIES)
IMPORT_TARGET_BINARIES += $(JDK_OUTPUTDIR)/_the.$1.binaries.imported IMPORT_TARGET_BINARIES += $(JDK_OUTPUTDIR)/_the.$1.binaries.imported
$(JDK_OUTPUTDIR)/_the.$1.binaries.imported : $$($1_DIST)/lib/bin.zip $$($1_BINARIES_DEP) $(JDK_OUTPUTDIR)/_the.$1.binaries.imported: $$($1_DIST)/lib/bin.zip $$($1_BINARIES_DEP)
$(ECHO) Importing $1 bin.zip $(ECHO) Importing $1 bin.zip
$(MKDIR) -p $$(@D) $(MKDIR) -p $$(@D)
$(RM) $$@ $$@.tmp $(RM) $$@ $$@.tmp
...@@ -92,19 +92,19 @@ endef ...@@ -92,19 +92,19 @@ endef
####### #######
$(foreach I,$(IMPORT_CLASSES), $(eval $(call ImportClasses,$I))) $(foreach I, $(IMPORT_CLASSES), $(eval $(call ImportClasses,$I)))
$(foreach I,$(IMPORT_SOURCES), $(eval $(call ImportSources,$I))) $(foreach I, $(IMPORT_SOURCES), $(eval $(call ImportSources,$I)))
$(foreach I,$(IMPORT_BINARIES), $(eval $(call ImportBinaries,$I))) $(foreach I, $(IMPORT_BINARIES), $(eval $(call ImportBinaries,$I)))
IMPORT_TARGET_FILES += $(IMPORT_TARGET_CLASSES) $(IMPORT_TARGET_SOURCES) $(IMPORT_TARGET_BINARIES) IMPORT_TARGET_FILES += $(IMPORT_TARGET_CLASSES) $(IMPORT_TARGET_SOURCES) $(IMPORT_TARGET_BINARIES)
####### #######
define CopyDir define CopyDir
$1_SRC_FILES := $(shell $(FIND) $2 -type f -a \( -name DUMMY $(addprefix -o$(SPACE)-name$(SPACE),$4) \)) $1_SRC_FILES := $(shell $(FIND) $2 -type f -a \( -name DUMMY $(addprefix -o$(SPACE)-name$(SPACE),$4) \))
$1_DST_FILES := $$(patsubst $2/%,$3/%,$$($1_SRC_FILES)) $1_DST_FILES := $$(patsubst $2/%,$3/%,$$($1_SRC_FILES))
IMPORT_TARGET_FILES += $$($1_DST_FILES) IMPORT_TARGET_FILES += $$($1_DST_FILES)
$3/% : $2/% $3/%: $2/%
$(ECHO) $(LOG_INFO) Copying $$(@F) $(ECHO) $(LOG_INFO) Copying $$(@F)
$$(install-file) $$(install-file)
endef endef
...@@ -114,46 +114,46 @@ endef ...@@ -114,46 +114,46 @@ endef
# #
# Import hotspot # Import hotspot
# #
HOTSPOT_IMPORT_FILES:=$(addprefix $(LIBRARY_PREFIX), jvm.* saproc.* jsig.* sawindbg.* jvm_db.* jvm_dtrace.*) \ HOTSPOT_IMPORT_FILES := $(addprefix $(LIBRARY_PREFIX), jvm.* saproc.* jsig.* sawindbg.* jvm_db.* jvm_dtrace.*) \
Xusage.txt sa-jdi.jar Xusage.txt sa-jdi.jar
$(eval $(call CopyDir,HOTSPOT0, $(HOTSPOT_LIB_DIR), $(INSTALL_LIBRARIES_HERE), $(HOTSPOT_IMPORT_FILES))) $(eval $(call CopyDir,HOTSPOT0, $(HOTSPOT_LIB_DIR), $(INSTALL_LIBRARIES_HERE), $(HOTSPOT_IMPORT_FILES)))
$(eval $(call CopyDir,HOTSPOT1, $(HOTSPOT_DIST)/lib, $(JDK_OUTPUTDIR)/lib, $(HOTSPOT_IMPORT_FILES))) $(eval $(call CopyDir,HOTSPOT1, $(HOTSPOT_DIST)/lib, $(JDK_OUTPUTDIR)/lib, $(HOTSPOT_IMPORT_FILES)))
JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \ JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \
$(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) ) $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
ifneq ($(OPENJDK_TARGET_OS), windows) ifneq ($(OPENJDK_TARGET_OS), windows)
ifeq ($(JVM_VARIANT_SERVER), true) ifeq ($(JVM_VARIANT_SERVER), true)
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
ifneq (,$(JSIG_DEBUGINFO)) ifneq (, $(JSIG_DEBUGINFO))
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
endif
endif endif
ifeq ($(JVM_VARIANT_CLIENT), true) endif
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) ifeq ($(JVM_VARIANT_CLIENT), true)
ifneq (,$(JSIG_DEBUGINFO)) IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) ifneq (, $(JSIG_DEBUGINFO))
endif IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
endif endif
ifeq ($(JVM_VARIANT_MINIMAL1), true) endif
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) ifeq ($(JVM_VARIANT_MINIMAL1), true)
ifneq (,$(JSIG_DEBUGINFO)) IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) ifneq (, $(JSIG_DEBUGINFO))
endif IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
endif endif
endif
endif endif
$(INSTALL_LIBRARIES_HERE)/server/%$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX) $(INSTALL_LIBRARIES_HERE)/server/%$(SHARED_LIBRARY_SUFFIX): $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(LN) -s ../$(@F) $@ $(LN) -s ../$(@F) $@
$(INSTALL_LIBRARIES_HERE)/server/%.debuginfo : $(INSTALL_LIBRARIES_HERE)/%.debuginfo $(INSTALL_LIBRARIES_HERE)/server/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(LN) -s ../$(@F) $@ $(LN) -s ../$(@F) $@
$(INSTALL_LIBRARIES_HERE)/server/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz $(INSTALL_LIBRARIES_HERE)/server/%.diz: $(INSTALL_LIBRARIES_HERE)/%.diz
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(RM) $@.tmp $(basename $@).debuginfo $(RM) $@.tmp $(basename $@).debuginfo
...@@ -162,17 +162,17 @@ $(INSTALL_LIBRARIES_HERE)/server/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz ...@@ -162,17 +162,17 @@ $(INSTALL_LIBRARIES_HERE)/server/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
$(RM) $(basename $@).debuginfo $(RM) $(basename $@).debuginfo
$(MV) $@.tmp $@ $(MV) $@.tmp $@
$(INSTALL_LIBRARIES_HERE)/client/%$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX) $(INSTALL_LIBRARIES_HERE)/client/%$(SHARED_LIBRARY_SUFFIX): $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(LN) -s ../$(@F) $@ $(LN) -s ../$(@F) $@
$(INSTALL_LIBRARIES_HERE)/client/%.debuginfo : $(INSTALL_LIBRARIES_HERE)/%.debuginfo $(INSTALL_LIBRARIES_HERE)/client/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(LN) -s ../$(@F) $@ $(LN) -s ../$(@F) $@
$(INSTALL_LIBRARIES_HERE)/client/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz $(INSTALL_LIBRARIES_HERE)/client/%.diz: $(INSTALL_LIBRARIES_HERE)/%.diz
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(RM) $@.tmp $(basename $@).debuginfo $(RM) $@.tmp $(basename $@).debuginfo
...@@ -181,17 +181,17 @@ $(INSTALL_LIBRARIES_HERE)/client/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz ...@@ -181,17 +181,17 @@ $(INSTALL_LIBRARIES_HERE)/client/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
$(RM) $(basename $@).debuginfo $(RM) $(basename $@).debuginfo
$(MV) $@.tmp $@ $(MV) $@.tmp $@
$(INSTALL_LIBRARIES_HERE)/minimal/%$(SHARED_LIBRARY_SUFFIX) : $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX) $(INSTALL_LIBRARIES_HERE)/minimal/%$(SHARED_LIBRARY_SUFFIX): $(INSTALL_LIBRARIES_HERE)/%$(SHARED_LIBRARY_SUFFIX)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(LN) -s ../$(@F) $@ $(LN) -s ../$(@F) $@
$(INSTALL_LIBRARIES_HERE)/minimal/%.debuginfo : $(INSTALL_LIBRARIES_HERE)/%.debuginfo $(INSTALL_LIBRARIES_HERE)/minimal/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(LN) -s ../$(@F) $@ $(LN) -s ../$(@F) $@
$(INSTALL_LIBRARIES_HERE)/minimal/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz $(INSTALL_LIBRARIES_HERE)/minimal/%.diz: $(INSTALL_LIBRARIES_HERE)/%.diz
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(RM) $@.tmp $(basename $@).debuginfo $(RM) $@.tmp $(basename $@).debuginfo
...@@ -202,10 +202,10 @@ $(INSTALL_LIBRARIES_HERE)/minimal/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz ...@@ -202,10 +202,10 @@ $(INSTALL_LIBRARIES_HERE)/minimal/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
########################################################################################## ##########################################################################################
# Unpack the binary distributions of the crypto classes if they exist. # Unpack the binary distributions of the crypto classes if they exist.
SEC_FILES_ZIP:=$(JDK_TOPDIR)/make/tools/crypto/sec-bin.zip SEC_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-bin.zip
SEC_FILES_WIN_ZIP:=$(JDK_TOPDIR)/make/tools/crypto/sec-windows-bin.zip SEC_FILES_WIN_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-windows-bin.zip
JGSS_WIN32_FILES_ZIP:=$(JDK_TOPDIR)/make/tools/crypto/jgss-windows-i586-bin.zip JGSS_WIN32_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-i586-bin.zip
JGSS_WIN64_FILES_ZIP:=$(JDK_TOPDIR)/make/tools/crypto/jgss-windows-x64-bin.zip JGSS_WIN64_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-x64-bin.zip
define unzip-sec-file define unzip-sec-file
$(ECHO) Unzipping $(<F) $(ECHO) Unzipping $(<F)
...@@ -227,14 +227,14 @@ $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped: $(JGSS_WIN32_FILES ...@@ -227,14 +227,14 @@ $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped: $(JGSS_WIN32_FILES
$(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped: $(JGSS_WIN64_FILES_ZIP) $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped: $(JGSS_WIN64_FILES_ZIP)
$(call unzip-sec-file) $(call unzip-sec-file)
ifneq ($(wildcard $(SEC_FILES_ZIP)),) ifneq ($(wildcard $(SEC_FILES_ZIP)), )
IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-bin.unzipped IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-bin.unzipped
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-windows-bin.unzipped IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.sec-windows-bin.unzipped
ifeq ($(OPENJDK_TARGET_CPU),x86) ifeq ($(OPENJDK_TARGET_CPU), x86)
IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped
endif endif
ifeq ($(OPENJDK_TARGET_CPU),x86_64) ifeq ($(OPENJDK_TARGET_CPU), x86_64)
IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-x64-bin.unzipped
endif endif
endif endif
......
makefiles/Makefile
浏览文件 @ e864d64d
...@@ -24,19 +24,19 @@ ...@@ -24,19 +24,19 @@
# #
# Locate this Makefile # Locate this Makefile
ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
else else
makefile_path:=$(lastword $(MAKEFILE_LIST)) makefile_path := $(lastword $(MAKEFILE_LIST))
endif endif
repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path)) repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path))
# What is the name of this subsystem (langtools, corba, etc)? # What is the name of this subsystem (langtools, corba, etc)?
subsystem_name:=$(notdir $(repo_dir)) subsystem_name := $(notdir $(repo_dir))
# Try to locate top-level makefile # Try to locate top-level makefile
top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile top_level_makefile := $(repo_dir)/../common/makefiles/Makefile
ifneq ($(wildcard $(top_level_makefile)),) ifneq ($(wildcard $(top_level_makefile)), )
$(info Will run $(subsystem_name) target on top-level Makefile) $(info Will run $(subsystem_name) target on top-level Makefile)
$(info WARNING: This is a non-recommended way of building!) $(info WARNING: This is a non-recommended way of building!)
$(info ===================================================) $(info ===================================================)
......
makefiles/PatchList.solaris
浏览文件 @ e864d64d
...@@ -19,7 +19,7 @@ RUNTIME 5.8 Sparc 108921-16 x86 108922-16 REQ "CDE patch" ...@@ -19,7 +19,7 @@ RUNTIME 5.8 Sparc 108921-16 x86 108922-16 REQ "CDE patch"
RUNTIME 5.8 Sparc 108773-18 x86 108774-18 REQ "X input method patch" RUNTIME 5.8 Sparc 108773-18 x86 108774-18 REQ "X input method patch"
RUNTIME 5.8 Sparc 110386-03 x86 none REQ "RBAC Feature Patch" RUNTIME 5.8 Sparc 110386-03 x86 none REQ "RBAC Feature Patch"
RUNTIME 5.8 Sparc 111023-02 x86 none REQ "/kernel/fs/mntfs and /kernel/fs/sparcv9/mntfs patch" RUNTIME 5.8 Sparc 111023-02 x86 none REQ "/kernel/fs/mntfs and /kernel/fs/sparcv9/mntfs patch"
RUNTIME 5.8 Sparc 112472-01 x86 112473-01 OPT "Font2DTest2 patch" RUNTIME 5.8 Sparc 112472-01 x86 112473-01 OPT "Font2DTest2 patch"
RUNTIME 5.8 Sparc 112438-01 x86 112439-01 REQ "/kernel/drv/random patch" RUNTIME 5.8 Sparc 112438-01 x86 112439-01 REQ "/kernel/drv/random patch"
COMPILER 5.8 Sparc 109505-06 x86 109502-03 REQ "For C 5.0, C++ 5.0" COMPILER 5.8 Sparc 109505-06 x86 109502-03 REQ "For C 5.0, C++ 5.0"
...@@ -28,4 +28,3 @@ COMPILER 5.8 Sparc 109508-03 x86 109509-03 REQ "For Forte Development 6 upd ...@@ -28,4 +28,3 @@ COMPILER 5.8 Sparc 109508-03 x86 109509-03 REQ "For Forte Development 6 upd
COMPILER 5.8 Sparc 109510-03 x86 109511-03 REQ "For Forte 6.1 Debugger" COMPILER 5.8 Sparc 109510-03 x86 109511-03 REQ "For Forte 6.1 Debugger"
COMPILER 5.8 Sparc 109516-02 x86 109517-02 REQ "For Forte 6.1 Performance Analyzer" COMPILER 5.8 Sparc 109516-02 x86 109517-02 REQ "For Forte 6.1 Performance Analyzer"
COMPILER 5.8 Sparc 110480-01 x86 110481-01 REQ "For Forte TeamWare" COMPILER 5.8 Sparc 110480-01 x86 110481-01 REQ "For Forte TeamWare"
makefiles/ProfileNames.gmk
浏览文件 @ e864d64d
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
PROFILE_NAMES := compact1 compact2 compact3 PROFILE_NAMES := compact1 compact2 compact3
# The include files use 1,2,3 for simplicity and conciseness. Internally we # The include files use 1,2,3 for simplicity and conciseness. Internally we
# use profile_1, profile_2 and profile_3. # use profile_1, profile_2 and profile_3.
ALL_PROFILES := profile_1 profile_2 profile_3 ALL_PROFILES := profile_1 profile_2 profile_3
...@@ -48,7 +48,7 @@ PROFILE_VERSION_JAVA_TARGETS := $(foreach i, $(ALL_PROFILES), $(subst XXX,$i, $( ...@@ -48,7 +48,7 @@ PROFILE_VERSION_JAVA_TARGETS := $(foreach i, $(ALL_PROFILES), $(subst XXX,$i, $(
PROFILE_VERSION_CLASS_TARGETS := $(foreach i, $(PROFILE_VERSION_JAVA_TARGETS), $(i:.java=.class)) PROFILE_VERSION_CLASS_TARGETS := $(foreach i, $(PROFILE_VERSION_JAVA_TARGETS), $(i:.java=.class))
# Function to map from profile designator, profile_1 etc, to its number # Function to map from profile designator, profile_1 etc, to its number
profile_number = $(if $(patsubst profile_%,%, $(1)),$(patsubst profile_%,%, $(1)), $(words $(PROFILE_NAMES) extra)) profile_number = $(if $(patsubst profile_%,%, $(1)), $(patsubst profile_%,%, $(1)), $(words $(PROFILE_NAMES) extra))
# Function to map from profile number, 1, 2 etc, to the corresponding name # Function to map from profile number, 1, 2 etc, to the corresponding name
# An invalid number maps to an empty name # An invalid number maps to an empty name
...@@ -58,7 +58,6 @@ profile_name = $(word $(1), $(PROFILE_NAMES)) ...@@ -58,7 +58,6 @@ profile_name = $(word $(1), $(PROFILE_NAMES))
# Evaluates to the arg if the arg is not a profile version target # Evaluates to the arg if the arg is not a profile version target
profile_version_number = $(patsubst $(JDK_OUTPUTDIR)/gen_profile_%/$(VERSION_JAVA_PATH), %, $(1)) profile_version_number = $(patsubst $(JDK_OUTPUTDIR)/gen_profile_%/$(VERSION_JAVA_PATH), %, $(1))
# Function to go from a profile Version.java target to profile name. If not # Function to go from a profile Version.java target to profile name. If not
# a profile version target then we need a number that maps to an empty name # a profile version target then we need a number that maps to an empty name
profile_version_name = $(word $(if $(filter-out $(call profile_version_number, $(1)), $(1)), $(call profile_version_number, $(1)), $(words $(PROFILE_NAMES) extra)), $(PROFILE_NAMES)) profile_version_name = $(word $(if $(filter-out $(call profile_version_number, $(1)), $(1)), $(call profile_version_number, $(1)), $(words $(PROFILE_NAMES) extra)), $(PROFILE_NAMES))
makefiles/Profiles.gmk
浏览文件 @ e864d64d
...@@ -58,7 +58,7 @@ CUSTOM_PROFILE_JARS := $(addprefix $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/, $(CUSTOM_ ...@@ -58,7 +58,7 @@ CUSTOM_PROFILE_JARS := $(addprefix $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/, $(CUSTOM_
# These are the common jar files built for and included with this profile # These are the common jar files built for and included with this profile
# Filter out the custom jars and turn them into targets. # Filter out the custom jars and turn them into targets.
PROFILE_1_JARS := \ PROFILE_1_JARS := \
$(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(filter-out $(CUSTOM_JARS), $(PROFILE_1_JRE_JAR_FILES))) $(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(filter-out $(CUSTOM_JARS), $(PROFILE_1_JRE_JAR_FILES)))
PROFILE_2_JARS := \ PROFILE_2_JARS := \
...@@ -70,7 +70,7 @@ PROFILE_3_JARS := \ ...@@ -70,7 +70,7 @@ PROFILE_3_JARS := \
$(PROFILE_2_JARS) $(PROFILE_2_JARS)
ifneq ($(ENABLE_JFR), true) ifneq ($(ENABLE_JFR), true)
FULL_JRE_JAR_FILES := $(filter-out jfr.jar, $(FULL_JRE_JAR_FILES)) FULL_JRE_JAR_FILES := $(filter-out jfr.jar, $(FULL_JRE_JAR_FILES))
endif endif
FULL_JRE_JARS := \ FULL_JRE_JARS := \
...@@ -83,43 +83,43 @@ FULL_JRE_JARS := \ ...@@ -83,43 +83,43 @@ FULL_JRE_JARS := \
# rt.jar and resources.jar that we filtered out above # rt.jar and resources.jar that we filtered out above
ALL_JARS := $(FULL_JRE_JARS) \ ALL_JARS := $(FULL_JRE_JARS) \
$(IMAGES_OUTPUTDIR)/lib/rt.jar \ $(IMAGES_OUTPUTDIR)/lib/rt.jar \
$(IMAGES_OUTPUTDIR)/lib/resources.jar \ $(IMAGES_OUTPUTDIR)/lib/resources.jar \
$(IMAGES_OUTPUTDIR)/lib/jconsole.jar \ $(IMAGES_OUTPUTDIR)/lib/jconsole.jar \
$(IMAGES_OUTPUTDIR)/lib/dt.jar \ $(IMAGES_OUTPUTDIR)/lib/dt.jar \
$(IMAGES_OUTPUTDIR)/lib/tools.jar \ $(IMAGES_OUTPUTDIR)/lib/tools.jar \
$(IMAGES_OUTPUTDIR)/lib/ct.sym \ $(IMAGES_OUTPUTDIR)/lib/ct.sym \
$(IMAGES_OUTPUTDIR)/src.zip $(IMAGES_OUTPUTDIR)/src.zip
ifeq ($(INCLUDE_SA),true) ifeq ($(INCLUDE_SA), true)
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar
endif endif
ifeq ($(OPENJDK_TARGET_OS),solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
ifndef OPENJDK ifndef OPENJDK
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/ext/ucrypto.jar ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/ext/ucrypto.jar
endif endif
endif endif
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar
endif endif
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/JObjC.jar ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/JObjC.jar
endif endif
ifeq ($(PROFILE), profile_1) ifeq ($(PROFILE), profile_1)
PROFILE_JARS := $(PROFILE_1_JARS) PROFILE_JARS := $(PROFILE_1_JARS)
else ifeq ($(PROFILE), profile_2) else ifeq ($(PROFILE), profile_2)
PROFILE_JARS := $(PROFILE_2_JARS) PROFILE_JARS := $(PROFILE_2_JARS)
else ifeq ($(PROFILE), profile_3) else ifeq ($(PROFILE), profile_3)
PROFILE_JARS := $(PROFILE_3_JARS) PROFILE_JARS := $(PROFILE_3_JARS)
endif endif
ifneq ($(PROFILE),) ifneq ($(PROFILE), )
JARS := $(CUSTOM_PROFILE_JARS) $(PROFILE_JARS) JARS := $(CUSTOM_PROFILE_JARS) $(PROFILE_JARS)
else else
JARS := $(ALL_JARS) JARS := $(ALL_JARS)
endif endif
############################################################################### ###############################################################################
...@@ -128,37 +128,37 @@ endif ...@@ -128,37 +128,37 @@ endif
# we don't need to do anything if not building a profile # we don't need to do anything if not building a profile
ifneq ($(PROFILE),) ifneq ($(PROFILE), )
# Need all files to generate the exclude lists # Need all files to generate the exclude lists
NEW_ALL_BIN_LIST := $(patsubst $(JDK_OUTPUTDIR)/bin/%,%,$(shell $(FIND) $(JDK_OUTPUTDIR)/bin \( -type f -o -type l \) ! -name "sjavac")) NEW_ALL_BIN_LIST := $(patsubst $(JDK_OUTPUTDIR)/bin/%,%,$(shell $(FIND) $(JDK_OUTPUTDIR)/bin \( -type f -o -type l \) ! -name "sjavac"))
ALL_JRE_BIN_FILES := \ ALL_JRE_BIN_FILES := \
$(PROFILE_1_JRE_BIN_FILES) \ $(PROFILE_1_JRE_BIN_FILES) \
$(PROFILE_2_JRE_BIN_FILES) \ $(PROFILE_2_JRE_BIN_FILES) \
$(PROFILE_3_JRE_BIN_FILES) \ $(PROFILE_3_JRE_BIN_FILES) \
$(FULL_JRE_BIN_FILES) $(FULL_JRE_BIN_FILES)
NOT_JRE_BIN_FILES := $(filter-out $(ALL_JRE_BIN_FILES), $(NEW_ALL_BIN_LIST)) NOT_JRE_BIN_FILES := $(filter-out $(ALL_JRE_BIN_FILES), $(NEW_ALL_BIN_LIST))
# Additional exclusions for profile JRE # Additional exclusions for profile JRE
ifeq ($(PROFILE), profile_1) ifeq ($(PROFILE), profile_1)
NOT_JRE_BIN_FILES += \ NOT_JRE_BIN_FILES += \
$(PROFILE_2_JRE_BIN_FILES) \ $(PROFILE_2_JRE_BIN_FILES) \
$(PROFILE_3_JRE_BIN_FILES) \ $(PROFILE_3_JRE_BIN_FILES) \
$(FULL_JRE_BIN_FILES) $(FULL_JRE_BIN_FILES)
endif endif
ifeq ($(PROFILE), profile_2) ifeq ($(PROFILE), profile_2)
NOT_JRE_BIN_FILES += \ NOT_JRE_BIN_FILES += \
$(PROFILE_3_JRE_BIN_FILES) \ $(PROFILE_3_JRE_BIN_FILES) \
$(FULL_JRE_BIN_FILES) $(FULL_JRE_BIN_FILES)
endif endif
ifeq ($(PROFILE), profile_3) ifeq ($(PROFILE), profile_3)
NOT_JRE_BIN_FILES += \ NOT_JRE_BIN_FILES += \
$(FULL_JRE_BIN_FILES) $(FULL_JRE_BIN_FILES)
endif endif
NOT_JRE_BIN_FILES := $(addprefix $(JDK_OUTPUTDIR)/bin/, $(NOT_JRE_BIN_FILES)) NOT_JRE_BIN_FILES := $(addprefix $(JDK_OUTPUTDIR)/bin/, $(NOT_JRE_BIN_FILES))
...@@ -168,10 +168,10 @@ NEW_ALL_LIB_LIST := $(patsubst $(JDK_OUTPUTDIR)/lib/%,%,$(shell $(FIND) $(JDK_OU ...@@ -168,10 +168,10 @@ NEW_ALL_LIB_LIST := $(patsubst $(JDK_OUTPUTDIR)/lib/%,%,$(shell $(FIND) $(JDK_OU
NEW_ALL_LIB_LIST += $(patsubst $(IMAGES_OUTPUTDIR)/lib/%,%,$(shell $(FIND) $(IMAGES_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \( -name "_the*" -o -name "javac_state " \) )) NEW_ALL_LIB_LIST += $(patsubst $(IMAGES_OUTPUTDIR)/lib/%,%,$(shell $(FIND) $(IMAGES_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \( -name "_the*" -o -name "javac_state " \) ))
ALL_JRE_LIB_FILES := \ ALL_JRE_LIB_FILES := \
$(PROFILE_1_JRE_LIB_FILES) \ $(PROFILE_1_JRE_LIB_FILES) \
$(PROFILE_2_JRE_LIB_FILES) \ $(PROFILE_2_JRE_LIB_FILES) \
$(PROFILE_3_JRE_LIB_FILES) \ $(PROFILE_3_JRE_LIB_FILES) \
$(FULL_JRE_LIB_FILES) $(FULL_JRE_LIB_FILES)
NOT_JRE_LIB_FILES := $(filter-out $(ALL_JRE_LIB_FILES), $(NEW_ALL_LIB_LIST)) NOT_JRE_LIB_FILES := $(filter-out $(ALL_JRE_LIB_FILES), $(NEW_ALL_LIB_LIST))
...@@ -184,21 +184,21 @@ NOT_JRE_LIB_FILES := $(filter-out $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PRE ...@@ -184,21 +184,21 @@ NOT_JRE_LIB_FILES := $(filter-out $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PRE
# Additional exclusions for profile JREs # Additional exclusions for profile JREs
ifeq ($(PROFILE), profile_1) ifeq ($(PROFILE), profile_1)
NOT_JRE_LIB_FILES += \ NOT_JRE_LIB_FILES += \
$(PROFILE_2_JRE_LIB_FILES) \ $(PROFILE_2_JRE_LIB_FILES) \
$(PROFILE_3_JRE_LIB_FILES) \ $(PROFILE_3_JRE_LIB_FILES) \
$(FULL_JRE_LIB_FILES) $(FULL_JRE_LIB_FILES)
endif endif
ifeq ($(PROFILE), profile_2) ifeq ($(PROFILE), profile_2)
NOT_JRE_LIB_FILES += \ NOT_JRE_LIB_FILES += \
$(PROFILE_3_JRE_LIB_FILES) \ $(PROFILE_3_JRE_LIB_FILES) \
$(FULL_JRE_LIB_FILES) $(FULL_JRE_LIB_FILES)
endif endif
ifeq ($(PROFILE), profile_3) ifeq ($(PROFILE), profile_3)
NOT_JRE_LIB_FILES += \ NOT_JRE_LIB_FILES += \
$(FULL_JRE_LIB_FILES) $(FULL_JRE_LIB_FILES)
endif endif
# Exclude the custom jar files as these will be added back via a special rule # Exclude the custom jar files as these will be added back via a special rule
...@@ -272,58 +272,57 @@ include profile-rtjar-includes.txt ...@@ -272,58 +272,57 @@ include profile-rtjar-includes.txt
# NOTE: Classfiles with $ in their name are problematic as that is the # NOTE: Classfiles with $ in their name are problematic as that is the
# meta-character for both make and the shell! Hence the \$$$$ substitution. # meta-character for both make and the shell! Hence the \$$$$ substitution.
# But note that if you echo these values they will NOT display as expected. # But note that if you echo these values they will NOT display as expected.
class_list = $(patsubst $(JDK_OUTPUTDIR)/classes/%,%,\ class_list = $(patsubst $(JDK_OUTPUTDIR)/classes/%,%, \
$(foreach i,$(1), $(subst $$,\$$$$, $(wildcard $(JDK_OUTPUTDIR)/classes/$i)))) $(foreach i, $(1), $(subst $$,\$$$$, $(wildcard $(JDK_OUTPUTDIR)/classes/$i))))
ifeq ($(PROFILE), profile_1) ifeq ($(PROFILE), profile_1)
RT_JAR_EXCLUDES += \ RT_JAR_EXCLUDES += \
$(call class_list, $(PROFILE_1_RTJAR_EXCLUDE_TYPES)) \ $(call class_list, $(PROFILE_1_RTJAR_EXCLUDE_TYPES)) \
$(PROFILE_2_RTJAR_INCLUDE_PACKAGES) \ $(PROFILE_2_RTJAR_INCLUDE_PACKAGES) \
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES)) \ $(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES)) \
$(PROFILE_3_RTJAR_INCLUDE_PACKAGES) \ $(PROFILE_3_RTJAR_INCLUDE_PACKAGES) \
$(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES)) \ $(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES)) \
$(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \ $(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
$(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES)) $(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
RT_JAR_INCLUDE_TYPES := \ RT_JAR_INCLUDE_TYPES := \
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES)) $(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES))
PROFILE_INCLUDE_METAINF_SERVICES := \ PROFILE_INCLUDE_METAINF_SERVICES := \
$(PROFILE_1_INCLUDE_METAINF_SERVICES) $(PROFILE_1_INCLUDE_METAINF_SERVICES)
endif endif
ifeq ($(PROFILE), profile_2) ifeq ($(PROFILE), profile_2)
RT_JAR_EXCLUDES += \ RT_JAR_EXCLUDES += \
$(call class_list, $(PROFILE_2_RTJAR_EXCLUDE_TYPES)) \ $(call class_list, $(PROFILE_2_RTJAR_EXCLUDE_TYPES)) \
$(PROFILE_3_RTJAR_INCLUDE_PACKAGES) \ $(PROFILE_3_RTJAR_INCLUDE_PACKAGES) \
$(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES)) \ $(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES)) \
$(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \ $(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
$(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES)) $(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
RT_JAR_INCLUDE_TYPES := \ RT_JAR_INCLUDE_TYPES := \
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES)) \ $(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES)) \
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES)) $(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES))
PROFILE_INCLUDE_METAINF_SERVICES := \ PROFILE_INCLUDE_METAINF_SERVICES := \
$(PROFILE_1_INCLUDE_METAINF_SERVICES) \ $(PROFILE_1_INCLUDE_METAINF_SERVICES) \
$(PROFILE_2_INCLUDE_METAINF_SERVICES) $(PROFILE_2_INCLUDE_METAINF_SERVICES)
endif endif
ifeq ($(PROFILE), profile_3) ifeq ($(PROFILE), profile_3)
RT_JAR_EXCLUDES += \ RT_JAR_EXCLUDES += \
$(call class_list, $(PROFILE_3_RTJAR_EXCLUDE_TYPES)) \ $(call class_list, $(PROFILE_3_RTJAR_EXCLUDE_TYPES)) \
$(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \ $(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
$(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES)) $(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
RT_JAR_INCLUDE_TYPES := \ RT_JAR_INCLUDE_TYPES := \
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES)) \ $(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES)) \
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES)) \ $(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES)) \
$(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES)) $(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES))
PROFILE_INCLUDE_METAINF_SERVICES := \ PROFILE_INCLUDE_METAINF_SERVICES := \
$(PROFILE_1_INCLUDE_METAINF_SERVICES) \ $(PROFILE_1_INCLUDE_METAINF_SERVICES) \
$(PROFILE_2_INCLUDE_METAINF_SERVICES) \ $(PROFILE_2_INCLUDE_METAINF_SERVICES) \
$(PROFILE_3_INCLUDE_METAINF_SERVICES) $(PROFILE_3_INCLUDE_METAINF_SERVICES)
endif endif
# Filter out non-OpenJDK services # Filter out non-OpenJDK services
ifdef OPENJDK ifdef OPENJDK
EXCLUDED_SERVICES := META-INF/services/javax.script.ScriptEngineFactory EXCLUDED_SERVICES := META-INF/services/javax.script.ScriptEngineFactory
PROFILE_INCLUDE_METAINF_SERVICES := $(filter-out $(EXCLUDED_SERVICES),$(PROFILE_INCLUDE_METAINF_SERVICES)) PROFILE_INCLUDE_METAINF_SERVICES := $(filter-out $(EXCLUDED_SERVICES), $(PROFILE_INCLUDE_METAINF_SERVICES))
endif endif
endif # profile endif # profile
makefiles/Setup.gmk
浏览文件 @ e864d64d
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
# questions. # questions.
# #
DISABLE_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally DISABLE_WARNINGS := -Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
# To build with all warnings enabled, do the following: # To build with all warnings enabled, do the following:
# make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000" # make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
JAVAC_WARNINGS:=-Xlint:-unchecked,-deprecation,-overrides,classfile,dep-ann,divzero,varargs -Werror JAVAC_WARNINGS := -Xlint:-unchecked,-deprecation,-overrides,classfile,dep-ann,divzero,varargs -Werror
# Any java code executed during a JDK build to build other parts of the JDK must be # Any java code executed during a JDK build to build other parts of the JDK must be
# executed by the bootstrap JDK (probably with -Xbootclasspath/p: ) and for this # executed by the bootstrap JDK (probably with -Xbootclasspath/p: ) and for this
...@@ -37,31 +37,31 @@ JAVAC_WARNINGS:=-Xlint:-unchecked,-deprecation,-overrides,classfile,dep-ann,divz ...@@ -37,31 +37,31 @@ JAVAC_WARNINGS:=-Xlint:-unchecked,-deprecation,-overrides,classfile,dep-ann,divz
# The generate old bytecode javac setup uses the new compiler to compile for the # 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. # boot jdk to generate tools that need to be run with the boot jdk.
# Thus we force the target bytecode to the previous JDK version. # Thus we force the target bytecode to the previous JDK version.
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\ $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
JVM:=$(JAVA),\ JVM := $(JAVA), \
JAVAC:=$(NEW_JAVAC),\ JAVAC := $(NEW_JAVAC), \
FLAGS := $(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS), \ FLAGS := $(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS), \
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
# The generate new bytecode javac setup uses the new compiler to compile for the # The generate new bytecode javac setup uses the new compiler to compile for the
# new jdk. This new bytecode might only be possible to run using the new jvm. # new jdk. This new bytecode might only be possible to run using the new jvm.
$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\ $(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
JVM:=$(JAVA),\ JVM := $(JAVA), \
JAVAC:=$(NEW_JAVAC),\ JAVAC := $(NEW_JAVAC), \
FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 \ FLAGS := -bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 \
-encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS) \ -encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS) \
$(GENERATE_JDKBYTECODE_EXTRA_FLAGS),\ $(GENERATE_JDKBYTECODE_EXTRA_FLAGS), \
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
# After the jdk is built, we want to build demos using only the recently # After the jdk is built, we want to build demos using only the recently
# generated jdk classes and nothing else, no jdk source, etc etc. # generated jdk classes and nothing else, no jdk source, etc etc.
# I.e. the rt.jar, but since rt.jar has not yet been generated # I.e. the rt.jar, but since rt.jar has not yet been generated
# (it will be in "make images") therefore we use classes instead. # (it will be in "make images") therefore we use classes instead.
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE,\ $(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
JVM:=$(JAVA),\ JVM := $(JAVA), \
JAVAC:=$(NEW_JAVAC),\ JAVAC := $(NEW_JAVAC), \
FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\ FLAGS := -bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS), \
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
makefiles/SignJars.gmk
浏览文件 @ e864d64d
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
include $(SPEC) include $(SPEC)
include MakeBase.gmk include MakeBase.gmk
# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Oracle JDK # (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Oracle JDK
# builds respectively.) # builds respectively.)
# #
# JCE builds are very different between OpenJDK and JDK. The OpenJDK JCE # 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 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 # jar file is installed into JDK, things will break when the crypto
# routines are called. # routines are called.
# #
...@@ -40,15 +40,15 @@ include MakeBase.gmk ...@@ -40,15 +40,15 @@ include MakeBase.gmk
# For JDK, the binaries use pre-built/pre-signed binary files stored in # For JDK, the binaries use pre-built/pre-signed binary files stored in
# the closed workspace that are not shipped in the OpenJDK workspaces. # the closed workspace that are not shipped in the OpenJDK workspaces.
# We still build the JDK files to verify the files compile, and in # We still build the JDK files to verify the files compile, and in
# preparation for possible signing. Developers working on JCE in JDK # preparation for possible signing. Developers working on JCE in JDK
# must sign the JCE files before testing. The JCE signing key is kept # must sign the JCE files before testing. The JCE signing key is kept
# separate from the JDK workspace to prevent its disclosure. # separate from the JDK workspace to prevent its disclosure.
# #
# SPECIAL NOTE TO JCE/JDK developers: The source files must eventually # SPECIAL NOTE TO JCE/JDK developers: The source files must eventually
# be built, signed, and then the resulting jar files MUST BE CHECKED # be built, signed, and then the resulting jar files MUST BE CHECKED
# INTO THE CLOSED PART OF THE WORKSPACE*. This separate step *MUST NOT # 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 # BE FORGOTTEN*, otherwise a bug fixed in the source code will not be
# reflected in the shipped binaries. The "sign-jars" target in the top # reflected in the shipped binaries. The "sign-jars" target in the top
# level Makefile should be used to generate the required files. # level Makefile should be used to generate the required files.
# #
...@@ -63,19 +63,19 @@ README-MAKEFILE_WARNING := \ ...@@ -63,19 +63,19 @@ README-MAKEFILE_WARNING := \
# #
# Location for JCE codesigning key. # Location for JCE codesigning key.
# #
SIGNING_KEY_DIR := /security/ws/JCE-signing/src SIGNING_KEY_DIR := /security/ws/JCE-signing/src
SIGNING_KEYSTORE := $(SIGNING_KEY_DIR)/KeyStore.jks SIGNING_KEYSTORE := $(SIGNING_KEY_DIR)/KeyStore.jks
SIGNING_PASSPHRASE := $(SIGNING_KEY_DIR)/passphrase.txt SIGNING_PASSPHRASE := $(SIGNING_KEY_DIR)/passphrase.txt
SIGNING_ALIAS := oracle_jce_rsa SIGNING_ALIAS := oracle_jce_rsa
# #
# Defines for signing the various jar files. # Defines for signing the various jar files.
# #
check-keystore: check-keystore:
@if [ ! -f $(SIGNING_KEYSTORE) -o ! -f $(SIGNING_PASSPHRASE) ]; then \ @if [ ! -f $(SIGNING_KEYSTORE) -o ! -f $(SIGNING_PASSPHRASE) ]; then \
$(PRINTF) "\n$(SIGNING_KEYSTORE): Signing mechanism *NOT* available..."; \ $(PRINTF) "\n$(SIGNING_KEYSTORE): Signing mechanism *NOT* available..."; \
$(PRINTF) $(README-MAKEFILE_WARNING); \ $(PRINTF) $(README-MAKEFILE_WARNING); \
exit 2; \ exit 2; \
fi fi
$(JCE_OUTPUTDIR)/%: $(IMAGES_OUTPUTDIR)/unsigned/% $(JCE_OUTPUTDIR)/%: $(IMAGES_OUTPUTDIR)/unsigned/%
...@@ -85,11 +85,11 @@ $(JCE_OUTPUTDIR)/%: $(IMAGES_OUTPUTDIR)/unsigned/% ...@@ -85,11 +85,11 @@ $(JCE_OUTPUTDIR)/%: $(IMAGES_OUTPUTDIR)/unsigned/%
@$(PRINTF) "\nJar codesigning finished.\n" @$(PRINTF) "\nJar codesigning finished.\n"
JAR_LIST := jce.jar \ JAR_LIST := jce.jar \
local_policy.jar \ local_policy.jar \
sunec.jar \ sunec.jar \
sunjce_provider.jar \ sunjce_provider.jar \
sunpkcs11.jar \ sunpkcs11.jar \
US_export_policy.jar US_export_policy.jar
SIGNED_JARS := $(addprefix $(JCE_OUTPUTDIR)/,$(JAR_LIST)) SIGNED_JARS := $(addprefix $(JCE_OUTPUTDIR)/,$(JAR_LIST))
...@@ -97,7 +97,7 @@ $(SIGNED_JARS): check-keystore ...@@ -97,7 +97,7 @@ $(SIGNED_JARS): check-keystore
all: $(SIGNED_JARS) all: $(SIGNED_JARS)
@$(PRINTF) "\n***The jar files built by the 'jar-sign' target must***" @$(PRINTF) "\n***The jar files built by the 'jar-sign' target must***"
@$(PRINTF) "\n***still be checked into the closed workspace! ***" @$(PRINTF) "\n***still be checked into the closed workspace!***"
@$(PRINTF) $(README-MAKEFILE_WARNING) @$(PRINTF) $(README-MAKEFILE_WARNING)
endif # !OPENJDK endif # !OPENJDK
makefiles/Tools.gmk
浏览文件 @ e864d64d
...@@ -24,131 +24,130 @@ ...@@ -24,131 +24,130 @@
# #
# Cache all finds needed for this file. Only used on windows. # Cache all finds needed for this file. Only used on windows.
$(eval $(call FillCacheFind,$(JDK_TOPDIR)/make/tools \ $(eval $(call FillCacheFind, $(JDK_TOPDIR)/make/tools \
$(JDK_TOPDIR)/makefiles/sun)) $(JDK_TOPDIR)/makefiles/sun))
TOOLS_SRC:=$(JDK_TOPDIR)/make/tools/src \ TOOLS_SRC := $(JDK_TOPDIR)/make/tools/src \
$(JDK_TOPDIR)/makefiles/sun/awt/ \ $(JDK_TOPDIR)/makefiles/sun/awt/ \
$(JDK_TOPDIR)/makefiles/sun/osxapp \ $(JDK_TOPDIR)/makefiles/sun/osxapp \
$(JDK_TOPDIR)/make/tools/swing-beans $(JDK_TOPDIR)/make/tools/swing-beans
ifneq ($(OPENJDK_TARGET_OS),windows) ifneq ($(OPENJDK_TARGET_OS), windows)
TOOLS_SRC+=$(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator TOOLS_SRC += $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
endif endif
# The exception handling of swing beaninfo which have the own tool directory # The exception handling of swing beaninfo which have the own tool directory
ifeq (,$(BUILD_TOOLS)) ifeq (, $(BUILD_TOOLS))
$(eval $(call SetupJavaCompilation,BUILD_TOOLS,\ $(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
SETUP:=GENERATE_OLDBYTECODE,\ SETUP := GENERATE_OLDBYTECODE, \
SRC:=$(TOOLS_SRC),\ SRC := $(TOOLS_SRC), \
BIN:=$(JDK_OUTPUTDIR)/btclasses)) BIN := $(JDK_OUTPUTDIR)/btclasses))
endif endif
$(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template : \ $(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template: \
$(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/%.template $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/%.template
$(call install-file) $(call install-file)
BUILD_TOOLS += $(foreach i,$(wildcard $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/*.template),$(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/$(notdir $i)) BUILD_TOOLS += $(foreach i, $(wildcard $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/*.template), $(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/$(notdir $i))
# Resources used by CheckDeps tool # Resources used by CheckDeps tool
$(JDK_OUTPUTDIR)/btclasses/build/tools/deps/% : \ $(JDK_OUTPUTDIR)/btclasses/build/tools/deps/%: \
$(JDK_TOPDIR)/make/tools/src/build/tools/deps/% $(JDK_TOPDIR)/make/tools/src/build/tools/deps/%
$(call install-file) $(call install-file)
BUILD_TOOLS += $(JDK_OUTPUTDIR)/btclasses/build/tools/deps/refs.allowed BUILD_TOOLS += $(JDK_OUTPUTDIR)/btclasses/build/tools/deps/refs.allowed
# Add a checksum ("jsum") to the end of a text file. Prevents trivial tampering with class lists. # Add a checksum ("jsum") to the end of a text file. Prevents trivial tampering with class lists.
TOOL_ADDJSUM=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_ADDJSUM = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.addjsum.AddJsum build.tools.addjsum.AddJsum
# The buildmetaindex tool creates a meta-index to make core class loaders lazier. # The buildmetaindex tool creates a meta-index to make core class loaders lazier.
TOOL_BUILDMETAINDEX=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_BUILDMETAINDEX = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.buildmetaindex.BuildMetaIndex build.tools.buildmetaindex.BuildMetaIndex
# The comment checker is not currently used. Should it be removed or added to javac? # The comment checker is not currently used. Should it be removed or added to javac?
TOOL_COMMENTCHECKER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_COMMENTCHECKER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.commentchecker.CommentChecker build.tools.commentchecker.CommentChecker
TOOL_COMPILEFONTCONFIG=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_COMPILEFONTCONFIG = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.compilefontconfig.CompileFontConfig build.tools.compilefontconfig.CompileFontConfig
TOOL_COMPILEPROPERTIES=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_COMPILEPROPERTIES = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.compileproperties.CompileProperties build.tools.compileproperties.CompileProperties
TOOL_STRIPPROPERTIES=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_STRIPPROPERTIES = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.stripproperties.StripProperties build.tools.stripproperties.StripProperties
TOOL_JARREORDER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_JARREORDER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.jarreorder.JarReorder build.tools.jarreorder.JarReorder
TOOL_GENERATECHARACTER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_GENERATECHARACTER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.generatecharacter.GenerateCharacter build.tools.generatecharacter.GenerateCharacter
TOOL_CHARACTERNAME=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_CHARACTERNAME = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.generatecharacter.CharacterName build.tools.generatecharacter.CharacterName
TOOL_DIRDIFF=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_DIRDIFF = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.dirdiff.DirDiff build.tools.dirdiff.DirDiff
TOOL_DTDBUILDER=$(JAVA) -Ddtd_home=$(JDK_TOPDIR)/make/tools/dtdbuilder/dtds \ TOOL_DTDBUILDER = $(JAVA) -Ddtd_home=$(JDK_TOPDIR)/make/tools/dtdbuilder/dtds \
-cp $(JDK_OUTPUTDIR)/btclasses build.tools.dtdbuilder.DTDBuilder -cp $(JDK_OUTPUTDIR)/btclasses build.tools.dtdbuilder.DTDBuilder
TOOL_GENERATEBREAKITERATORDATA=$(JAVA) \ TOOL_GENERATEBREAKITERATORDATA = $(JAVA) \
-cp $(JDK_OUTPUTDIR)/btclasses \ -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.generatebreakiteratordata.GenerateBreakIteratorData build.tools.generatebreakiteratordata.GenerateBreakIteratorData
TOOL_GENERATECURRENCYDATA=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_GENERATECURRENCYDATA = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.generatecurrencydata.GenerateCurrencyData build.tools.generatecurrencydata.GenerateCurrencyData
TOOL_HASHER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_HASHER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.hasher.Hasher build.tools.hasher.Hasher
# Jarsplit used in jdk/makefiles/common/Release.gmk # Jarsplit used in jdk/makefiles/common/Release.gmk
TOOL_JARSPLIT=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_JARSPLIT = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.jarsplit.JarSplit build.tools.jarsplit.JarSplit
TOOL_TZDB=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_TZDB = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.tzdb.TzdbZoneRulesCompiler build.tools.tzdb.TzdbZoneRulesCompiler
# TODO: There are references to the jdwpgen.jar in jdk/make/netbeans/jdwpgen/build.xml # TODO: There are references to the jdwpgen.jar in jdk/make/netbeans/jdwpgen/build.xml
# and nbproject/project.properties in the same dir. Needs to be looked at. # and nbproject/project.properties in the same dir. Needs to be looked at.
TOOL_JDWPGEN=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses build.tools.jdwpgen.Main TOOL_JDWPGEN = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses build.tools.jdwpgen.Main
# TODO: Lots of files in jdk/make/tools/CharsetMapping dir # TODO: Lots of files in jdk/make/tools/CharsetMapping dir
TOOL_CHARSETMAPPING=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_CHARSETMAPPING = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.charsetmapping.Main build.tools.charsetmapping.Main
TOOL_SPP=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses build.tools.spp.Spp TOOL_SPP = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses build.tools.spp.Spp
# TODO: Only referenced in jdk/make/tools/sharing/README.txt. Find out what it means. # TODO: Only referenced in jdk/make/tools/sharing/README.txt. Find out what it means.
TOOL_MAKECLASSLIST=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_MAKECLASSLIST = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.makeclasslist.MakeClasslist build.tools.makeclasslist.MakeClasslist
# Nimbus is used somewhere in the swing build. # Nimbus is used somewhere in the swing build.
TOOL_GENERATENIMBUS=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_GENERATENIMBUS = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.generatenimbus.Generator build.tools.generatenimbus.Generator
TOOL_WRAPPERGENERATOR=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_WRAPPERGENERATOR = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
WrapperGenerator WrapperGenerator
TOOL_AWT_TOBIN=$(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_AWT_TOBIN = $(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
sun.awt.ToBin sun.awt.ToBin
TOOL_OSX_TOBIN=$(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_OSX_TOBIN = $(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
sun.osxapp.ToBin sun.osxapp.ToBin
TOOL_CLDRCONVERTER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_CLDRCONVERTER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.cldrconverter.CLDRConverter build.tools.cldrconverter.CLDRConverter
TOOL_REMOVEMETHODS=$(JAVA) -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ TOOL_REMOVEMETHODS = $(JAVA) -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
-cp $(JDK_OUTPUTDIR)/btclasses:$(JDK_OUTPUTDIR) \ -cp $(JDK_OUTPUTDIR)/btclasses:$(JDK_OUTPUTDIR) \
build.tools.classfile.RemoveMethods build.tools.classfile.RemoveMethods
TOOL_CHECKDEPS=$(JAVA) -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ TOOL_CHECKDEPS = $(JAVA) -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
-cp $(JDK_OUTPUTDIR)/btclasses:$(JDK_OUTPUTDIR) \ -cp $(JDK_OUTPUTDIR)/btclasses:$(JDK_OUTPUTDIR) \
build.tools.deps.CheckDeps build.tools.deps.CheckDeps
TOOL_ADDTORESTRICTEDPKGS=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ TOOL_ADDTORESTRICTEDPKGS=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.addtorestrictedpkgs.AddToRestrictedPkgs build.tools.addtorestrictedpkgs.AddToRestrictedPkgs
...@@ -157,22 +156,22 @@ TOOL_ADDTORESTRICTEDPKGS=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ ...@@ -157,22 +156,22 @@ TOOL_ADDTORESTRICTEDPKGS=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
# Tools needed on solaris because OBJCOPY is broken. # Tools needed on solaris because OBJCOPY is broken.
$(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK,\ $(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK, \
SRC:=$(JDK_TOPDIR)/make/tools/add_gnu_debuglink,\ SRC := $(JDK_TOPDIR)/make/tools/add_gnu_debuglink, \
LANG:=C,\ LANG := C, \
CC:=$(BUILD_CC),\ CC := $(BUILD_CC), \
LDEXE:=$(BUILD_LD),\ LDEXE := $(BUILD_LD), \
LDFLAGS:=-lelf,\ LDFLAGS := -lelf, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/add_gnu_debuglink,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/add_gnu_debuglink, \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/btbin,\ OUTPUT_DIR := $(JDK_OUTPUTDIR)/btbin, \
PROGRAM:=add_gnu_debuglink)) PROGRAM := add_gnu_debuglink))
$(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS,\ $(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS, \
SRC:=$(JDK_TOPDIR)/make/tools/fix_empty_sec_hdr_flags,\ SRC := $(JDK_TOPDIR)/make/tools/fix_empty_sec_hdr_flags, \
LANG:=C,\ LANG := C, \
CC:=$(BUILD_CC),\ CC := $(BUILD_CC), \
LDEXE:=$(BUILD_LD),\ LDEXE := $(BUILD_LD), \
LDFLAGS:=-lelf,\ LDFLAGS := -lelf, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags, \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/btbin,\ OUTPUT_DIR := $(JDK_OUTPUTDIR)/btbin, \
PROGRAM:=fix_empty_sec_hdr_flags)) PROGRAM := fix_empty_sec_hdr_flags))
makefiles/GendataBreakIterator.gmk → makefiles/gendata/GendataBreakIterator.gmk
浏览文件 @ e864d64d
...@@ -29,16 +29,16 @@ ...@@ -29,16 +29,16 @@
# input # input
# #
# Notes: sun.text.resources.BreakIteratorRules no longer goes to runtime. # Notes: sun.text.resources.BreakIteratorRules no longer goes to runtime.
# They are used at JDK build phase in order to create $(BIFILES) which # They are used at JDK build phase in order to create $(BIFILES) which
# are used on runtime instead. # are used on runtime instead.
# #
TEXT_SRCDIR = $(JDK_TOPDIR)/src/share/classes TEXT_SRCDIR = $(JDK_TOPDIR)/src/share/classes
TEXT_PKG = sun/text/resources TEXT_PKG = sun/text/resources
TEXT_SOURCES = $(TEXT_PKG)/BreakIteratorRules.java \ TEXT_SOURCES = $(TEXT_PKG)/BreakIteratorRules.java \
$(TEXT_PKG)/BreakIteratorInfo.java \ $(TEXT_PKG)/BreakIteratorInfo.java \
$(TEXT_PKG)/th/BreakIteratorRules_th.java \ $(TEXT_PKG)/th/BreakIteratorRules_th.java \
$(TEXT_PKG)/th/BreakIteratorInfo_th.java $(TEXT_PKG)/th/BreakIteratorInfo_th.java
# Generate BreakIteratorData # Generate BreakIteratorData
BREAK_ITERATOR_DIR = $(JDK_OUTPUTDIR)/break_iterator BREAK_ITERATOR_DIR = $(JDK_OUTPUTDIR)/break_iterator
...@@ -50,49 +50,49 @@ BREAK_ITERATOR_CLASSES = $(BREAK_ITERATOR_DIR)/classes ...@@ -50,49 +50,49 @@ BREAK_ITERATOR_CLASSES = $(BREAK_ITERATOR_DIR)/classes
# Because we are targeting jdk N-1, but the surrounding source code is jdk N. # Because we are targeting jdk N-1, but the surrounding source code is jdk N.
# These two files should be moved out to a build tool! We have to disable # These two files should be moved out to a build tool! We have to disable
# sjavac here as well. # sjavac here as well.
$(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR,\ $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR, \
SETUP:=GENERATE_OLDBYTECODE,\ SETUP := GENERATE_OLDBYTECODE, \
SRC:=$(TEXT_SRCDIR),\ SRC := $(TEXT_SRCDIR), \
DISABLE_SJAVAC:=true,\ DISABLE_SJAVAC := true, \
JAVAC_SOURCE_PATH_OVERRIDE := $(TEXT_SRCDIR)/$(TEXT_PKG), \ JAVAC_SOURCE_PATH_OVERRIDE := $(TEXT_SRCDIR)/$(TEXT_PKG), \
INCLUDES:=$(TEXT_PKG),\ INCLUDES := $(TEXT_PKG), \
INCLUDE_FILES:=$(TEXT_SOURCES),\ INCLUDE_FILES := $(TEXT_SOURCES), \
BIN:=$(BREAK_ITERATOR_CLASSES))) BIN := $(BREAK_ITERATOR_CLASSES)))
# Generate data resource files. # Generate data resource files.
# input # input
UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData/UnicodeData.txt UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData/UnicodeData.txt
# output # output
DATA_PKG_DIR = $(JDK_OUTPUTDIR)/classes/sun/text/resources DATA_PKG_DIR = $(JDK_OUTPUTDIR)/classes/sun/text/resources
BIFILES = $(DATA_PKG_DIR)/CharacterBreakIteratorData \ BIFILES = $(DATA_PKG_DIR)/CharacterBreakIteratorData \
$(DATA_PKG_DIR)/WordBreakIteratorData \ $(DATA_PKG_DIR)/WordBreakIteratorData \
$(DATA_PKG_DIR)/LineBreakIteratorData \ $(DATA_PKG_DIR)/LineBreakIteratorData \
$(DATA_PKG_DIR)/SentenceBreakIteratorData $(DATA_PKG_DIR)/SentenceBreakIteratorData
BIFILES_TH = $(DATA_PKG_DIR)/th/WordBreakIteratorData_th \ BIFILES_TH = $(DATA_PKG_DIR)/th/WordBreakIteratorData_th \
$(DATA_PKG_DIR)/th/LineBreakIteratorData_th $(DATA_PKG_DIR)/th/LineBreakIteratorData_th
$(BIFILES): $(DATA_PKG_DIR)/_the.bifiles $(BIFILES): $(DATA_PKG_DIR)/_the.bifiles
$(DATA_PKG_DIR)/_the.bifiles: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES) $(DATA_PKG_DIR)/_the.bifiles: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
$(DATA_PKG_DIR)/_the.bifiles: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR) $(DATA_PKG_DIR)/_the.bifiles: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
$(ECHO) $(LOG_INFO) "Generating BreakIteratorData" $(ECHO) $(LOG_INFO) "Generating BreakIteratorData"
$(MKDIR) -p $(DATA_PKG_DIR) $(MKDIR) -p $(DATA_PKG_DIR)
$(RM) $(BIFILES) $(RM) $(BIFILES)
$(TOOL_GENERATEBREAKITERATORDATA) \ $(TOOL_GENERATEBREAKITERATORDATA) \
-o $(DATA_PKG_DIR) \ -o $(DATA_PKG_DIR) \
-spec $(UNICODEDATA) -spec $(UNICODEDATA)
$(TOUCH) $@ $(TOUCH) $@
$(BIFILES_TH): $(DATA_PKG_DIR)/_the.bifiles_th $(BIFILES_TH): $(DATA_PKG_DIR)/_the.bifiles_th
$(DATA_PKG_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES) $(DATA_PKG_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
$(DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR) $(DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
$(ECHO) $(LOG_INFO) "Generating BreakIteratorData_th" $(ECHO) $(LOG_INFO) "Generating BreakIteratorData_th"
$(MKDIR) -p $(DATA_PKG_DIR)/th $(MKDIR) -p $(DATA_PKG_DIR)/th
$(RM) $(BIFILES_TH) $(RM) $(BIFILES_TH)
$(TOOL_GENERATEBREAKITERATORDATA) \ $(TOOL_GENERATEBREAKITERATORDATA) \
-o $(DATA_PKG_DIR) \ -o $(DATA_PKG_DIR) \
-spec $(UNICODEDATA) \ -spec $(UNICODEDATA) \
-language th -language th
$(TOUCH) $@ $(TOUCH) $@
......
makefiles/GendataFontConfig.gmk → makefiles/gendata/GendataFontConfig.gmk
浏览文件 @ e864d64d
...@@ -26,53 +26,53 @@ ...@@ -26,53 +26,53 @@
GENDATA_FONT_CONFIG_DST := $(JDK_OUTPUTDIR)/lib GENDATA_FONT_CONFIG_DST := $(JDK_OUTPUTDIR)/lib
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/windows/classes/sun/awt/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_FILES := fontconfig.properties
GENDATA_FONT_CONFIG_SRC_PREFIX := GENDATA_FONT_CONFIG_SRC_PREFIX :=
endif endif
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
GENDATA_FONT_CONFIG_SRC_PREFIX := linux. GENDATA_FONT_CONFIG_SRC_PREFIX := linux.
ifdef OPENJDK ifdef OPENJDK
GENDATA_FONT_CONFIG_SRC_DIR := \ GENDATA_FONT_CONFIG_SRC_DIR := \
$(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs $(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs
# This is placeholder for possible fonconfig files which may # This is placeholder for possible fonconfig files which may
# useful for some highly specialized Linux distributions # useful for some highly specialized Linux distributions
GENDATA_FONT_CONFIG_SRC_FILES := GENDATA_FONT_CONFIG_SRC_FILES :=
else else
GENDATA_FONT_CONFIG_SRC_DIR := \ GENDATA_FONT_CONFIG_SRC_DIR := \
$(JDK_TOPDIR)/src/closed/solaris/classes/sun/awt/fontconfigs $(JDK_TOPDIR)/src/closed/solaris/classes/sun/awt/fontconfigs
GENDATA_FONT_CONFIG_SRC_FILES := \ GENDATA_FONT_CONFIG_SRC_FILES := \
fontconfig.properties \ fontconfig.properties \
fontconfig.RedHat.5.properties \ fontconfig.RedHat.5.properties \
fontconfig.RedHat.6.properties \ fontconfig.RedHat.6.properties \
fontconfig.Turbo.properties \ fontconfig.Turbo.properties \
fontconfig.SuSE.10.properties \ fontconfig.SuSE.10.properties \
fontconfig.SuSE.11.properties fontconfig.SuSE.11.properties
endif endif
endif endif
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
GENDATA_FONT_CONFIG_SRC_DIR := \ GENDATA_FONT_CONFIG_SRC_DIR := \
$(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs $(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
GENDATA_FONT_CONFIG_SRC_PREFIX := solaris. GENDATA_FONT_CONFIG_SRC_PREFIX := solaris.
endif endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
GENDATA_FONT_CONFIG_SRC_DIR := \ GENDATA_FONT_CONFIG_SRC_DIR := \
$(JDK_TOPDIR)/src/macosx/classes/sun/awt/fontconfigs $(JDK_TOPDIR)/src/macosx/classes/sun/awt/fontconfigs
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
GENDATA_FONT_CONFIG_SRC_PREFIX := macosx. GENDATA_FONT_CONFIG_SRC_PREFIX := macosx.
endif endif
### ###
$(GENDATA_FONT_CONFIG_DST)/%.src : \ $(GENDATA_FONT_CONFIG_DST)/%.src: \
$(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)% $(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%
$(call install-file) $(call install-file)
$(GENDATA_FONT_CONFIG_DST)/%.bfc : \ $(GENDATA_FONT_CONFIG_DST)/%.bfc: \
$(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%.properties $(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%.properties
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
...@@ -87,4 +87,3 @@ GENDATA_BFONT_CONFIGS := $(GENDATA_FONT_CONFIG_SRC_FILES:%.properties=$(GENDATA_ ...@@ -87,4 +87,3 @@ GENDATA_BFONT_CONFIGS := $(GENDATA_FONT_CONFIG_SRC_FILES:%.properties=$(GENDATA_
GENDATA_FONT_CONFIG := $(GENDATA_FONT_CONFIGS) $(GENDATA_BFONT_CONFIGS) GENDATA_FONT_CONFIG := $(GENDATA_FONT_CONFIGS) $(GENDATA_BFONT_CONFIGS)
### ###
makefiles/GendataHtml32dtd.gmk → makefiles/gendata/GendataHtml32dtd.gmk
浏览文件 @ e864d64d
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# questions. # questions.
# #
GENDATA_HTML32DTD := GENDATA_HTML32DTD :=
HTML32DTD = $(JDK_OUTPUTDIR)/classes/javax/swing/text/html/parser/html32.bdtd HTML32DTD = $(JDK_OUTPUTDIR)/classes/javax/swing/text/html/parser/html32.bdtd
$(HTML32DTD): $(BUILD_TOOLS) $(HTML32DTD): $(BUILD_TOOLS)
......
makefiles/GendataTZDB.gmk → makefiles/gendata/GendataTZDB.gmk
浏览文件 @ e864d64d
...@@ -34,7 +34,7 @@ TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE)) ...@@ -34,7 +34,7 @@ TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))
GENDATA_TZDB_DAT := $(JDK_OUTPUTDIR)/lib/tzdb.dat GENDATA_TZDB_DAT := $(JDK_OUTPUTDIR)/lib/tzdb.dat
$(GENDATA_TZDB_DAT) : $(TZDATA_TZFILES) $(GENDATA_TZDB_DAT): $(TZDATA_TZFILES)
$(RM) $(GENDATA_TZDB_DAT) $(RM) $(GENDATA_TZDB_DAT)
$(TOOL_TZDB) -srcdir $(TZDATA_DIR) -dstfile $(GENDATA_TZDB_DAT) $(TZDATA_TZFILE) $(TOOL_TZDB) -srcdir $(TZDATA_DIR) -dstfile $(GENDATA_TZDB_DAT) $(TZDATA_TZFILE)
......
makefiles/GendataTimeZone.gmk → makefiles/gendata/GendataTimeZone.gmk
浏览文件 @ e864d64d
...@@ -43,9 +43,9 @@ TZFILES := \ ...@@ -43,9 +43,9 @@ TZFILES := \
$(addprefix $(JDK_TOPDIR)/make/sun/javazic/tzdata/,$(TZFILE0)) \ $(addprefix $(JDK_TOPDIR)/make/sun/javazic/tzdata/,$(TZFILE0)) \
$(addprefix $(JDK_TOPDIR)/make/sun/javazic/tzdata_jdk/,$(TZFILE1)) $(addprefix $(JDK_TOPDIR)/make/sun/javazic/tzdata_jdk/,$(TZFILE1))
GENDATA_TIMEZONE_MAPFILE:=ZoneInfoMappings GENDATA_TIMEZONE_MAPFILE := ZoneInfoMappings
$(GENDATA_TIMEZONE_DST)/$(GENDATA_TIMEZONE_MAPFILE) : $(TZFILES) $(GENDATA_TIMEZONE_DST)/$(GENDATA_TIMEZONE_MAPFILE): $(TZFILES)
$(RM) -r $(GENDATA_TIMEZONE_TMP) $(RM) -r $(GENDATA_TIMEZONE_TMP)
$(MKDIR) -p $(GENDATA_TIMEZONE_TMP) $(MKDIR) -p $(GENDATA_TIMEZONE_TMP)
$(RM) -r $(GENDATA_TIMEZONE_DST) $(RM) -r $(GENDATA_TIMEZONE_DST)
......
makefiles/GensrcBuffer.gmk → makefiles/gensrc/GensrcBuffer.gmk
浏览文件 @ e864d64d
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# questions. # questions.
# #
GENSRC_BUFFER := GENSRC_BUFFER :=
GENSRC_BUFFER_TMP := $(JDK_OUTPUTDIR)/gensrc GENSRC_BUFFER_TMP := $(JDK_OUTPUTDIR)/gensrc
GENSRC_BUFFER_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio GENSRC_BUFFER_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio
...@@ -32,349 +32,349 @@ GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio ...@@ -32,349 +32,349 @@ GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio
### ###
$(GENSRC_BUFFER_DST)/_the.buffer.dir : $(GENSRC_BUFFER_DST)/_the.buffer.dir:
$(ECHO) "Generating buffer classes" $(ECHO) "Generating buffer classes"
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(TOUCH) $@ $(TOUCH) $@
define fixRw define fixRw
$1_RW := $2 $1_RW := $2
$1_rwkey := rw $1_rwkey := rw
ifeq (R,$2) ifeq (R, $2)
$1_rwkey := ro $1_rwkey := ro
endif endif
endef endef
define typesAndBits define typesAndBits
# param 1 target # param 1 target
# param 2 type # param 2 type
# param 3 BO # param 3 BO
$1_a := a $1_a := a
$1_A := A $1_A := A
$1_type := $2 $1_type := $2
ifeq ($2, byte) ifeq ($2, byte)
$1_x := b $1_x := b
$1_Type := Byte $1_Type := Byte
$1_fulltype := byte $1_fulltype := byte
$1_Fulltype := Byte $1_Fulltype := Byte
$1_category := integralType $1_category := integralType
$1_LBPV := 0 $1_LBPV := 0
endif endif
ifeq ($2, char) ifeq ($2, char)
$1_x := c $1_x := c
$1_Type := Char $1_Type := Char
$1_fulltype := character $1_fulltype := character
$1_Fulltype := Character $1_Fulltype := Character
$1_category := integralType $1_category := integralType
$1_streams := streamableType $1_streams := streamableType
$1_streamtype := int $1_streamtype := int
$1_Streamtype := Int $1_Streamtype := Int
$1_LBPV := 1 $1_LBPV := 1
endif endif
ifeq ($2, short) ifeq ($2, short)
$1_x := s $1_x := s
$1_Type := Short $1_Type := Short
$1_fulltype := short $1_fulltype := short
$1_Fulltype := Short $1_Fulltype := Short
$1_category := integralType $1_category := integralType
$1_LBPV := 1 $1_LBPV := 1
endif endif
ifeq ($2, int) ifeq ($2, int)
$1_a := an $1_a := an
$1_A := An $1_A := An
$1_x := i $1_x := i
$1_Type := Int $1_Type := Int
$1_fulltype := integer $1_fulltype := integer
$1_Fulltype := Integer $1_Fulltype := Integer
$1_category := integralType $1_category := integralType
$1_LBPV := 2 $1_LBPV := 2
endif endif
ifeq ($2, long) ifeq ($2, long)
$1_x := l $1_x := l
$1_Type := Long $1_Type := Long
$1_fulltype := long $1_fulltype := long
$1_Fulltype := Long $1_Fulltype := Long
$1_category := integralType $1_category := integralType
$1_LBPV := 3 $1_LBPV := 3
endif endif
ifeq ($2, float) ifeq ($2, float)
$1_x := f $1_x := f
$1_Type := Float $1_Type := Float
$1_fulltype := float $1_fulltype := float
$1_Fulltype := Float $1_Fulltype := Float
$1_category := floatingPointType $1_category := floatingPointType
$1_LBPV := 2 $1_LBPV := 2
endif endif
ifeq ($2, double) ifeq ($2, double)
$1_x := d $1_x := d
$1_Type := Double $1_Type := Double
$1_fulltype := double $1_fulltype := double
$1_Fulltype := Double $1_Fulltype := Double
$1_category := floatingPointType $1_category := floatingPointType
$1_LBPV := 3 $1_LBPV := 3
endif endif
$1_Swaptype := $$($1_Type) $1_Swaptype := $$($1_Type)
$1_memtype := $2 $1_memtype := $2
$1_Memtype := $$($1_Type) $1_Memtype := $$($1_Type)
ifeq ($2, float) ifeq ($2, float)
$1_memtype := int $1_memtype := int
$1_Memtype := Int $1_Memtype := Int
ifneq ($3,U) ifneq ($3, U)
$1_Swaptype := Int $1_Swaptype := Int
$1_fromBits := Float.intBitsToFloat $1_fromBits := Float.intBitsToFloat
$1_toBits := Float.floatToRawIntBits $1_toBits := Float.floatToRawIntBits
endif endif
endif endif
ifeq ($2, double) ifeq ($2, double)
$1_memtype := long $1_memtype := long
$1_Memtype := Long $1_Memtype := Long
ifneq ($3,U) ifneq ($3, U)
$1_Swaptype := Long $1_Swaptype := Long
$1_fromBits := Double.longBitsToDouble $1_fromBits := Double.longBitsToDouble
$1_toBits := Double.doubleToRawLongBits $1_toBits := Double.doubleToRawLongBits
endif endif
endif endif
ifeq ($3, S) ifeq ($3, S)
$1_swap := Bits.swap $1_swap := Bits.swap
endif endif
endef endef
define genBinOps define genBinOps
# param 1 target # param 1 target
# param 2 type # param 2 type
# param 3 BO # param 3 BO
# param 4 RW # param 4 RW
# param 5 nbytes # param 5 nbytes
# param 6 nbytesButOne # param 6 nbytesButOne
$(call typesAndBits,$1,$2,$3) $(call typesAndBits,$1,$2,$3)
$(call fixRw,$1,$4) $(call fixRw,$1,$4)
$1_nbytes := $5 $1_nbytes := $5
$1_nbytesButOne := $6 $1_nbytesButOne := $6
$1_CMD := $(TOOL_SPP) \ $1_CMD := $(TOOL_SPP) \
-Dtype=$$($1_type) \ -Dtype=$$($1_type) \
-DType=$$($1_Type) \ -DType=$$($1_Type) \
-Dfulltype=$$($1_fulltype) \ -Dfulltype=$$($1_fulltype) \
-Dmemtype=$$($1_memtype) \ -Dmemtype=$$($1_memtype) \
-DMemtype=$$($1_Memtype) \ -DMemtype=$$($1_Memtype) \
-DfromBits=$$($1_fromBits) \ -DfromBits=$$($1_fromBits) \
-DtoBits=$$($1_toBits) \ -DtoBits=$$($1_toBits) \
-DLG_BYTES_PER_VALUE=$$($1_LBPV) \ -DLG_BYTES_PER_VALUE=$$($1_LBPV) \
-DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \ -DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \
-Dnbytes=$$($1_nbytes) \ -Dnbytes=$$($1_nbytes) \
-DnbytesButOne=$$($1_nbytesButOne) \ -DnbytesButOne=$$($1_nbytesButOne) \
-DRW=$$($1_RW) \ -DRW=$$($1_RW) \
-K$$($1_rwkey) \ -K$$($1_rwkey) \
-Da=$$($1_a) \ -Da=$$($1_a) \
-be -be
endef endef
define SetupGenBuffer define SetupGenBuffer
# param 1 is for output file # param 1 is for output file
# param 2 is template dependency # param 2 is template dependency
# param 3-9 are named args. # param 3-9 are named args.
# type := # type :=
# BIN := # BIN :=
# RW := Mutability (R)ead-only (W)ritable # RW := Mutability (R)ead-only (W)ritable
# BO := (U)nswapped/(S)wapped/(L)ittle/(B)ig # BO := (U)nswapped/(S)wapped/(L)ittle/(B)ig
# #
$(if $3,$1_$(strip $3)) $(if $3,$1_$(strip $3))
$(if $4,$1_$(strip $4)) $(if $4,$1_$(strip $4))
$(if $5,$1_$(strip $5)) $(if $5,$1_$(strip $5))
$(if $6,$1_$(strip $6)) $(if $6,$1_$(strip $6))
$(if $7,$1_$(strip $7)) $(if $7,$1_$(strip $7))
$(if $8,$1_$(strip $8)) $(if $8,$1_$(strip $8))
$(if $9,$1_$(strip $9)) $(if $9,$1_$(strip $9))
$(if $(10),$1_$(strip $(10))) $(if $(10),$1_$(strip $(10)))
$(if $(11),$1_$(strip $(11))) $(if $(11),$1_$(strip $(11)))
$(if $(12),$1_$(strip $(12))) $(if $(12),$1_$(strip $(12)))
$(if $(13),$1_$(strip $(13))) $(if $(13),$1_$(strip $(13)))
$(if $(14),$1_$(strip $(14))) $(if $(14),$1_$(strip $(14)))
$(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15,$(if $($i),$1_$(strip $($i)))$(NEWLINE)) $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15,$(if $($i),$1_$(strip $($i)))$(NEWLINE))
$(call LogSetupMacroEntry,SetupGenBuffer($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) $(call LogSetupMacroEntry,SetupGenBuffer($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
$(if $(16),$(error Internal makefile error: Too many arguments to SetupGenBuffer, please update GensrcBuffer.gmk)) $(if $(16),$(error Internal makefile error: Too many arguments to SetupGenBuffer, please update GensrcBuffer.gmk))
$(call fixRw,$1,$$($1_RW)) $(call fixRw,$1,$$($1_RW))
$(call typesAndBits,$1,$$($1_type),$$($1_BO)) $(call typesAndBits,$1,$$($1_type),$$($1_BO))
$1_DST := $(GENSRC_BUFFER_DST)/$1.java $1_DST := $(GENSRC_BUFFER_DST)/$1.java
$1_SRC := $(GENSRC_BUFFER_SRC)/$(strip $2).java.template $1_SRC := $(GENSRC_BUFFER_SRC)/$(strip $2).java.template
$1_SRC_BIN := $(GENSRC_BUFFER_SRC)/$(strip $2)-bin.java.template $1_SRC_BIN := $(GENSRC_BUFFER_SRC)/$(strip $2)-bin.java.template
$1_DEP := $$($1_SRC) $1_DEP := $$($1_SRC)
ifneq ($$($1_BIN),1) ifneq ($$($1_BIN), 1)
$1_DEP := $$($1_SRC) $1_DEP := $$($1_SRC)
$1_OUT := $$($1_DST) $1_OUT := $$($1_DST)
else else
$1_DEP += $$($1_SRC) $$($1_SRC_BIN) $1_DEP += $$($1_SRC) $$($1_SRC_BIN)
$1_OUT := $(GENSRC_BUFFER_DST)/$1.binop.0.java $1_OUT := $(GENSRC_BUFFER_DST)/$1.binop.0.java
endif endif
ifeq ($$($1_BIN),1) ifeq ($$($1_BIN), 1)
$(call genBinOps,$1_char,char,$$($1_BO),$$($1_RW),two,one) $(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_short,short,$$($1_BO),$$($1_RW),two,one)
$(call genBinOps,$1_int,int,$$($1_BO),$$($1_RW),four,three) $(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_long,long,$$($1_BO),$$($1_RW),eight,seven)
$(call genBinOps,$1_float,float,$$($1_BO),$$($1_RW),four,three) $(call genBinOps,$1_float,float,$$($1_BO),$$($1_RW),four,three)
$(call genBinOps,$1_double,double,$$($1_BO),$$($1_RW),eight,seven) $(call genBinOps,$1_double,double,$$($1_BO),$$($1_RW),eight,seven)
endif endif
$$($1_DST) : $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.buffer.dir $$($1_DST): $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.buffer.dir
$(TOOL_SPP) < $$($1_SRC) > $$($1_OUT).tmp \ $(TOOL_SPP) < $$($1_SRC) > $$($1_OUT).tmp \
-K$$($1_type) \ -K$$($1_type) \
-K$$($1_category) \ -K$$($1_category) \
-K$$($1_streams) \ -K$$($1_streams) \
-Dtype=$$($1_type) \ -Dtype=$$($1_type) \
-DType=$$($1_Type) \ -DType=$$($1_Type) \
-Dfulltype=$$($1_fulltype) \ -Dfulltype=$$($1_fulltype) \
-DFulltype=$$($1_Fulltype) \ -DFulltype=$$($1_Fulltype) \
-Dstreamtype=$$($1_streamtype) \ -Dstreamtype=$$($1_streamtype) \
-DStreamtype=$$($1_Streamtype) \ -DStreamtype=$$($1_Streamtype) \
-Dx=$$($1_x) \ -Dx=$$($1_x) \
-Dmemtype=$$($1_memtype) \ -Dmemtype=$$($1_memtype) \
-DMemtype=$$($1_Memtype) \ -DMemtype=$$($1_Memtype) \
-DSwaptype=$$($1_Swaptype) \ -DSwaptype=$$($1_Swaptype) \
-DfromBits=$$($1_fromBits) \ -DfromBits=$$($1_fromBits) \
-DtoBits=$$($1_toBits) \ -DtoBits=$$($1_toBits) \
-DLG_BYTES_PER_VALUE=$$($1_LBPV) \ -DLG_BYTES_PER_VALUE=$$($1_LBPV) \
-DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \ -DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \
-DBO=$$($1_BO) \ -DBO=$$($1_BO) \
-Dswap=$$($1_swap) \ -Dswap=$$($1_swap) \
-DRW=$$($1_RW) \ -DRW=$$($1_RW) \
-K$$($1_rwkey) \ -K$$($1_rwkey) \
-Da=$$($1_a) \ -Da=$$($1_a) \
-DA=$$($1_A) \ -DA=$$($1_A) \
-Kbo$$($1_BO) -Kbo$$($1_BO)
$(MV) $$($1_OUT).tmp $$($1_OUT) $(MV) $$($1_OUT).tmp $$($1_OUT)
# Do the extra bin thing # Do the extra bin thing
ifeq ($$($1_BIN),1) ifeq ($$($1_BIN), 1)
$(SED) -e '/#BIN/,$$$$d' < $$($1_OUT) > $$($1_DST).tmp $(SED) -e '/#BIN/,$$$$d' < $$($1_OUT) > $$($1_DST).tmp
$(RM) $$($1_OUT) $(RM) $$($1_OUT)
$$($1_char_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp $$($1_char_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
$$($1_short_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp $$($1_short_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
$$($1_int_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp $$($1_int_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
$$($1_long_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp $$($1_long_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
$$($1_float_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp $$($1_float_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
$$($1_double_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp $$($1_double_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
$(PRINTF) "}\n" >> $$($1_DST).tmp $(PRINTF) "}\n" >> $$($1_DST).tmp
mv $$($1_DST).tmp $$($1_DST) mv $$($1_DST).tmp $$($1_DST)
endif endif
GENSRC_BUFFER += $$($1_DST) GENSRC_BUFFER += $$($1_DST)
endef endef
### ###
X_BUF :=X-Buffer X_BUF := X-Buffer
$(eval $(call SetupGenBuffer,ByteBuffer, $(X_BUF),type:=byte,BIN:=1)) $(eval $(call SetupGenBuffer,ByteBuffer, $(X_BUF), type:=byte, BIN:=1))
$(eval $(call SetupGenBuffer,CharBuffer, $(X_BUF),type:=char)) $(eval $(call SetupGenBuffer,CharBuffer, $(X_BUF), type:=char))
$(eval $(call SetupGenBuffer,ShortBuffer, $(X_BUF),type:=short)) $(eval $(call SetupGenBuffer,ShortBuffer, $(X_BUF), type:=short))
$(eval $(call SetupGenBuffer,IntBuffer, $(X_BUF),type:=int)) $(eval $(call SetupGenBuffer,IntBuffer, $(X_BUF), type:=int))
$(eval $(call SetupGenBuffer,LongBuffer, $(X_BUF),type:=long)) $(eval $(call SetupGenBuffer,LongBuffer, $(X_BUF), type:=long))
$(eval $(call SetupGenBuffer,FloatBuffer, $(X_BUF),type:=float)) $(eval $(call SetupGenBuffer,FloatBuffer, $(X_BUF), type:=float))
$(eval $(call SetupGenBuffer,DoubleBuffer,$(X_BUF),type:=double)) $(eval $(call SetupGenBuffer,DoubleBuffer,$(X_BUF), type:=double))
# Buffers whose contents are heap-allocated # Buffers whose contents are heap-allocated
# #
HEAP_X_BUF := Heap-X-Buffer HEAP_X_BUF := Heap-X-Buffer
$(eval $(call SetupGenBuffer,HeapByteBuffer, $(HEAP_X_BUF),type:=byte)) $(eval $(call SetupGenBuffer,HeapByteBuffer, $(HEAP_X_BUF), type:=byte))
$(eval $(call SetupGenBuffer,HeapByteBufferR, $(HEAP_X_BUF),type:=byte,RW:=R)) $(eval $(call SetupGenBuffer,HeapByteBufferR, $(HEAP_X_BUF), type:=byte, RW:=R))
$(eval $(call SetupGenBuffer,HeapCharBuffer, $(HEAP_X_BUF),type:=char)) $(eval $(call SetupGenBuffer,HeapCharBuffer, $(HEAP_X_BUF), type:=char))
$(eval $(call SetupGenBuffer,HeapCharBufferR, $(HEAP_X_BUF),type:=char,RW:=R)) $(eval $(call SetupGenBuffer,HeapCharBufferR, $(HEAP_X_BUF), type:=char, RW:=R))
$(eval $(call SetupGenBuffer,HeapShortBuffer, $(HEAP_X_BUF),type:=short)) $(eval $(call SetupGenBuffer,HeapShortBuffer, $(HEAP_X_BUF), type:=short))
$(eval $(call SetupGenBuffer,HeapShortBufferR, $(HEAP_X_BUF),type:=short,RW:=R)) $(eval $(call SetupGenBuffer,HeapShortBufferR, $(HEAP_X_BUF), type:=short, RW:=R))
$(eval $(call SetupGenBuffer,HeapIntBuffer, $(HEAP_X_BUF),type:=int)) $(eval $(call SetupGenBuffer,HeapIntBuffer, $(HEAP_X_BUF), type:=int))
$(eval $(call SetupGenBuffer,HeapIntBufferR, $(HEAP_X_BUF),type:=int,RW:=R)) $(eval $(call SetupGenBuffer,HeapIntBufferR, $(HEAP_X_BUF), type:=int, RW:=R))
$(eval $(call SetupGenBuffer,HeapLongBuffer, $(HEAP_X_BUF),type:=long)) $(eval $(call SetupGenBuffer,HeapLongBuffer, $(HEAP_X_BUF), type:=long))
$(eval $(call SetupGenBuffer,HeapLongBufferR, $(HEAP_X_BUF),type:=long,RW:=R)) $(eval $(call SetupGenBuffer,HeapLongBufferR, $(HEAP_X_BUF), type:=long, RW:=R))
$(eval $(call SetupGenBuffer,HeapFloatBuffer, $(HEAP_X_BUF),type:=float)) $(eval $(call SetupGenBuffer,HeapFloatBuffer, $(HEAP_X_BUF), type:=float))
$(eval $(call SetupGenBuffer,HeapFloatBufferR, $(HEAP_X_BUF),type:=float,RW:=R)) $(eval $(call SetupGenBuffer,HeapFloatBufferR, $(HEAP_X_BUF), type:=float, RW:=R))
$(eval $(call SetupGenBuffer,HeapDoubleBuffer, $(HEAP_X_BUF),type:=double)) $(eval $(call SetupGenBuffer,HeapDoubleBuffer, $(HEAP_X_BUF), type:=double))
$(eval $(call SetupGenBuffer,HeapDoubleBufferR,$(HEAP_X_BUF),type:=double,RW:=R)) $(eval $(call SetupGenBuffer,HeapDoubleBufferR,$(HEAP_X_BUF), type:=double, RW:=R))
# Direct byte buffer # Direct byte buffer
# #
DIRECT_X_BUF := Direct-X-Buffer DIRECT_X_BUF := Direct-X-Buffer
$(eval $(call SetupGenBuffer,DirectByteBuffer, $(DIRECT_X_BUF),type:=byte,BIN:=1)) $(eval $(call SetupGenBuffer,DirectByteBuffer, $(DIRECT_X_BUF), type:=byte, BIN:=1))
$(eval $(call SetupGenBuffer,DirectByteBufferR,$(DIRECT_X_BUF),type:=byte,BIN:=1,RW:=R)) $(eval $(call SetupGenBuffer,DirectByteBufferR,$(DIRECT_X_BUF), type:=byte, BIN:=1, RW:=R))
# Unswapped views of direct byte buffers # Unswapped views of direct byte buffers
# #
$(eval $(call SetupGenBuffer,DirectCharBufferU, $(DIRECT_X_BUF),type:=char,BO:=U)) $(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,DirectCharBufferRU, $(DIRECT_X_BUF), type:=char, RW:=R, BO:=U))
$(eval $(call SetupGenBuffer,DirectShortBufferU, $(DIRECT_X_BUF),type:=short,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,DirectShortBufferRU, $(DIRECT_X_BUF), type:=short, RW:=R, BO:=U))
$(eval $(call SetupGenBuffer,DirectIntBufferU, $(DIRECT_X_BUF),type:=int,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,DirectIntBufferRU, $(DIRECT_X_BUF), type:=int, RW:=R, BO:=U))
$(eval $(call SetupGenBuffer,DirectLongBufferU, $(DIRECT_X_BUF),type:=long,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,DirectLongBufferRU, $(DIRECT_X_BUF), type:=long, RW:=R, BO:=U))
$(eval $(call SetupGenBuffer,DirectFloatBufferU, $(DIRECT_X_BUF),type:=float,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,DirectFloatBufferRU, $(DIRECT_X_BUF), type:=float, RW:=R, BO:=U))
$(eval $(call SetupGenBuffer,DirectDoubleBufferU, $(DIRECT_X_BUF),type:=double,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)) $(eval $(call SetupGenBuffer,DirectDoubleBufferRU,$(DIRECT_X_BUF), type:=double, RW:=R, BO:=U))
# Swapped views of direct byte buffers # Swapped views of direct byte buffers
# #
$(eval $(call SetupGenBuffer,DirectCharBufferS, $(DIRECT_X_BUF),type:=char,BO:=S)) $(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,DirectCharBufferRS, $(DIRECT_X_BUF), type:=char, RW:=R, BO:=S))
$(eval $(call SetupGenBuffer,DirectShortBufferS, $(DIRECT_X_BUF),type:=short,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,DirectShortBufferRS, $(DIRECT_X_BUF), type:=short, RW:=R, BO:=S))
$(eval $(call SetupGenBuffer,DirectIntBufferS, $(DIRECT_X_BUF),type:=int,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,DirectIntBufferRS, $(DIRECT_X_BUF), type:=int, RW:=R, BO:=S))
$(eval $(call SetupGenBuffer,DirectLongBufferS, $(DIRECT_X_BUF),type:=long,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,DirectLongBufferRS, $(DIRECT_X_BUF), type:=long, RW:=R, BO:=S))
$(eval $(call SetupGenBuffer,DirectFloatBufferS, $(DIRECT_X_BUF),type:=float,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,DirectFloatBufferRS, $(DIRECT_X_BUF), type:=float, RW:=R, BO:=S))
$(eval $(call SetupGenBuffer,DirectDoubleBufferS, $(DIRECT_X_BUF),type:=double,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)) $(eval $(call SetupGenBuffer,DirectDoubleBufferRS,$(DIRECT_X_BUF), type:=double, RW:=R, BO:=S))
# Big-endian views of byte buffers # Big-endian views of byte buffers
# #
BYTE_X_BUF := ByteBufferAs-X-Buffer BYTE_X_BUF := ByteBufferAs-X-Buffer
$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferB, $(BYTE_X_BUF),type:=char,BO:=B)) $(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,ByteBufferAsCharBufferRB, $(BYTE_X_BUF), type:=char, RW:=R, BO:=B))
$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferB, $(BYTE_X_BUF),type:=short,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,ByteBufferAsShortBufferRB, $(BYTE_X_BUF), type:=short, RW:=R, BO:=B))
$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferB, $(BYTE_X_BUF),type:=int,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,ByteBufferAsIntBufferRB, $(BYTE_X_BUF), type:=int, RW:=R, BO:=B))
$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferB, $(BYTE_X_BUF),type:=long,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,ByteBufferAsLongBufferRB, $(BYTE_X_BUF), type:=long, RW:=R, BO:=B))
$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferB, $(BYTE_X_BUF),type:=float,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,ByteBufferAsFloatBufferRB, $(BYTE_X_BUF), type:=float, RW:=R, BO:=B))
$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferB, $(BYTE_X_BUF),type:=double,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)) $(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRB,$(BYTE_X_BUF), type:=double, RW:=R, BO:=B))
# Little-endian views of byte buffers # Little-endian views of byte buffers
# #
$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferL, $(BYTE_X_BUF),type:=char,BO:=L)) $(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,ByteBufferAsCharBufferRL, $(BYTE_X_BUF), type:=char, RW:=R, BO:=L))
$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferL, $(BYTE_X_BUF),type:=short,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,ByteBufferAsShortBufferRL, $(BYTE_X_BUF), type:=short, RW:=R, BO:=L))
$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferL, $(BYTE_X_BUF),type:=int,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,ByteBufferAsIntBufferRL, $(BYTE_X_BUF), type:=int, RW:=R, BO:=L))
$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferL, $(BYTE_X_BUF),type:=long,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,ByteBufferAsLongBufferRL, $(BYTE_X_BUF), type:=long, RW:=R, BO:=L))
$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferL, $(BYTE_X_BUF),type:=float,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,ByteBufferAsFloatBufferRL, $(BYTE_X_BUF), type:=float, RW:=R, BO:=L))
$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferL, $(BYTE_X_BUF),type:=double,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)) $(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRL,$(BYTE_X_BUF), type:=double, RW:=R, BO:=L))
### ###
$(GENSRC_BUFFER) : $(BUILD_TOOLS) $(GENSRC_BUFFER): $(BUILD_TOOLS)
makefiles/GensrcCLDR.gmk → makefiles/gensrc/GensrcCLDR.gmk
浏览文件 @ e864d64d
...@@ -31,8 +31,8 @@ GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc ...@@ -31,8 +31,8 @@ GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc
CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/cldr/CLDRLocaleDataMetaInfo.java CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/cldr/CLDRLocaleDataMetaInfo.java
$(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \ $(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
$(wildcard $(CLDRSRCDIR)/common/main/*.xml) \ $(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
$(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml) $(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -o $(GENSRC_DIR) $(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -o $(GENSRC_DIR)
......
makefiles/GensrcCharacterData.gmk → makefiles/gensrc/GensrcCharacterData.gmk
浏览文件 @ e864d64d
...@@ -24,41 +24,41 @@ ...@@ -24,41 +24,41 @@
# #
# #
# Rules to create $(JDK_OUTPUTDIR)/gensrc/sun/lang/CharacterData*.java # Rules to create $(JDK_OUTPUTDIR)/gensrc/sun/lang/CharacterData*.java
# #
GENSRC_CHARACTERDATA:= GENSRC_CHARACTERDATA :=
CHARACTERDATA = $(JDK_TOPDIR)/make/tools/GenerateCharacter CHARACTERDATA = $(JDK_TOPDIR)/make/tools/GenerateCharacter
UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData
define SetupCharacterData define SetupCharacterData
$(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java : $(CHARACTERDATA)/$1.java.template $(BUILD_TOOLS) $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java: $(CHARACTERDATA)/$1.java.template $(BUILD_TOOLS)
$(MKDIR) -p $$(@D) $(MKDIR) -p $$(@D)
$(ECHO) $(LOG_INFO) Generating $1.java $(ECHO) $(LOG_INFO) Generating $1.java
$(TOOL_GENERATECHARACTER) $2 \ $(TOOL_GENERATECHARACTER) $2 \
-template $(CHARACTERDATA)/$1.java.template \ -template $(CHARACTERDATA)/$1.java.template \
-spec $(UNICODEDATA)/UnicodeData.txt \ -spec $(UNICODEDATA)/UnicodeData.txt \
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \ -specialcasing $(UNICODEDATA)/SpecialCasing.txt \
-proplist $(UNICODEDATA)/PropList.txt \ -proplist $(UNICODEDATA)/PropList.txt \
-o $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java -string \ -o $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java -string \
-usecharforbyte $3 -usecharforbyte $3
GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java
endef endef
$(eval $(call SetupCharacterData,CharacterDataLatin1,,-latin1 8)) $(eval $(call SetupCharacterData,CharacterDataLatin1, , -latin1 8))
$(eval $(call SetupCharacterData,CharacterData00,-plane 0,11 4 1)) $(eval $(call SetupCharacterData,CharacterData00, -plane 0, 11 4 1))
$(eval $(call SetupCharacterData,CharacterData01,-plane 1,11 4 1)) $(eval $(call SetupCharacterData,CharacterData01, -plane 1, 11 4 1))
$(eval $(call SetupCharacterData,CharacterData02,-plane 2,11 4 1)) $(eval $(call SetupCharacterData,CharacterData02, -plane 2, 11 4 1))
$(eval $(call SetupCharacterData,CharacterData0E,-plane 14,11 4 1)) $(eval $(call SetupCharacterData,CharacterData0E, -plane 14, 11 4 1))
# Copy two Java files that need no preprocessing. # Copy two Java files that need no preprocessing.
$(JDK_OUTPUTDIR)/gensrc/java/lang/%.java : $(CHARACTERDATA)/%.java.template $(JDK_OUTPUTDIR)/gensrc/java/lang/%.java: $(CHARACTERDATA)/%.java.template
$(ECHO) $(LOG_INFO) Generating $(@F) $(ECHO) $(LOG_INFO) Generating $(@F)
$(call install-file) $(call install-file)
GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/CharacterDataUndefined.java \ GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/CharacterDataUndefined.java \
$(JDK_OUTPUTDIR)/gensrc/java/lang/CharacterDataPrivateUse.java $(JDK_OUTPUTDIR)/gensrc/java/lang/CharacterDataPrivateUse.java
$(GENSRC_CHARACTERDATA) : $(BUILD_TOOLS) $(GENSRC_CHARACTERDATA): $(BUILD_TOOLS)
makefiles/GensrcCharsetCoder.gmk → makefiles/gensrc/GensrcCharsetCoder.gmk
浏览文件 @ e864d64d
...@@ -34,74 +34,74 @@ GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Cod ...@@ -34,74 +34,74 @@ GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Cod
### ###
$(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java : $(GENSRC_CHARSETCODER_TEMPLATE) $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java: $(GENSRC_CHARSETCODER_TEMPLATE)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
-$(RM) $@.tmp -$(RM) $@.tmp
$(TOOL_SPP) < $< >$@.tmp \ $(TOOL_SPP) < $< >$@.tmp \
-Kdecoder \ -Kdecoder \
-DA='A' \ -DA='A' \
-Da='a' \ -Da='a' \
-DCode='Decode' \ -DCode='Decode' \
-Dcode='decode' \ -Dcode='decode' \
-DitypesPhrase='bytes in a specific charset' \ -DitypesPhrase='bytes in a specific charset' \
-DotypesPhrase='sixteen-bit Unicode characters' \ -DotypesPhrase='sixteen-bit Unicode characters' \
-Ditype='byte' \ -Ditype='byte' \
-Dotype='character' \ -Dotype='character' \
-DItype='Byte' \ -DItype='Byte' \
-DOtype='Char' \ -DOtype='Char' \
-Dcoder='decoder' \ -Dcoder='decoder' \
-DCoder='Decoder' \ -DCoder='Decoder' \
-Dcoding='decoding' \ -Dcoding='decoding' \
-DOtherCoder='Encoder' \ -DOtherCoder='Encoder' \
-DreplTypeName='string' \ -DreplTypeName='string' \
-DdefaultRepl='"\\uFFFD"' \ -DdefaultRepl='"\\uFFFD"' \
-DdefaultReplName='<tt>"\&#92;uFFFD"<\/tt>' \ -DdefaultReplName='<tt>"\&#92;uFFFD"<\/tt>' \
-DreplType='String' \ -DreplType='String' \
-DreplFQType='java.lang.String' \ -DreplFQType='java.lang.String' \
-DreplLength='length()' \ -DreplLength='length()' \
-DItypesPerOtype='CharsPerByte' \ -DItypesPerOtype='CharsPerByte' \
-DnotLegal='not legal for this charset' \ -DnotLegal='not legal for this charset' \
-Dotypes-per-itype='chars-per-byte' \ -Dotypes-per-itype='chars-per-byte' \
-DoutSequence='Unicode character' -DoutSequence='Unicode character'
$(MV) $@.tmp $@ $(MV) $@.tmp $@
GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java
### ###
$(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java : $(GENSRC_CHARSETCODER_TEMPLATE) $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java: $(GENSRC_CHARSETCODER_TEMPLATE)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
-$(RM) $@.tmp -$(RM) $@.tmp
$(TOOL_SPP) < $< >$@.tmp \ $(TOOL_SPP) < $< >$@.tmp \
-Kencoder \ -Kencoder \
-DA='An' \ -DA='An' \
-Da='an' \ -Da='an' \
-DCode='Encode' \ -DCode='Encode' \
-Dcode='encode' \ -Dcode='encode' \
-DitypesPhrase='sixteen-bit Unicode characters' \ -DitypesPhrase='sixteen-bit Unicode characters' \
-DotypesPhrase='bytes in a specific charset' \ -DotypesPhrase='bytes in a specific charset' \
-Ditype='character' \ -Ditype='character' \
-Dotype='byte' \ -Dotype='byte' \
-DItype='Char' \ -DItype='Char' \
-DOtype='Byte' \ -DOtype='Byte' \
-Dcoder='encoder' \ -Dcoder='encoder' \
-DCoder='Encoder' \ -DCoder='Encoder' \
-Dcoding='encoding' \ -Dcoding='encoding' \
-DOtherCoder='Decoder' \ -DOtherCoder='Decoder' \
-DreplTypeName='byte array' \ -DreplTypeName='byte array' \
-DdefaultRepl='new byte[] { (byte)'"'"\\?"'"' }' \ -DdefaultRepl='new byte[] { (byte)'"'"\\?"'"' }' \
-DdefaultReplName='<tt>{<\/tt>\&nbsp;<tt>(byte)'"'"\\?"'"'<\/tt>\&nbsp;<tt>}<\/tt>' \ -DdefaultReplName='<tt>{<\/tt>\&nbsp;<tt>(byte)'"'"\\?"'"'<\/tt>\&nbsp;<tt>}<\/tt>' \
-DreplType='byte[]' \ -DreplType='byte[]' \
-DreplFQType='byte[]' \ -DreplFQType='byte[]' \
-DreplLength='length' \ -DreplLength='length' \
-DItypesPerOtype='BytesPerChar' \ -DItypesPerOtype='BytesPerChar' \
-DnotLegal='not a legal sixteen-bit Unicode sequence' \ -DnotLegal='not a legal sixteen-bit Unicode sequence' \
-Dotypes-per-itype='bytes-per-char' \ -Dotypes-per-itype='bytes-per-char' \
-DoutSequence='byte sequence in the given charset' -DoutSequence='byte sequence in the given charset'
$(MV) $@.tmp $@ $(MV) $@.tmp $@
GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java
### ###
$(GENSRC_CHARSETCODER) : $(BUILD_TOOLS) $(GENSRC_CHARSETCODER): $(BUILD_TOOLS)
makefiles/GensrcCharsetMapping.gmk → makefiles/gensrc/GensrcCharsetMapping.gmk
浏览文件 @ e864d64d
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# questions. # questions.
# #
GENSRC_CHARSETMAPPING:= GENSRC_CHARSETMAPPING :=
GENSRC_TMP := $(JDK_OUTPUTDIR)/gensrc GENSRC_TMP := $(JDK_OUTPUTDIR)/gensrc
GENSRC_DST := $(JDK_OUTPUTDIR)/gensrc/sun/nio/cs GENSRC_DST := $(JDK_OUTPUTDIR)/gensrc/sun/nio/cs
...@@ -35,7 +35,7 @@ GENSRC_TEMPLATES := $(GENSRC_SRC)/SingleByte-X.java.template $(GENSRC_SRC)/Doubl ...@@ -35,7 +35,7 @@ GENSRC_TEMPLATES := $(GENSRC_SRC)/SingleByte-X.java.template $(GENSRC_SRC)/Doubl
### ###
$(GENSRC_TMP)/_the.charsetmapping.dir : $(GENSRC_TMP)/_the.charsetmapping.dir:
$(ECHO) Generating charsetmapping classes $(ECHO) Generating charsetmapping classes
$(MKDIR) -p $(GENSRC_DST)/ext $(MKDIR) -p $(GENSRC_DST)/ext
$(TOUCH) $@ $(TOUCH) $@
...@@ -44,7 +44,7 @@ $(GENSRC_TMP)/_the.charsetmapping.dir : ...@@ -44,7 +44,7 @@ $(GENSRC_TMP)/_the.charsetmapping.dir :
GENSRC_SB := $(GENSRC_TMP)/_the.charsetmapping.sbcs GENSRC_SB := $(GENSRC_TMP)/_the.charsetmapping.sbcs
$(GENSRC_SB) : $(GENSRC_SRC)/sbcs $(GENSRC_TEMPLATES) $(GENSRC_TMP)/_the.charsetmapping.dir $(GENSRC_SB): $(GENSRC_SRC)/sbcs $(GENSRC_TEMPLATES) $(GENSRC_TMP)/_the.charsetmapping.dir
$(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_SRC) $(GENSRC_DST) sbcs $(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_SRC) $(GENSRC_DST) sbcs
$(TOUCH) $@ $(TOUCH) $@
...@@ -52,28 +52,28 @@ GENSRC_CHARSETMAPPING += $(GENSRC_SB) ...@@ -52,28 +52,28 @@ GENSRC_CHARSETMAPPING += $(GENSRC_SB)
### ###
$(GENSRC_DST)/ext/sjis0213.dat : $(GENSRC_SRC)/sjis0213.map $(GENSRC_SB) $(GENSRC_DST)/ext/sjis0213.dat: $(GENSRC_SRC)/sjis0213.map $(GENSRC_SB)
$(TOOL_CHARSETMAPPING) $(LOG_INFO) $< $@ sjis0213 $(TOOL_CHARSETMAPPING) $(LOG_INFO) $< $@ sjis0213
GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/sjis0213.dat GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/sjis0213.dat
### ###
$(GENSRC_DST)/ext/EUC_TWMapping.java : $(GENSRC_JAVA_SRC)/EUC_TW.java $(GENSRC_SB) $(GENSRC_DST)/ext/EUC_TWMapping.java: $(GENSRC_JAVA_SRC)/EUC_TW.java $(GENSRC_SB)
$(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_SRC) $(GENSRC_DST)/ext euctw $(GENSRC_JAVA_SRC)/EUC_TW.java $(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_SRC) $(GENSRC_DST)/ext euctw $(GENSRC_JAVA_SRC)/EUC_TW.java
GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/EUC_TWMapping.java GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/EUC_TWMapping.java
### ###
$(GENSRC_DST)/ext/HKSCSMapping.java : $(GENSRC_JAVA_SRC)/HKSCS.java $(GENSRC_SB) $(GENSRC_DST)/ext/HKSCSMapping.java: $(GENSRC_JAVA_SRC)/HKSCS.java $(GENSRC_SB)
$(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_SRC) $(GENSRC_DST)/ext hkscs $(GENSRC_JAVA_SRC)/HKSCS.java $(TOOL_CHARSETMAPPING) $(LOG_INFO) $(GENSRC_SRC) $(GENSRC_DST)/ext hkscs $(GENSRC_JAVA_SRC)/HKSCS.java
GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/HKSCSMapping.java GENSRC_CHARSETMAPPING += $(GENSRC_DST)/ext/HKSCSMapping.java
### ###
$(GENSRC_TMP)/gensrc_the.charsetmapping.extsbcs : $(GENSRC_SRC)/extsbcs $(GENSRC_TEMPLATES) $(GENSRC_SB) $(GENSRC_TMP)/gensrc_the.charsetmapping.extsbcs: $(GENSRC_SRC)/extsbcs $(GENSRC_TEMPLATES) $(GENSRC_SB)
$(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(LOG_INFO) $(GENSRC_DST)/ext extsbcs $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(LOG_INFO) $(GENSRC_DST)/ext extsbcs
$(TOUCH) $@ $(TOUCH) $@
...@@ -81,7 +81,7 @@ GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.extsbcs ...@@ -81,7 +81,7 @@ GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.extsbcs
### ###
$(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs : $(GENSRC_SRC)/dbcs $(GENSRC_TEMPLATES) $(GENSRC_SB) $(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs: $(GENSRC_SRC)/dbcs $(GENSRC_TEMPLATES) $(GENSRC_SB)
$(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(LOG_INFO) $(GENSRC_DST)/ext dbcs $(TOOL_CHARSETMAPPING) $(GENSRC_SRC) $(LOG_INFO) $(GENSRC_DST)/ext dbcs
$(TOUCH) $@ $(TOUCH) $@
...@@ -91,15 +91,14 @@ GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs ...@@ -91,15 +91,14 @@ GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs
GENSRC_CHARSET_PROVIDER_CMD := $(JDK_TOPDIR)/makefiles/scripts/genCharsetProvider.sh 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_DST)/StandardCharsets.java: $(JDK_TOPDIR)/src/share/classes/sun/nio/cs/standard-charsets \
$(GENSRC_CHARSET_PROVIDER_CMD) \ $(GENSRC_CHARSET_PROVIDER_CMD) \
$(GENSRC_TMP)/_the.charsetmapping.dir $(GENSRC_TMP)/_the.charsetmapping.dir
NAWK="$(NAWK)" TEMPDIR="$(GENSRC_TMP)" SH="$(SH)" \ NAWK="$(NAWK)" TEMPDIR="$(GENSRC_TMP)" SH="$(SH)" \
HASHER="$(TOOL_HASHER)" \ HASHER="$(TOOL_HASHER)" \
SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" \ SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" \
$(SH) -e $(GENSRC_CHARSET_PROVIDER_CMD) $(LOG_INFO) $< $(@D) $(SH) -e $(GENSRC_CHARSET_PROVIDER_CMD) $(LOG_INFO) $< $(@D)
GENSRC_CHARSETMAPPING += $(GENSRC_DST)/StandardCharsets.java GENSRC_CHARSETMAPPING += $(GENSRC_DST)/StandardCharsets.java
$(GENSRC_CHARSETMAPPING) : $(BUILD_TOOLS) $(GENSRC_CHARSETMAPPING): $(BUILD_TOOLS)
makefiles/GensrcExceptions.gmk → makefiles/gensrc/GensrcExceptions.gmk
浏览文件 @ e864d64d
...@@ -31,11 +31,11 @@ GENSRC_EXCEPTIONS_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio ...@@ -31,11 +31,11 @@ GENSRC_EXCEPTIONS_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio
GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio
GENSRC_EXCEPTIONS_CMD := $(JDK_TOPDIR)/makefiles/scripts/genExceptions.sh GENSRC_EXCEPTIONS_CMD := $(JDK_TOPDIR)/makefiles/scripts/genExceptions.sh
GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels
### ###
$(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir : $(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir:
$(ECHO) "Generating exceptions classes" $(ECHO) "Generating exceptions classes"
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(TOUCH) $@ $(TOUCH) $@
...@@ -43,13 +43,13 @@ $(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir : ...@@ -43,13 +43,13 @@ $(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir :
### ###
$(GENSRC_EXCEPTIONS_DST)/_the.% : $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \ $(GENSRC_EXCEPTIONS_DST)/_the.%: $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
$(GENSRC_EXCEPTIONS_CMD) \ $(GENSRC_EXCEPTIONS_CMD) \
$(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir $(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir
$(MKDIR) -p $(@D)/$* $(MKDIR) -p $(@D)/$*
SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$* $(LOG_INFO) SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$* $(LOG_INFO)
$(TOUCH) $@ $(TOUCH) $@
GENSRC_EXCEPTIONS += $(foreach D,$(GENSRC_EXCEPTIONS_SRC_DIRS),$(GENSRC_EXCEPTIONS_DST)/_the.$(D)) GENSRC_EXCEPTIONS += $(foreach D,$(GENSRC_EXCEPTIONS_SRC_DIRS),$(GENSRC_EXCEPTIONS_DST)/_the.$(D))
$(GENSRC_EXCEPTIONS) : $(BUILD_TOOLS) $(GENSRC_EXCEPTIONS): $(BUILD_TOOLS)
makefiles/GensrcIcons.gmk → makefiles/gensrc/GensrcIcons.gmk
浏览文件 @ e864d64d
...@@ -44,18 +44,18 @@ GENSRC_AWT_ICONS_SRC += \ ...@@ -44,18 +44,18 @@ GENSRC_AWT_ICONS_SRC += \
AWT_ICONPATH := $(JDK_TOPDIR)/src/share/classes/sun/awt/resources AWT_ICONPATH := $(JDK_TOPDIR)/src/share/classes/sun/awt/resources
GENSRC_AWT_ICONS_SRC += \ GENSRC_AWT_ICONS_SRC += \
$(AWT_ICONPATH)/security-icon-bw16.png \ $(AWT_ICONPATH)/security-icon-bw16.png \
$(AWT_ICONPATH)/security-icon-interim16.png \ $(AWT_ICONPATH)/security-icon-interim16.png \
$(AWT_ICONPATH)/security-icon-yellow16.png \ $(AWT_ICONPATH)/security-icon-yellow16.png \
$(AWT_ICONPATH)/security-icon-bw24.png \ $(AWT_ICONPATH)/security-icon-bw24.png \
$(AWT_ICONPATH)/security-icon-interim24.png \ $(AWT_ICONPATH)/security-icon-interim24.png \
$(AWT_ICONPATH)/security-icon-yellow24.png \ $(AWT_ICONPATH)/security-icon-yellow24.png \
$(AWT_ICONPATH)/security-icon-bw32.png \ $(AWT_ICONPATH)/security-icon-bw32.png \
$(AWT_ICONPATH)/security-icon-interim32.png \ $(AWT_ICONPATH)/security-icon-interim32.png \
$(AWT_ICONPATH)/security-icon-yellow32.png \ $(AWT_ICONPATH)/security-icon-yellow32.png \
$(AWT_ICONPATH)/security-icon-bw48.png \ $(AWT_ICONPATH)/security-icon-bw48.png \
$(AWT_ICONPATH)/security-icon-interim48.png \ $(AWT_ICONPATH)/security-icon-interim48.png \
$(AWT_ICONPATH)/security-icon-yellow48.png $(AWT_ICONPATH)/security-icon-yellow48.png
GENSRC_AWT_ICONS_FILES := $(notdir $(GENSRC_AWT_ICONS_SRC)) GENSRC_AWT_ICONS_FILES := $(notdir $(GENSRC_AWT_ICONS_SRC))
...@@ -64,7 +64,7 @@ GENSRC_AWT_ICONS_DST_NAME = AWTIcon$(2)_$(subst .,_,$(subst -,_,$(1))) ...@@ -64,7 +64,7 @@ GENSRC_AWT_ICONS_DST_NAME = AWTIcon$(2)_$(subst .,_,$(subst -,_,$(1)))
### ###
$(GENSRC_AWT_ICONS_TMP)/_the.icons.dir : $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir:
$(ECHO) Generating icon classes $(ECHO) Generating icon classes
$(MKDIR) -p $(GENSRC_AWT_ICONS_DST) $(MKDIR) -p $(GENSRC_AWT_ICONS_DST)
$(TOUCH) $@ $(TOUCH) $@
...@@ -72,15 +72,15 @@ $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir : ...@@ -72,15 +72,15 @@ $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir :
### ###
define SetupGensrcAWTIcon define SetupGensrcAWTIcon
# param 1 is for src-file # param 1 is for src-file
# param 2 is for src-dir # param 2 is for src-dir
$1_SHORTNAME := $(call GENSRC_AWT_ICONS_SHORT_NAME,$1) $1_SHORTNAME := $(call GENSRC_AWT_ICONS_SHORT_NAME,$1)
$1_NAME32 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,32) $1_NAME32 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,32)
$1_TARGET32 := $(GENSRC_AWT_ICONS_DST)/$$($1_NAME32).java $1_TARGET32 := $(GENSRC_AWT_ICONS_DST)/$$($1_NAME32).java
$1_NAME64 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,64) $1_NAME64 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,64)
$1_TARGET64 := $(GENSRC_AWT_ICONS_DST)/$$($1_NAME64).java $1_TARGET64 := $(GENSRC_AWT_ICONS_DST)/$$($1_NAME64).java
$$($1_TARGET32) : $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir $$($1_TARGET32): $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir
$(RM) $$@ $$@.tmp $(RM) $$@ $$@.tmp
$(ECHO) "package sun.awt;" > $$@.tmp $(ECHO) "package sun.awt;" > $$@.tmp
$(ECHO) "public class $$($1_NAME32) {" >> $$@.tmp $(ECHO) "public class $$($1_NAME32) {" >> $$@.tmp
...@@ -89,9 +89,9 @@ $$($1_TARGET32) : $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir ...@@ -89,9 +89,9 @@ $$($1_TARGET32) : $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir
$(ECHO) "}; }" >> $$@.tmp $(ECHO) "}; }" >> $$@.tmp
$(MV) $$@.tmp $$@ $(MV) $$@.tmp $$@
GENSRC_AWT_ICONS += $$($1_TARGET32) GENSRC_AWT_ICONS += $$($1_TARGET32)
$$($1_TARGET64) : $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir $$($1_TARGET64): $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir
$(RM) $$@ $$@.tmp $(RM) $$@ $$@.tmp
$(ECHO) "package sun.awt;" > $$@.tmp $(ECHO) "package sun.awt;" > $$@.tmp
$(ECHO) "public class $$($1_NAME64) {" >> $$@.tmp $(ECHO) "public class $$($1_NAME64) {" >> $$@.tmp
...@@ -100,18 +100,18 @@ $$($1_TARGET64) : $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir ...@@ -100,18 +100,18 @@ $$($1_TARGET64) : $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir
$(ECHO) "}; }" >> $$@.tmp $(ECHO) "}; }" >> $$@.tmp
$(MV) $$@.tmp $$@ $(MV) $$@.tmp $$@
GENSRC_AWT_ICONS += $$($1_TARGET64) GENSRC_AWT_ICONS += $$($1_TARGET64)
endef endef
$(foreach I,$(GENSRC_AWT_ICONS_SRC), $(eval $(call SetupGensrcAWTIcon,$(notdir $(I)),$(dir $(I))))) $(foreach I, $(GENSRC_AWT_ICONS_SRC), $(eval $(call SetupGensrcAWTIcon,$(notdir $(I)),$(dir $(I)))))
### ###
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
GENSRC_OSX_ICONS_TMP := $(JDK_OUTPUTDIR)/gensrc GENSRC_OSX_ICONS_TMP := $(JDK_OUTPUTDIR)/gensrc
GENSRC_OSX_ICONS_DST := $(GENSRC_OSX_ICONS_TMP)/sun/osxapp GENSRC_OSX_ICONS_DST := $(GENSRC_OSX_ICONS_TMP)/sun/osxapp
GENSRC_OSX_ICONS := $(GENSRC_OSX_ICONS_DST)/AWTIconData.h GENSRC_OSX_ICONS := $(GENSRC_OSX_ICONS_DST)/AWTIconData.h
ifdef OPENJDK ifdef OPENJDK
GENSRC_OSX_ICONS_SRC := $(JDK_TOPDIR)/src/macosx/native/sun/osxapp/resource/icons/JavaApp.icns GENSRC_OSX_ICONS_SRC := $(JDK_TOPDIR)/src/macosx/native/sun/osxapp/resource/icons/JavaApp.icns
...@@ -119,7 +119,7 @@ ifeq ($(OPENJDK_TARGET_OS),macosx) ...@@ -119,7 +119,7 @@ ifeq ($(OPENJDK_TARGET_OS),macosx)
GENSRC_OSX_ICONS_SRC := $(JDK_TOPDIR)/src/closed/macosx/native/sun/osxapp/resource/icons/JavaApp.icns GENSRC_OSX_ICONS_SRC := $(JDK_TOPDIR)/src/closed/macosx/native/sun/osxapp/resource/icons/JavaApp.icns
endif endif
$(GENSRC_OSX_ICONS_DST)/AWTIconData.h: $(GENSRC_OSX_ICONS_SRC) $(GENSRC_OSX_ICONS_DST)/AWTIconData.h: $(GENSRC_OSX_ICONS_SRC)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
$(MKDIR) -p $(dir $@) $(MKDIR) -p $(dir $@)
$(ECHO) "static unsigned char sAWTIconData[] = { " >> $@.tmp $(ECHO) "static unsigned char sAWTIconData[] = { " >> $@.tmp
...@@ -128,4 +128,3 @@ $(GENSRC_OSX_ICONS_DST)/AWTIconData.h: $(GENSRC_OSX_ICONS_SRC) ...@@ -128,4 +128,3 @@ $(GENSRC_OSX_ICONS_DST)/AWTIconData.h: $(GENSRC_OSX_ICONS_SRC)
$(MV) $@.tmp $@ $(MV) $@.tmp $@
endif endif
makefiles/GensrcJDWP.gmk → makefiles/gensrc/GensrcJDWP.gmk
浏览文件 @ e864d64d
...@@ -26,21 +26,21 @@ ...@@ -26,21 +26,21 @@
# Translate the Java debugger wire protocol (jdwp.spec) file into a JDWP.java file # Translate the Java debugger wire protocol (jdwp.spec) file into a JDWP.java file
# and a JDWPCommands.h C-header file. # and a JDWPCommands.h C-header file.
$(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h : $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h: $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec
$(JDK_OUTPUTDIR)/gensrc/com/sun/tools/jdi/JDWP.java : $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec $(JDK_OUTPUTDIR)/gensrc/com/sun/tools/jdi/JDWP.java: $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_jdwp_headers $(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_jdwp_headers
$(RM) $@ $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h $(RM) $@ $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h
$(ECHO) $(LOG_INFO) Creating JDWP.java and JDWPCommands.h from jdwp.spec $(ECHO) $(LOG_INFO) Creating JDWP.java and JDWPCommands.h from jdwp.spec
$(TOOL_JDWPGEN) $< -jdi $@ -include $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h $(TOOL_JDWPGEN) $< -jdi $@ -include $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h
$(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html : $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html: $(JDK_TOPDIR)/makefiles/jpda/jdwp/jdwp.spec
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $(RM) $@
$(ECHO) $(LOG_INFO) Creating $(@F) from jdwp.spec $(ECHO) $(LOG_INFO) Creating $(@F) from jdwp.spec
$(TOOL_JDWPGEN) $< -doc $@ $(TOOL_JDWPGEN) $< -doc $@
GENSRC_JDWP:= $(JDK_OUTPUTDIR)/gensrc/com/sun/tools/jdi/JDWP.java \ GENSRC_JDWP := $(JDK_OUTPUTDIR)/gensrc/com/sun/tools/jdi/JDWP.java \
$(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h \ $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h \
$(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
makefiles/GensrcJObjC.gmk → makefiles/gensrc/GensrcJObjC.gmk
浏览文件 @ e864d64d
...@@ -36,57 +36,57 @@ JOBJC_DST := $(JDK_OUTPUTDIR)/gensrc_jobjc/src ...@@ -36,57 +36,57 @@ JOBJC_DST := $(JDK_OUTPUTDIR)/gensrc_jobjc/src
# #
# Build generator # Build generator
# #
$(eval $(call SetupJavaCompilation,BUILD_JOBJC_PRIMITIVE_CODER,\ $(eval $(call SetupJavaCompilation,BUILD_JOBJC_PRIMITIVE_CODER, \
SETUP:=GENERATE_OLDBYTECODE,\ SETUP := GENERATE_OLDBYTECODE, \
DISABLE_SJAVAC:=true,\ DISABLE_SJAVAC := true, \
INCLUDES:=core/java \ INCLUDES := core/java \
com/apple,\ com/apple, \
SRC:=$(JOBJC_SRC)/src \ SRC := $(JOBJC_SRC)/src \
$(JOBJC_SRC)/src/generator/java, \ $(JOBJC_SRC)/src/generator/java, \
BIN:=$(JOBJC_TMP)/bin)) BIN := $(JOBJC_TMP)/bin))
GENSRC_JOBJC += $(BUILD_JOBJC_PRIMITIVE_CODER) GENSRC_JOBJC += $(BUILD_JOBJC_PRIMITIVE_CODER)
# #
# Generate bridge support for select frameworks # Generate bridge support for select frameworks
# #
BRIDGESUPPORT := $(addprefix $(JOBJC_TMP)/bridge/,$(addsuffix Full.bridgesupport,$(JOBJC_FRAMEWORKS))) BRIDGESUPPORT := $(addprefix $(JOBJC_TMP)/bridge/, $(addsuffix Full.bridgesupport, $(JOBJC_FRAMEWORKS)))
# #
# Define macro for rules to create bridge support # Define macro for rules to create bridge support
# Not sure why, but if the system has this framework bridge support, # Not sure why, but if the system has this framework bridge support,
# we appear to copy that, otherwise we run GBM which can be very slow. # we appear to copy that, otherwise we run GBM which can be very slow.
# #
define CreateBridgeSupport # Framework define CreateBridgeSupport # Framework
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
if [ -f $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) ]; then \ if [ -f $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) ]; then \
$(CP) $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) $@.tmp ;\ $(CP) $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) $@.tmp ; \
else \ else \
$(GBM) $(LOG_INFO) -F complete --framework $1 -o $@.tmp ; \ $(GBM) $(LOG_INFO) -F complete --framework $1 -o $@.tmp ; \
fi fi
$(MV) $@.tmp $@ $(MV) $@.tmp $@
endef endef
# #
# Currently 3 frameworks, avoid pattern rule due to the names being conflicting # Currently 3 frameworks, avoid pattern rule due to the names being conflicting
# #
$(JOBJC_TMP)/bridge/FoundationFull.bridgesupport : \ $(JOBJC_TMP)/bridge/FoundationFull.bridgesupport: \
$(wildcard $(FRAMEWORKS_DIR)/Foundation.framework/Headers/*.h) $(wildcard $(FRAMEWORKS_DIR)/Foundation.framework/Headers/*.h)
$(call CreateBridgeSupport,Foundation) $(call CreateBridgeSupport,Foundation)
$(JOBJC_TMP)/bridge/CoreFoundationFull.bridgesupport : \ $(JOBJC_TMP)/bridge/CoreFoundationFull.bridgesupport: \
$(wildcard $(FRAMEWORKS_DIR)/CoreFoundation.framework/Headers/*.h) $(wildcard $(FRAMEWORKS_DIR)/CoreFoundation.framework/Headers/*.h)
$(call CreateBridgeSupport,CoreFoundation) $(call CreateBridgeSupport,CoreFoundation)
$(JOBJC_TMP)/bridge/AppKitFull.bridgesupport : \ $(JOBJC_TMP)/bridge/AppKitFull.bridgesupport: \
$(wildcard $(FRAMEWORKS_DIR)/AppKit.framework/Headers/*.h) $(wildcard $(FRAMEWORKS_DIR)/AppKit.framework/Headers/*.h)
$(call CreateBridgeSupport,AppKit) $(call CreateBridgeSupport,AppKit)
# #
# Find Xbootclasspath, for some reason, this involves firing up Java just # Find Xbootclasspath, for some reason, this involves firing up Java just
# so we can get the boot classpath, so we can remove anything in that # so we can get the boot classpath, so we can remove anything in that
# classpath that ends with "JObjC.jar", and emit the new bootclasspath. # classpath that ends with "JObjC.jar", and emit the new bootclasspath.
# #
$(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER) $(JOBJC_TMP)/_the.generator_bootclasspath: $(BUILD_JOBJC_PRIMITIVE_CODER)
$(ECHO) Generating jobjc framework bridge $(ECHO) Generating jobjc framework bridge
$(RM) $@ $(RM) $@
$(JAVA) $(LOG_INFO) -cp $(JOBJC_TMP)/bin com.apple.internal.jobjc.generator.BootClassPathMinus JObjC.jar > $@.tmp $(JAVA) $(LOG_INFO) -cp $(JOBJC_TMP)/bin com.apple.internal.jobjc.generator.BootClassPathMinus JObjC.jar > $@.tmp
...@@ -94,17 +94,17 @@ $(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER) ...@@ -94,17 +94,17 @@ $(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER)
# #
# Run generator # Run generator
# Now we use bootclasspath to run java again, with the bridge support to # Now we use bootclasspath to run java again, with the bridge support to
# generate more source. # generate more source.
# #
$(JOBJC_TMP)/_the.generator : $(JOBJC_TMP)/_the.generator_bootclasspath $(BRIDGESUPPORT) $(JOBJC_TMP)/_the.generator: $(JOBJC_TMP)/_the.generator_bootclasspath $(BRIDGESUPPORT)
$(RM) $@ $(RM) $@
$(JAVA) $(LOG_INFO) -d64 -Xbootclasspath:`$(CAT) $(JOBJC_TMP)/_the.generator_bootclasspath` -cp $(JOBJC_TMP)/bin -ea com.apple.internal.jobjc.generator.Generator dst=$(JOBJC_DST) frameworks=$(JOBJC_TMP)/bridge $(JAVA) $(LOG_INFO) -d64 -Xbootclasspath:`$(CAT) $(JOBJC_TMP)/_the.generator_bootclasspath` -cp $(JOBJC_TMP)/bin -ea com.apple.internal.jobjc.generator.Generator dst=$(JOBJC_DST) frameworks=$(JOBJC_TMP)/bridge
$(TOUCH) $@ $(TOUCH) $@
# The generator delets all files in the target dir so it has to work in its # The generator delets all files in the target dir so it has to work in its
# own dir and have the files copied over to gensrc aftewards. # own dir and have the files copied over to gensrc aftewards.
$(JDK_OUTPUTDIR)/gensrc/_the.jobjc.files : $(JOBJC_TMP)/_the.generator $(JDK_OUTPUTDIR)/gensrc/_the.jobjc.files: $(JOBJC_TMP)/_the.generator
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(CP) -rp $(JOBJC_DST)/* $(@D) $(CP) -rp $(JOBJC_DST)/* $(@D)
$(TOUCH) $@ $(TOUCH) $@
......
makefiles/GensrcLocaleDataMetaInfo.gmk → makefiles/gensrc/GensrcLocaleDataMetaInfo.gmk
浏览文件 @ e864d64d
...@@ -28,49 +28,49 @@ ...@@ -28,49 +28,49 @@
# into LocaleDataMetaInfo.java # into LocaleDataMetaInfo.java
# First go look for all locale files # First go look for all locale files
LOCALE_FILES:=$(shell $(FIND) $(JDK_TOPDIR)/src/share/classes \ LOCALE_FILES := $(shell $(FIND) $(JDK_TOPDIR)/src/share/classes \
-name "FormatData_*.java" -o -name "FormatData_*.properties" -o \ -name "FormatData_*.java" -o -name "FormatData_*.properties" -o \
-name "CollationData_*.java" -o -name "CollationData_*.properties" -o \ -name "CollationData_*.java" -o -name "CollationData_*.properties" -o \
-name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \ -name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \
-name "LocaleNames_*.java" -o -name "LocaleNames_*.properties" -o \ -name "LocaleNames_*.java" -o -name "LocaleNames_*.properties" -o \
-name "CurrencyNames_*.java" -o -name "CurrencyNames_*.properties" -o \ -name "CurrencyNames_*.java" -o -name "CurrencyNames_*.properties" -o \
-name "CalendarData_*.java" -o -name "CalendarData_*.properties") -name "CalendarData_*.java" -o -name "CalendarData_*.properties")
# Then translate the locale files into for example: FormatData_sv # Then translate the locale files into for example: FormatData_sv
LOCALE_RESOURCES:=$(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES))))) LOCALE_RESOURCES := $(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES)))))
# Include the list of resources found during the previous compile. # Include the list of resources found during the previous compile.
-include $(JDK_OUTPUTDIR)/gensrc/_the.locale_resources -include $(JDK_OUTPUTDIR)/gensrc/_the.locale_resources
MISSING_RESOURCES:=$(filter-out $(LOCALE_RESOURCES),$(PREV_LOCALE_RESOURCES)) MISSING_RESOURCES := $(filter-out $(LOCALE_RESOURCES), $(PREV_LOCALE_RESOURCES))
NEW_RESOURCES:=$(filter-out $(PREV_LOCALE_RESOURCES),$(LOCALE_RESOURCES)) NEW_RESOURCES := $(filter-out $(PREV_LOCALE_RESOURCES), $(LOCALE_RESOURCES))
ifneq (,$(MISSING_RESOURCES)$(NEW_RESOURCES)) ifneq (, $(MISSING_RESOURCES)$(NEW_RESOURCES))
# There is a difference in the number of supported resources. Trigger a regeneration. # There is a difference in the number of supported resources. Trigger a regeneration.
$(shell $(RM) $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java) $(shell $(RM) $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java)
endif endif
# The EN locales # The EN locales
EN_LOCALES:=en% EN_LOCALES := en%
# ja-JP-JP and th-TH-TH need to be manually added, as they don't have any resource files. # ja-JP-JP and th-TH-TH need to be manually added, as they don't have any resource files.
ALL_NON_EN_LOCALES:=ja-JP-JP th-TH-TH ALL_NON_EN_LOCALES := ja-JP-JP th-TH-TH
SED_ARGS:=-e 's|$(HASH)warn This file is preprocessed before being compiled|// -- This file was mechanically generated: Do not edit! -- //|g' SED_ARGS := -e 's|$(HASH)warn This file is preprocessed before being compiled|// -- This file was mechanically generated: Do not edit! -- //|g'
# This macro creates a sed expression that substitues for example: # This macro creates a sed expression that substitues for example:
# #FormatData_ENLocales# with: en% locales. # #FormatData_ENLocales# with: en% locales.
define CaptureLocale define CaptureLocale
$1_LOCALES := $$(subst _,-,$$(filter-out $1,$$(subst $1_,,$$(filter $1_%,$(LOCALE_RESOURCES))))) $1_LOCALES := $$(subst _,-,$$(filter-out $1, $$(subst $1_,,$$(filter $1_%, $(LOCALE_RESOURCES)))))
$1_EN_LOCALES := $$(filter $(EN_LOCALES),$$($1_LOCALES)) $1_EN_LOCALES := $$(filter $(EN_LOCALES), $$($1_LOCALES))
$1_NON_EN_LOCALES := $$(filter-out $(EN_LOCALES),$$($1_LOCALES)) $1_NON_EN_LOCALES := $$(filter-out $(EN_LOCALES), $$($1_LOCALES))
ALL_EN_LOCALES += $$($1_EN_LOCALES) ALL_EN_LOCALES += $$($1_EN_LOCALES)
ALL_NON_EN_LOCALES += $$($1_NON_EN_LOCALES) ALL_NON_EN_LOCALES += $$($1_NON_EN_LOCALES)
# Don't sed in a space if there are no locales. # Don't sed in a space if there are no locales.
SED_ARGS+= -e 's/$$(HASH)$1_ENLocales$$(HASH)/$$(if $$($1_EN_LOCALES),$$(SPACE)$$($1_EN_LOCALES),)/g' SED_ARGS += -e 's/$$(HASH)$1_ENLocales$$(HASH)/$$(if $$($1_EN_LOCALES),$$(SPACE)$$($1_EN_LOCALES),)/g'
SED_ARGS+= -e 's/$$(HASH)$1_NonENLocales$$(HASH)/$$(if $$($1_NON_EN_LOCALES),$$(SPACE)$$($1_NON_EN_LOCALES),)/g' SED_ARGS += -e 's/$$(HASH)$1_NonENLocales$$(HASH)/$$(if $$($1_NON_EN_LOCALES),$$(SPACE)$$($1_NON_EN_LOCALES),)/g'
endef endef
#sun.text.resources.FormatData #sun.text.resources.FormatData
...@@ -91,17 +91,17 @@ $(eval $(call CaptureLocale,CurrencyNames)) ...@@ -91,17 +91,17 @@ $(eval $(call CaptureLocale,CurrencyNames))
#sun.util.resources.CalendarData #sun.util.resources.CalendarData
$(eval $(call CaptureLocale,CalendarData)) $(eval $(call CaptureLocale,CalendarData))
SED_ARGS+= -e 's/$(HASH)AvailableLocales_ENLocales$(HASH)/$(sort $(ALL_EN_LOCALES))/g' SED_ARGS += -e 's/$(HASH)AvailableLocales_ENLocales$(HASH)/$(sort $(ALL_EN_LOCALES))/g'
SED_ARGS+= -e 's/$(HASH)AvailableLocales_NonENLocales$(HASH)/$(sort $(ALL_NON_EN_LOCALES))/g' SED_ARGS += -e 's/$(HASH)AvailableLocales_NonENLocales$(HASH)/$(sort $(ALL_NON_EN_LOCALES))/g'
$(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java: \ $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java: \
$(JDK_TOPDIR)/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template $(JDK_TOPDIR)/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(ECHO) Creating sun/util/LocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources. $(ECHO) Creating sun/util/LocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources.
$(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" > $(JDK_OUTPUTDIR)/gensrc/_the.locale_resources $(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" > $(JDK_OUTPUTDIR)/gensrc/_the.locale_resources
$(SED) $(SED_ARGS) $< > $@ $(SED) $(SED_ARGS) $< > $@
GENSRC_LOCALEDATAMETAINFO:=$(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java GENSRC_LOCALEDATAMETAINFO := $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java
### ###
...@@ -110,10 +110,10 @@ GENSRC_CRBC_CMD := $(JDK_TOPDIR)/makefiles/scripts/localelist.sh ...@@ -110,10 +110,10 @@ 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 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_DST): $(JDK_TOPDIR)/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template \
$(GENSRC_CRBC_CMD) $(GENSRC_CRBC_CMD)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
NAWK="$(NAWK)" SED="$(SED)" $(SH) $(GENSRC_CRBC_CMD) "$(JRE_NONEXIST_LOCALES)" $< $@ NAWK="$(NAWK)" SED="$(SED)" $(SH) $(GENSRC_CRBC_CMD) "$(JRE_NONEXIST_LOCALES)" $< $@
GENSRC_LOCALEDATAMETAINFO += $(GENSRC_CRBC_DST) GENSRC_LOCALEDATAMETAINFO += $(GENSRC_CRBC_DST)
......
makefiles/GensrcMisc.gmk → makefiles/gensrc/GensrcMisc.gmk
浏览文件 @ e864d64d
...@@ -32,16 +32,16 @@ include ProfileNames.gmk ...@@ -32,16 +32,16 @@ include ProfileNames.gmk
$(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \ $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
$(PROFILE_VERSION_JAVA_TARGETS): \ $(PROFILE_VERSION_JAVA_TARGETS): \
$(JDK_TOPDIR)/src/share/classes/sun/misc/Version.java.template $(JDK_TOPDIR)/src/share/classes/sun/misc/Version.java.template
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
$(ECHO) Generating sun/misc/Version.java $(call profile_version_name, $@) $(ECHO) Generating sun/misc/Version.java $(call profile_version_name, $@)
$(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \ $(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \
-e 's/@@java_version@@/$(RELEASE)/g' \ -e 's/@@java_version@@/$(RELEASE)/g' \
-e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \ -e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
-e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \ -e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
-e 's/@@java_profile_name@@/$(call profile_version_name, $@)/g' \ -e 's/@@java_profile_name@@/$(call profile_version_name, $@)/g' \
$< > $@.tmp $< > $@.tmp
$(MV) $@.tmp $@ $(MV) $@.tmp $@
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
...@@ -51,7 +51,7 @@ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \ ...@@ -51,7 +51,7 @@ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
# Version file for jconsole # Version file for jconsole
$(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java: \ $(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java: \
$(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/Version.java.template $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/Version.java.template
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
$(ECHO) $(LOG_INFO) Generating sun/tools/jconsole/Version.java $(ECHO) $(LOG_INFO) Generating sun/tools/jconsole/Version.java
...@@ -62,21 +62,21 @@ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java ...@@ -62,21 +62,21 @@ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS_API),posix) ifeq ($(OPENJDK_TARGET_OS_API), posix)
UPSUFFIX:=$(OPENJDK_TARGET_OS) UPSUFFIX := $(OPENJDK_TARGET_OS)
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
UPSUFFIX:=bsd UPSUFFIX := bsd
endif endif
# UNIXProcess.java is different for solaris and linux. We need to copy # UNIXProcess.java is different for solaris and linux. We need to copy
# the correct UNIXProcess.java over to $(JDK_OUTPUTDIR)/gensrc/java/lang/. # the correct UNIXProcess.java over to $(JDK_OUTPUTDIR)/gensrc/java/lang/.
$(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java : \ $(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java: \
$(JDK_TOPDIR)/src/solaris/classes/java/lang/UNIXProcess.java.$(UPSUFFIX) $(JDK_TOPDIR)/src/solaris/classes/java/lang/UNIXProcess.java.$(UPSUFFIX)
$(ECHO) $(LOG_INFO) Copying UNIXProcess.java.$(OPENJDK_TARGET_OS) to java/lang/UNIXProcess.java $(ECHO) $(LOG_INFO) Copying UNIXProcess.java.$(OPENJDK_TARGET_OS) to java/lang/UNIXProcess.java
$(call install-file) $(call install-file)
$(CHMOD) u+rw $@ $(CHMOD) u+rw $@
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java
endif endif
########################################################################################## ##########################################################################################
...@@ -88,100 +88,100 @@ GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c ...@@ -88,100 +88,100 @@ GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c
GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/gensrc/genSocketOptionRegistry GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/gensrc/genSocketOptionRegistry
SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOR_SRC)/$(GENSRC_SOR_SRC_FILE) | \ SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOR_SRC)/$(GENSRC_SOR_SRC_FILE) | \
$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
$(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE,\ $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE, \
SRC:=$(GENSRC_SOR_SRC),\ SRC := $(GENSRC_SOR_SRC), \
INCLUDE_FILES:=$(GENSRC_SOR_SRC_FILE),\ INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
LANG:=C,\ LANG := C, \
CC:=$(BUILD_CC),\ CC := $(BUILD_CC), \
LDEXE:=$(BUILD_LD),\ LDEXE := $(BUILD_LD), \
OBJECT_DIR:=$(GENSRC_SOR_BIN),\ OBJECT_DIR := $(GENSRC_SOR_BIN), \
OUTPUT_DIR:=$(GENSRC_SOR_BIN),\ OUTPUT_DIR := $(GENSRC_SOR_BIN), \
PROGRAM:=genSocketOptionRegistry)) PROGRAM := genSocketOptionRegistry))
ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java),) ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java), )
HAS_SOCKET_OPTION_REGISTRY:=true HAS_SOCKET_OPTION_REGISTRY := true
endif endif
ifneq ($(HAS_SOCKET_OPTION_REGISTRY),true) ifneq ($(HAS_SOCKET_OPTION_REGISTRY), true)
$(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java : $(BUILD_GENSRC_SOR_EXE) $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp
$(BUILD_GENSRC_SOR_EXE) >> $@.tmp $(BUILD_GENSRC_SOR_EXE) >> $@.tmp
$(MV) $@.tmp $@ $(MV) $@.tmp $@
else else
$(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java : $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java $(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/ch/SocketOptionRegistry-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
$(call install-file) $(call install-file)
endif endif
########################################################################################## ##########################################################################################
ifneq ($(OPENJDK_TARGET_OS),windows) ifneq ($(OPENJDK_TARGET_OS), windows)
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java
GENSRC_UC_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs GENSRC_UC_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
GENSRC_UC_SRC_FILE := genUnixConstants.c GENSRC_UC_SRC_FILE := genUnixConstants.c
GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/gensrc/genUnixConstants GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/gensrc/genUnixConstants
UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \ UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \
$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
$(eval $(call SetupNativeCompilation,BUILD_GENSRC_UC_EXE,\ $(eval $(call SetupNativeCompilation,BUILD_GENSRC_UC_EXE, \
SRC:=$(GENSRC_UC_SRC),\ SRC := $(GENSRC_UC_SRC), \
INCLUDE_FILES:=$(GENSRC_UC_SRC_FILE),\ INCLUDE_FILES := $(GENSRC_UC_SRC_FILE), \
LANG:=C,\ LANG := C, \
CC:=$(BUILD_CC),\ CC := $(BUILD_CC), \
LDEXE:=$(BUILD_CC),\ LDEXE := $(BUILD_CC), \
CFLAGS:=$(filter -D%,$(CFLAGS_JDKEXE)),\ CFLAGS := $(filter -D%, $(CFLAGS_JDKEXE)), \
OBJECT_DIR:=$(GENSRC_UC_BIN),\ OBJECT_DIR := $(GENSRC_UC_BIN), \
OUTPUT_DIR:=$(GENSRC_UC_BIN),\ OUTPUT_DIR := $(GENSRC_UC_BIN), \
PROGRAM:=genUnixConstants)) PROGRAM := genUnixConstants))
ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java),) ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java), )
HAS_UNIX_CONSTANTS:=true HAS_UNIX_CONSTANTS := true
endif endif
ifneq ($(HAS_UNIX_CONSTANTS),true) ifneq ($(HAS_UNIX_CONSTANTS), true)
$(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java : $(BUILD_GENSRC_UC_EXE) $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp
$(BUILD_GENSRC_UC_EXE) >> $@.tmp $(BUILD_GENSRC_UC_EXE) >> $@.tmp
$(MV) $@.tmp $@ $(MV) $@.tmp $@
else else
$(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java : $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java
$(call install-file) $(call install-file)
endif endif
endif endif
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS),solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java
GENSRC_SOL_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs GENSRC_SOL_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
GENSRC_SOL_SRC_FILE := genSolarisConstants.c GENSRC_SOL_SRC_FILE := genSolarisConstants.c
GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/gensrc/genSolarisConstants GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/gensrc/genSolarisConstants
SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \ SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \
$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
$(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOL_EXE,\ $(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOL_EXE, \
SRC:=$(GENSRC_SOL_SRC),\ SRC := $(GENSRC_SOL_SRC), \
INCLUDE_FILES:=$(GENSRC_SOL_SRC_FILE),\ INCLUDE_FILES := $(GENSRC_SOL_SRC_FILE), \
LANG:=C,\ LANG := C, \
CC:=$(BUILD_CC),\ CC := $(BUILD_CC), \
LDEXE:=$(BUILD_CC),\ LDEXE := $(BUILD_CC), \
OBJECT_DIR:=$(GENSRC_SOL_BIN),\ OBJECT_DIR := $(GENSRC_SOL_BIN), \
OUTPUT_DIR:=$(GENSRC_SOL_BIN),\ OUTPUT_DIR := $(GENSRC_SOL_BIN), \
PROGRAM:=genSolarisConstants)) PROGRAM := genSolarisConstants))
$(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java : $(BUILD_GENSRC_SOL_EXE) $(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/SolarisConstants.java: $(BUILD_GENSRC_SOL_EXE)
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) $@ $@.tmp $(RM) $@ $@.tmp
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp
...@@ -194,48 +194,47 @@ endif ...@@ -194,48 +194,47 @@ endif
########################################################################################## ##########################################################################################
ifndef OPENJDK ifndef OPENJDK
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
AB_GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc_ab AB_GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc_ab
AB_SRC_DIR := $(JDK_TOPDIR)/src/closed/windows/classes/com/sun/java/accessibility AB_SRC_DIR := $(JDK_TOPDIR)/src/closed/windows/classes/com/sun/java/accessibility
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32) ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
$(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java: \ $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java: \
$(AB_SRC_DIR)/32bit/AccessBridgeLoader.java $(AB_SRC_DIR)/32bit/AccessBridgeLoader.java
$(install-file) $(install-file)
$(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java: \ $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java: \
$(AB_SRC_DIR)/AccessBridge.java $(AB_SRC_DIR)/AccessBridge.java
$(install-file) $(install-file)
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java: \ $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java: \
$(AB_SRC_DIR)/legacy/AccessBridgeLoader.java $(AB_SRC_DIR)/legacy/AccessBridgeLoader.java
$(install-file) $(install-file)
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java: \ $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java: \
$(AB_SRC_DIR)/AccessBridge.java $(AB_SRC_DIR)/AccessBridge.java
$(install-file) $(install-file)
GENSRC_MISC += $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java \ GENSRC_MISC += $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java \
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java \ $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java \
$(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java \ $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java \
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java $(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java
else else
$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java: \ $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java: \
$(AB_SRC_DIR)/64bit/AccessBridgeLoader.java $(AB_SRC_DIR)/64bit/AccessBridgeLoader.java
$(install-file) $(install-file)
$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java: \ $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java: \
$(AB_SRC_DIR)/AccessBridge.java $(AB_SRC_DIR)/AccessBridge.java
$(install-file) $(install-file)
GENSRC_MISC += $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java \ GENSRC_MISC += $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java \
$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java
endif endif
endif
endif
endif endif
########################################################################################## ##########################################################################################
makefiles/GensrcProperties.gmk → makefiles/gensrc/GensrcProperties.gmk
浏览文件 @ e864d64d
...@@ -24,21 +24,21 @@ ...@@ -24,21 +24,21 @@
# #
# Prepare the find cache. This is only used on windows. # Prepare the find cache. This is only used on windows.
$(eval $(call FillCacheFind,$(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/windows/classes)) $(eval $(call FillCacheFind, $(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/windows/classes))
# All .properties files to be compiled are appended to this variable. # All .properties files to be compiled are appended to this variable.
ALL_COMPILED_PROPSOURCES:= ALL_COMPILED_PROPSOURCES :=
# All generated .java files from compilation are appended to this variable. # All generated .java files from compilation are appended to this variable.
ALL_COMPILED_PROPJAVAS:= ALL_COMPILED_PROPJAVAS :=
# The (very long) command line for compilation, stored in a file, prior to use. # The (very long) command line for compilation, stored in a file, prior to use.
COMPILE_PROPCMDLINE:= COMPILE_PROPCMDLINE :=
# All .properties files to be cleaned are appended to this variable. # All .properties files to be cleaned are appended to this variable.
ALL_CLEANED_PROPSOURCES:= ALL_CLEANED_PROPSOURCES :=
# All generated cleaned .properties files from cleaning are appended to this variable. # All generated cleaned .properties files from cleaning are appended to this variable.
ALL_CLEANED_PROPOUTPUT:= ALL_CLEANED_PROPOUTPUT :=
# The (very long) command line for cleaning, stored in a file, prior to use. # The (very long) command line for cleaning, stored in a file, prior to use.
CLEAN_PROPCMDLINE:= CLEAN_PROPCMDLINE :=
define add_properties_to_compile define add_properties_to_compile
# $1 is the name of the properties group # $1 is the name of the properties group
...@@ -49,25 +49,25 @@ define add_properties_to_compile ...@@ -49,25 +49,25 @@ define add_properties_to_compile
# Strip away prefix and suffix, # Strip away prefix and suffix,
# leaving for example: sun/util/resources/CurrencyNames_sv # leaving for example: sun/util/resources/CurrencyNames_sv
$1_PROPPATHS:=$$(patsubst $(JDK_TOPDIR)/src/windows/classes/%.properties,%,\ $1_PROPPATHS := $$(patsubst $(JDK_TOPDIR)/src/windows/classes/%.properties, %, \
$$(patsubst $(JDK_TOPDIR)/src/macosx/classes/%.properties,%,\ $$(patsubst $(JDK_TOPDIR)/src/macosx/classes/%.properties, %, \
$$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties,%,$2))) $$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties, %, $2)))
# Apply optional name transformation, example: hz_TW -> hz_HK # Apply optional name transformation, example: hz_TW -> hz_HK
$(if $4,$1_PROPPATHS:=$$(patsubst $4,$5,$$($1_PROPPATHS))) $(if $4, $1_PROPPATHS := $$(patsubst $4, $5, $$($1_PROPPATHS)))
# Accumulate all found properties files. # Accumulate all found properties files.
ALL_COMPILED_PROPSOURCES+=$2 ALL_COMPILED_PROPSOURCES += $2
# Generate the list of to be created java files. # Generate the list of to be created java files.
ALL_COMPILED_PROPJAVAS+=$$(patsubst %,$(JDK_OUTPUTDIR)/gensrc/%.java,$$($1_PROPPATHS)) ALL_COMPILED_PROPJAVAS += $$(patsubst %, $(JDK_OUTPUTDIR)/gensrc/%.java, $$($1_PROPPATHS))
# Now generate a sequence of "-compile ...CurrencyNames_sv.properties ...CurrencyNames_sv.java ListResourceBundle" # Now generate a sequence of "-compile ...CurrencyNames_sv.properties ...CurrencyNames_sv.java ListResourceBundle"
# suitable to be fed into the CompileProperties command. # suitable to be fed into the CompileProperties command.
COMPILE_PROPCMDLINE+=$$(subst _SPACE_,$(SPACE),$$(join $$(addprefix -compile_SPACE_,$2), \ COMPILE_PROPCMDLINE += $$(subst _SPACE_,$(SPACE),$$(join $$(addprefix -compile_SPACE_, $2), \
$$(addsuffix _SPACE_$(strip $3),\ $$(addsuffix _SPACE_$(strip $3), \
$$(addprefix _SPACE_$(JDK_OUTPUTDIR)/gensrc/,\ $$(addprefix _SPACE_$(JDK_OUTPUTDIR)/gensrc/, \
$$(addsuffix .java,$$($1_PROPPATHS)))))) $$(addsuffix .java, $$($1_PROPPATHS))))))
endef endef
define add_properties_to_clean define add_properties_to_clean
...@@ -79,28 +79,28 @@ define add_properties_to_clean ...@@ -79,28 +79,28 @@ define add_properties_to_clean
# Strip away prefix and suffix, # Strip away prefix and suffix,
# leaving for example: sun/util/resources/CurrencyNames_sv # leaving for example: sun/util/resources/CurrencyNames_sv
$1_PROPPATHS:=$$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/%.properties,%,\ $1_PROPPATHS := $$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/%.properties, %, \
$$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties,%,$2)) $$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties, %, $2))
# Apply optional name transformation, example: hz_TW -> hz_HK # Apply optional name transformation, example: hz_TW -> hz_HK
$(if $3,$1_PROPPATHS:=$$(patsubst $3,$4,$$($1_PROPPATHS))) $(if $3, $1_PROPPATHS := $$(patsubst $3, $4, $$($1_PROPPATHS)))
# Accumulate all found properties files. # Accumulate all found properties files.
ALL_CLEANED_PROPSOURCES+=$2 ALL_CLEANED_PROPSOURCES += $2
# Generate the list of to be created java files. # Generate the list of to be created java files.
$1_PROPOUTPUT:=$$(patsubst %,$(JDK_OUTPUTDIR)/classes/%.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. # If the properties target file isn't in a "resources" dir, add one.
ifneq ($5,) ifneq ($5, )
$1_PROPOUTPUT:=$$(foreach p,$$($1_PROPOUTPUT), $$(dir $$p)$5/$$(notdir $$p)) $1_PROPOUTPUT := $$(foreach p, $$($1_PROPOUTPUT), $$(dir $$p)$5/$$(notdir $$p))
endif endif
ALL_CLEANED_PROPOUTPUT+=$$($1_PROPOUTPUT) ALL_CLEANED_PROPOUTPUT += $$($1_PROPOUTPUT)
# Now generate a sequence of "-clean ...[src]...CurrencyNames_sv.properties ...[build]...CurrencyNames_sv.properties" # Now generate a sequence of "-clean ...[src]...CurrencyNames_sv.properties ...[build]...CurrencyNames_sv.properties"
# suitable to be fed into the StripProperties command. # suitable to be fed into the StripProperties command.
CLEAN_PROPCMDLINE+=$$(subst _SPACE_,$(SPACE),$$(join $$(addprefix -clean_SPACE_,$2), \ CLEAN_PROPCMDLINE += $$(subst _SPACE_,$(SPACE),$$(join $$(addprefix -clean_SPACE_,$2), \
$$(addprefix _SPACE_,$$($1_PROPOUTPUT)))) $$(addprefix _SPACE_, $$($1_PROPOUTPUT))))
endef endef
# Some packages contain pregenerated java files instead of properties files. # Some packages contain pregenerated java files instead of properties files.
...@@ -118,140 +118,140 @@ endef ...@@ -118,140 +118,140 @@ endef
# Some packages have properties that need to be converted to java source files. # Some packages have properties that need to be converted to java source files.
#com/apple/laf/resources #com/apple/laf/resources
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
$(eval $(call add_properties_to_compile,COM_APPLE_LAF,\ $(eval $(call add_properties_to_compile,COM_APPLE_LAF, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/macosx/classes/com/apple/laf/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/macosx/classes/com/apple/laf/resources)), \
ListResourceBundle)) ListResourceBundle))
endif endif
#com/sun/accessibility/internal/resources #com/sun/accessibility/internal/resources
$(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY,\ $(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY_HK,\ $(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY_HK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
#com/sun/imageio/plugins/common #com/sun/imageio/plugins/common
$(eval $(call add_properties_to_clean,COM_SUN_IMAGEIO,\ $(eval $(call add_properties_to_clean,COM_SUN_IMAGEIO, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/imageio)))) $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/imageio))))
#com/sun/java/swing/plaf/gtk/resources #com/sun/java/swing/plaf/gtk/resources
ifneq ($(OPENJDK_TARGET_OS), windows) ifneq ($(OPENJDK_TARGET_OS), windows)
# Only compile GTK resource bundles on Solaris/Linux # Only compile GTK resource bundles on Solaris/Linux
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK_HK,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK_HK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
endif endif
#com/sun/java/swing/plaf/motif/resources #com/sun/java/swing/plaf/motif/resources
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF_HK,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF_HK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
#com/sun/java/swing/plaf/windows/resources #com/sun/java/swing/plaf/windows/resources
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS_HK,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS_HK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
#com/sun/java/util/jar/pack #com/sun/java/util/jar/pack
$(eval $(call add_properties_to_clean,JNDI_COSNAMING,\ $(eval $(call add_properties_to_clean,JNDI_COSNAMING, \
$(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties)) $(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties))
#com/sun/jndi/cosnaming #com/sun/jndi/cosnaming
$(eval $(call add_properties_to_clean,JNDI_COSNAMING,\ $(eval $(call add_properties_to_clean,JNDI_COSNAMING, \
$(JDK_TOPDIR)/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties)) $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties))
#com/sun/jndi/ldap #com/sun/jndi/ldap
$(eval $(call add_properties_to_clean,JNDI_COSNAMING,\ $(eval $(call add_properties_to_clean,JNDI_COSNAMING, \
$(JDK_TOPDIR)/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties)) $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties))
#com/sun/org/apache/xml/internal/security/resource #com/sun/org/apache/xml/internal/security/resource
#FIXME: The "xmlsecurity*.properties" pattern is not ideal; we might want to find #FIXME: The "xmlsecurity*.properties" pattern is not ideal; we might want to find
#a better way to select the properties files that are needed. #a better way to select the properties files that are needed.
$(eval $(call add_properties_to_clean,XML_SECURITY,\ $(eval $(call add_properties_to_clean,XML_SECURITY, \
$(filter $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity%.properties,\ $(filter $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity%.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource)))) $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource))))
#com/sun/rowset #com/sun/rowset
$(eval $(call add_properties_to_clean,COM_SUN_ROWSET,\ $(eval $(call add_properties_to_clean,COM_SUN_ROWSET, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/rowset)))) $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/rowset))))
$(eval $(call add_properties_to_clean,COM_SUN_ROWSET_HK,\ $(eval $(call add_properties_to_clean,COM_SUN_ROWSET_HK, \
$(filter %zh_TW.properties,\ $(filter %zh_TW.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/rowset)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/rowset)), \
%zh_TW,%zh_HK)) %zh_TW, %zh_HK))
#com/sun/swing/internal/plaf/basic/resources #com/sun/swing/internal/plaf/basic/resources
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC_HK,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC_HK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
#com/sun/swing/internal/plaf/metal/resources #com/sun/swing/internal/plaf/metal/resources
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL_HK,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL_HK, \
$(filter %.properties,$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources)),\ $(filter %.properties, $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
#com/sun/swing/internal/plaf/synth/resources #com/sun/swing/internal/plaf/synth/resources
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH_HK,\ $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH_HK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
#com/sun/tools/jdi/resources #com/sun/tools/jdi/resources
$(eval $(call add_properties_to_compile,COM_SUN_TOOLS_JDI,\ $(eval $(call add_properties_to_compile,COM_SUN_TOOLS_JDI, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/tools/jdi/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/tools/jdi/resources)), \
ListResourceBundle)) ListResourceBundle))
#com/sun/tools/script/shell #com/sun/tools/script/shell
#java/util #java/util
#javax/sql/rowset #javax/sql/rowset
$(eval $(call add_properties_to_clean,JAVAX_SQL_ROWSET,\ $(eval $(call add_properties_to_clean,JAVAX_SQL_ROWSET, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/javax/sql/rowset)))) $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/javax/sql/rowset))))
#sun/awt/resources #sun/awt/resources
$(eval $(call add_properties_to_compile,SUN_AWT,\ $(eval $(call add_properties_to_compile,SUN_AWT, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/awt/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/awt/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,SUN_AWT_HK,\ $(eval $(call add_properties_to_compile,SUN_AWT_HK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/awt/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/awt/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
#sun/awt/windows/ #sun/awt/windows/
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call add_properties_to_compile,SUN_AWT,\ $(eval $(call add_properties_to_compile,SUN_AWT, \
$(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties,\ $(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)),\ $(call CacheFind, $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,SUN_AWT_HK,\ $(eval $(call add_properties_to_compile,SUN_AWT_HK, \
$(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties,\ $(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)),\ $(call CacheFind, $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
endif endif
# os x specific awt properties # os x specific awt properties
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS),macosx)
...@@ -262,101 +262,101 @@ $(eval $(call add_properties_to_compile,SUN_AWT,\ ...@@ -262,101 +262,101 @@ $(eval $(call add_properties_to_compile,SUN_AWT,\
endif endif
#sun/launcher/resources #sun/launcher/resources
$(eval $(call add_properties_to_compile,SUN_LAUNCHER,\ $(eval $(call add_properties_to_compile,SUN_LAUNCHER, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,SUN_LAUNCHER_HK,\ $(eval $(call add_properties_to_compile,SUN_LAUNCHER_HK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
#sun/management/resources #sun/management/resources
$(eval $(call add_properties_to_compile,SUN_MANAGEMENT,\ $(eval $(call add_properties_to_compile,SUN_MANAGEMENT, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/management/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/management/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,SUN_MANAGEMENT_KH,\ $(eval $(call add_properties_to_compile,SUN_MANAGEMENT_KH, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/management/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/management/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
#sun/print #sun/print
#sun/print/resources #sun/print/resources
$(eval $(call add_properties_to_compile,SUN_PRINT,\ $(eval $(call add_properties_to_compile,SUN_PRINT, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/print/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/print/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,SUN_PRINT_HK,\ $(eval $(call add_properties_to_compile,SUN_PRINT_HK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/print/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/print/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
#sun/rmi/registry/resources #sun/rmi/registry/resources
$(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY,\ $(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources)))) $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources))))
$(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY_HK,\ $(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY_HK, \
$(filter %zh_TW.properties,\ $(filter %zh_TW.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources)), \
%zh_TW,%zh_HK)) %zh_TW, %zh_HK))
#sun/rmi/rmic/resources #sun/rmi/rmic/resources
$(eval $(call add_properties_to_clean,SUN_RMI_RMIC,\ $(eval $(call add_properties_to_clean,SUN_RMI_RMIC, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/rmic/resources)))) $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/rmic/resources))))
#sun/rmi/server/resources #sun/rmi/server/resources
$(eval $(call add_properties_to_clean,SUN_RMI_SERVER,\ $(eval $(call add_properties_to_clean,SUN_RMI_SERVER, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources)))) $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources))))
$(eval $(call add_properties_to_clean,SUN_RMI_SERVER_HK,\ $(eval $(call add_properties_to_clean,SUN_RMI_SERVER_HK, \
$(filter %zh_TW.properties,\ $(filter %zh_TW.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources)), \
%zh_TW,%zh_HK)) %zh_TW, %zh_HK))
# sun/tools/jar/resources # sun/tools/jar/resources
$(eval $(call add_properties_to_compile,SUN_TOOLS_JAR,\ $(eval $(call add_properties_to_compile,SUN_TOOLS_JAR, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,SUN_TOOLS_JAR_HK,\ $(eval $(call add_properties_to_compile,SUN_TOOLS_JAR_HK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
#sun/tools/javac/resources #sun/tools/javac/resources
# It's unclear if the other localized property files here are supposed to be copied or not # It's unclear if the other localized property files here are supposed to be copied or not
# but the old build system didn't copy them. # but the old build system didn't copy them.
$(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER,\ $(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER, \
$(filter %javac.properties,\ $(filter %javac.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/javac/resources)))) $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/javac/resources))))
#sun/tools/jconsole/resources #sun/tools/jconsole/resources
$(eval $(call add_properties_to_clean,SUN_TOOLS_JCONSOLE,\ $(eval $(call add_properties_to_clean,SUN_TOOLS_JCONSOLE, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources)))) $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources))))
#sun/tools/serialver #sun/tools/serialver
$(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER,\ $(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/serialver)),,,resources)) $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/serialver)), , ,resources))
#sun/util/logging/resources #sun/util/logging/resources
$(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING,\ $(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)), \
ListResourceBundle)) ListResourceBundle))
$(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING_HK,\ $(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING_HK, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)), \
ListResourceBundle,%zh_TW,%zh_HK)) ListResourceBundle, %zh_TW, %zh_HK))
# sun/util/resources # sun/util/resources
$(eval $(call add_properties_to_compile,SUN_UTIL,\ $(eval $(call add_properties_to_compile,SUN_UTIL, \
$(filter %.properties,\ $(filter %.properties, \
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/util/resources)),\ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/util/resources)), \
sun.util.resources.LocaleNamesBundle)) sun.util.resources.LocaleNamesBundle))
# Now setup the rule for the generation of the resource bundles. # Now setup the rule for the generation of the resource bundles.
$(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $(BUILD_TOOLS) $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties: $(ALL_COMPILED_PROPSOURCES) $(BUILD_TOOLS)
# Generate all output directories in advance since the build tool does not do that... # Generate all output directories in advance since the build tool does not do that...
$(MKDIR) -p $(sort $(dir $(ALL_COMPILED_PROPJAVAS))) $(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/_the.cmdline) $(call ListPathsSafely,COMPILE_PROPCMDLINE,\n, >> $(JDK_OUTPUTDIR)/gensrc/_the.cmdline)
...@@ -364,19 +364,19 @@ $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $ ...@@ -364,19 +364,19 @@ $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $
$(TOUCH) $@ $(TOUCH) $@
# Now setup the rule for the generation of the cleaned properties. # Now setup the rule for the generation of the cleaned properties.
# FIXME: We currently don't handle removed properties incrementally. # FIXME: We currently don't handle removed properties incrementally.
$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties : $(ALL_CLEANED_PROPSOURCES) $(BUILD_TOOLS) $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties: $(ALL_CLEANED_PROPSOURCES) $(BUILD_TOOLS)
$(RM) $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline $(RM) $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline
# Generate all output directories in advance since the build tool does not do that... # Generate all output directories in advance since the build tool does not do that...
$(MKDIR) -p $(sort $(dir $(ALL_CLEANED_PROPOUTPUT))) $(MKDIR) -p $(sort $(dir $(ALL_CLEANED_PROPOUTPUT)))
$(ECHO) Copying and cleaning $(words $(ALL_CLEANED_PROPSOURCES)) properties $(ECHO) Copying and cleaning $(words $(ALL_CLEANED_PROPSOURCES)) properties
$(call ListPathsSafely,CLEAN_PROPCMDLINE,\n, >> $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline) $(call ListPathsSafely,CLEAN_PROPCMDLINE,\n, >> $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline)
$(TOOL_STRIPPROPERTIES) @$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline $(TOOL_STRIPPROPERTIES) @$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline
$(TOUCH) $@ $(TOUCH) $@
$(ALL_COMPILED_PROPJAVAS) : $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties $(ALL_COMPILED_PROPJAVAS): $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties
$(ALL_CLEANED_PROPOUTPUT) : $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties $(ALL_CLEANED_PROPOUTPUT): $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties
# Some zh_HK resources are just copied of zh_TW # Some zh_HK resources are just copied of zh_TW
...@@ -384,12 +384,12 @@ $(JDK_OUTPUTDIR)/gensrc/%_zh_HK.java: $(JDK_TOPDIR)/src/share/classes/%_zh_TW.ja ...@@ -384,12 +384,12 @@ $(JDK_OUTPUTDIR)/gensrc/%_zh_HK.java: $(JDK_TOPDIR)/src/share/classes/%_zh_TW.ja
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(CAT) $< | $(SED) -e '/class/s/_zh_TW/_zh_HK/' > $@ $(CAT) $< | $(SED) -e '/class/s/_zh_TW/_zh_HK/' > $@
ZH_HK_JAVA:= sun/applet/resources/MsgAppletViewer_zh_HK.java \ ZH_HK_JAVA := sun/applet/resources/MsgAppletViewer_zh_HK.java \
sun/misc/resources/Messages_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 sun/security/util/Resources_zh_HK.java
ZH_HK_JAVA_FILES:=$(addprefix $(JDK_OUTPUTDIR)/gensrc/,$(ZH_HK_JAVA)) ZH_HK_JAVA_FILES := $(addprefix $(JDK_OUTPUTDIR)/gensrc/, $(ZH_HK_JAVA))
GENSRC_PROPERTIES:=$(ALL_COMPILED_PROPJAVAS) $(ALL_CLEANED_PROPOUTPUT) $(ZH_HK_JAVA_FILES) GENSRC_PROPERTIES := $(ALL_COMPILED_PROPJAVAS) $(ALL_CLEANED_PROPOUTPUT) $(ZH_HK_JAVA_FILES)
makefiles/GensrcSwing.gmk → makefiles/gensrc/GensrcSwing.gmk
浏览文件 @ e864d64d
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# #
# Generate java files for javax.swing.plaf package # Generate java files for javax.swing.plaf package
# #
NIMBUS_PACKAGE = javax.swing.plaf NIMBUS_PACKAGE = javax.swing.plaf
NIMBUS_GENSRC_DIR = $(JDK_OUTPUTDIR)/gensrc/javax/swing/plaf/nimbus NIMBUS_GENSRC_DIR = $(JDK_OUTPUTDIR)/gensrc/javax/swing/plaf/nimbus
NIMBUS_SKIN_FILE = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/skin.laf NIMBUS_SKIN_FILE = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/skin.laf
...@@ -48,22 +48,22 @@ GENSRC_SWING_NIMBUS := $(JDK_OUTPUTDIR)/gensrc/_the.generated_nimbus ...@@ -48,22 +48,22 @@ GENSRC_SWING_NIMBUS := $(JDK_OUTPUTDIR)/gensrc/_the.generated_nimbus
DOCLETSRC_DIR = $(JDK_TOPDIR)/make/tools/swing-beans DOCLETSRC_DIR = $(JDK_TOPDIR)/make/tools/swing-beans
# javax.swing package # javax.swing package
BEANS = AbstractButton Box JComponent JApplet JButton \ BEANS = AbstractButton Box JComponent JApplet JButton \
JCheckBox JCheckBoxMenuItem JComboBox JColorChooser \ JCheckBox JCheckBoxMenuItem JComboBox JColorChooser \
JDesktopPane JDialog JEditorPane JFileChooser JFrame \ JDesktopPane JDialog JEditorPane JFileChooser JFrame \
JFormattedTextField JInternalFrame JLabel JLayeredPane \ JFormattedTextField JInternalFrame JLabel JLayeredPane \
JList JMenu JMenuBar JMenuItem JOptionPane JPanel \ JList JMenu JMenuBar JMenuItem JOptionPane JPanel \
JPasswordField JPopupMenu JProgressBar JRadioButton \ JPasswordField JPopupMenu JProgressBar JRadioButton \
JRadioButtonMenuItem JScrollBar JScrollPane JSeparator \ JRadioButtonMenuItem JScrollBar JScrollPane JSeparator \
JSlider JSplitPane JSpinner JTabbedPane JTable \ JSlider JSplitPane JSpinner JTabbedPane JTable \
JTextArea JTextField JTextPane JToggleButton JToolBar \ JTextArea JTextField JTextPane JToggleButton JToolBar \
JTree JWindow JTree JWindow
# javax.swing.text package # javax.swing.text package
BEANS_TEXT = JTextComponent BEANS_TEXT = JTextComponent
BEANS_SRC = $(BEANS:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/%.java) \ BEANS_SRC = $(BEANS:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/%.java) \
$(BEANS_TEXT:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/text/%.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 # Dummy variable so far, in the old build system it was false by default
SWINGBEAN_DEBUG_FLAG = false SWINGBEAN_DEBUG_FLAG = false
...@@ -71,21 +71,21 @@ SWINGBEAN_DEBUG_FLAG = false ...@@ -71,21 +71,21 @@ SWINGBEAN_DEBUG_FLAG = false
# LocaleDataMetaInfo needs to be generated before running this to avoid confusing errors # LocaleDataMetaInfo needs to be generated before running this to avoid confusing errors
# in the build log. # in the build log.
$(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \ $(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \
$(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java \ $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java \
$(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS) \ $(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS) \
| $(GENSRC_LOCALEDATAMETAINFO) | $(GENSRC_LOCALEDATAMETAINFO)
$(ECHO) Generating beaninfo $(ECHO) Generating beaninfo
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing $(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing
$(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) \ $(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) \
-sourcepath "$(JDK_TOPDIR)/src/share/classes$(PATH_SEP)$(JDK_OUTPUTDIR)/gensrc" \ -sourcepath "$(JDK_TOPDIR)/src/share/classes$(PATH_SEP)$(JDK_OUTPUTDIR)/gensrc" \
-doclet GenDocletBeanInfo \ -doclet GenDocletBeanInfo \
-x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \ -x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \
-t $(DOCLETSRC_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \ -t $(DOCLETSRC_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \
-XDignore.symbol.file=true \ -XDignore.symbol.file=true \
-classpath $(JDK_OUTPUTDIR)/btclasses $(BEANS_SRC) $(LOG_INFO) -classpath $(JDK_OUTPUTDIR)/btclasses $(BEANS_SRC) $(LOG_INFO)
# Move the JTextComponent into its proper package directory. # Move the JTextComponent into its proper package directory.
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/text $(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/text
$(MV) $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/JTextComponentBeanInfo.java $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/text/JTextComponentBeanInfo.java $(MV) $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/JTextComponentBeanInfo.java $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/text/JTextComponentBeanInfo.java
$(TOUCH) $@ $(TOUCH) $@
# This file is the part of dt.jar # This file is the part of dt.jar
...@@ -94,7 +94,7 @@ $(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \ ...@@ -94,7 +94,7 @@ $(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \
$(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java: $(DOCLETSRC_DIR)/javax/swing/SwingBeanInfoBase.java $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java: $(DOCLETSRC_DIR)/javax/swing/SwingBeanInfoBase.java
$(call install-file) $(call install-file)
# This file is the part of dt.jar # This file is the part of dt.jar
# For some reason it is under $(JDK_TOPDIR)/make/tools/swing-beans/sun/swing # For some reason it is under $(JDK_TOPDIR)/make/tools/swing-beans/sun/swing
# Should it be moved under $(JDK_TOPDIR)/src/share/classes/sun/swing instead? # Should it be moved under $(JDK_TOPDIR)/src/share/classes/sun/swing instead?
$(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java: $(DOCLETSRC_DIR)/sun/swing/BeanInfoUtils.java $(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java: $(DOCLETSRC_DIR)/sun/swing/BeanInfoUtils.java
......
makefiles/GensrcX11Wrappers.gmk → makefiles/gensrc/GensrcX11Wrappers.gmk
浏览文件 @ e864d64d
...@@ -48,75 +48,74 @@ GENSRC_SIZER_DIR := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator ...@@ -48,75 +48,74 @@ GENSRC_SIZER_DIR := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
GENSRC_X11_VERSION := $(OPENJDK_TARGET_CPU_BITS) GENSRC_X11_VERSION := $(OPENJDK_TARGET_CPU_BITS)
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
ifneq ($(OPENJDK_TARGET_OS), linux) ifneq ($(OPENJDK_TARGET_OS), linux)
# On all 64-bit systems except Linux, generate both 32 and 64 bit versions # On all 64-bit systems except Linux, generate both 32 and 64 bit versions
GENSRC_X11_VERSION := 32 64 GENSRC_X11_VERSION := 32 64
endif endif
else else
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
# As a special case, solaris 32-bit also generates the 64-bit version # As a special case, solaris 32-bit also generates the 64-bit version
GENSRC_X11_VERSION := 32 64 GENSRC_X11_VERSION := 32 64
endif endif
endif endif
GENSRC_X11_SIZES_USED := $(addprefix $(GENSRC_X11WRAPPERS_TMP)/sizes.,$(GENSRC_X11_VERSION)) GENSRC_X11_SIZES_USED := $(addprefix $(GENSRC_X11WRAPPERS_TMP)/sizes., $(GENSRC_X11_VERSION))
# Copy only the sizes.* files that are actually needed. WrapperGenerator picks up any it finds from the # Copy only the sizes.* files that are actually needed. WrapperGenerator picks up any it finds from the
# file prefix it is given so those not needed need to be hidden. # file prefix it is given so those not needed need to be hidden.
$(GENSRC_X11WRAPPERS_TMP)/sizes.%: $(GENSRC_SIZER_DIR)/sizes.% $(GENSRC_X11WRAPPERS_TMP)/sizes.%: $(GENSRC_SIZER_DIR)/sizes.%
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) '$@' $(RM) '$@'
$(SORT) $< > $@ $(SORT) $< > $@
# Run the tool on the offset files copied from the source repository to generate several Java classes # Run the tool on the offset files copied from the source repository to generate several Java classes
# used in awt. # used in awt.
$(JDK_OUTPUTDIR)/gensrc/_the.generated.x11 : $(GENSRC_X11_SIZES_USED) $(BUILD_TOOLS) $(JDK_OUTPUTDIR)/gensrc/_the.generated.x11: $(GENSRC_X11_SIZES_USED) $(BUILD_TOOLS)
$(MKDIR) -p $(GENSRC_X11WRAPPERS_DST) $(MKDIR) -p $(GENSRC_X11WRAPPERS_DST)
$(TOOL_WRAPPERGENERATOR) $(GENSRC_X11WRAPPERS_DST) $(GENSRC_SIZER_DIR)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizes $(TOOL_WRAPPERGENERATOR) $(GENSRC_X11WRAPPERS_DST) $(GENSRC_SIZER_DIR)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizes
$(TOUCH) $@ $(TOUCH) $@
GENSRC_X11WRAPPERS += $(JDK_OUTPUTDIR)/gensrc/_the.generated.x11 GENSRC_X11WRAPPERS += $(JDK_OUTPUTDIR)/gensrc/_the.generated.x11
ifneq ($(COMPILE_TYPE),cross) ifneq ($(COMPILE_TYPE), cross)
# This is not a cross compile, regenerate the offset file, so that we # This is not a cross compile, regenerate the offset file, so that we
# can compare it with the version in the source code repository. # can compare it with the version in the source code repository.
# Generate the C code for the program that will output the offset file. # Generate the C code for the program that will output the offset file.
$(GENSRC_X11WRAPPERS_TMP)/sizer.%.c : $(GENSRC_SIZER_DIR)/xlibtypes.txt $(BUILD_TOOLS) $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c: $(GENSRC_SIZER_DIR)/xlibtypes.txt $(BUILD_TOOLS)
$(ECHO) "Generating X11 wrapper ($*-bit version)" $(ECHO) "Generating X11 wrapper ($*-bit version)"
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $* $(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $*
# use -m32/-m64 only if the compiler supports it # use -m32/-m64 only if the compiler supports it
ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG),true) ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG), true)
MEMORY_MODEL_FLAG="-m$*" MEMORY_MODEL_FLAG = "-m$*"
endif endif
# Compile the C code into an executable. # Compile the C code into an executable.
$(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
(cd $(@D) && $(CC) $(MEMORY_MODEL_FLAG) -o $@ $< \ (cd $(@D) && $(CC) $(MEMORY_MODEL_FLAG) -o $@ $< \
$(X_CFLAGS) \ $(X_CFLAGS) \
$(X_LIBS) \ $(X_LIBS) \
-I$(JDK_OUTPUTDIR)/include \ -I$(JDK_OUTPUTDIR)/include \
-I$(JDK_TOPDIR)/src/share/javavm/export \ -I$(JDK_TOPDIR)/src/share/javavm/export \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
-I$(JDK_TOPDIR)/src/share/native/common \ -I$(JDK_TOPDIR)/src/share/native/common \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
-I$(JDK_TOPDIR)/src/solaris/native/sun/awt \ -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/debug \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils -lc) -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils -lc)
.PRECIOUS: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c .PRECIOUS: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
# Run the executable create the offset file and check that it is identical # Run the executable create the offset file and check that it is identical
# to the offset file in the source code repository. # to the offset file in the source code repository.
$(GENSRC_X11WRAPPERS_TMP)/sizes.%.verification : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe $(GENSRC_X11WRAPPERS_TMP)/sizes.%.verification: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(GENSRC_X11WRAPPERS_TMP)/sizer.$*.exe | $(SORT) > $@.tmp $(GENSRC_X11WRAPPERS_TMP)/sizer.$*.exe | $(SORT) > $@.tmp
$(ECHO) Verifying $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp to $(GENSRC_X11WRAPPERS_TMP)/sizes.$* $(ECHO) Verifying $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp to $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
$(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$* $(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
mv $@.tmp $@ mv $@.tmp $@
GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
endif endif
makefiles/jpda/jdwp/jdwp.spec
浏览文件 @ e864d64d
...@@ -25,42 +25,42 @@ ...@@ -25,42 +25,42 @@
JDWP "Java(tm) Debug Wire Protocol" JDWP "Java(tm) Debug Wire Protocol"
(CommandSet VirtualMachine=1 (CommandSet VirtualMachine=1
(Command Version=1 (Command Version=1
"Returns the JDWP version implemented by the target VM. " "Returns the JDWP version implemented by the target VM. "
"The version string format is implementation dependent. " "The version string format is implementation dependent. "
(Out (Out
) )
(Reply (Reply
(string description "Text information on the VM version") (string description "Text information on the VM version")
(int jdwpMajor "Major JDWP Version number") (int jdwpMajor "Major JDWP Version number")
(int jdwpMinor "Minor JDWP Version number") (int jdwpMinor "Minor JDWP Version number")
(string vmVersion "Target VM JRE version, as in the java.version property") (string vmVersion "Target VM JRE version, as in the java.version property")
(string vmName "Target VM name, as in the java.vm.name property") (string vmName "Target VM name, as in the java.vm.name property")
) )
(ErrorSet (ErrorSet
(Error VM_DEAD) (Error VM_DEAD)
) )
) )
(Command ClassesBySignature=2 (Command ClassesBySignature=2
"Returns reference types for all the classes loaded by the target VM " "Returns reference types for all the classes loaded by the target VM "
"which match the given signature. " "which match the given signature. "
"Multple reference types will be returned if two or more class " "Multple reference types will be returned if two or more class "
"loaders have loaded a class of the same name. " "loaders have loaded a class of the same name. "
"The search is confined to loaded classes only; no attempt is made " "The search is confined to loaded classes only; no attempt is made "
"to load a class of the given signature. " "to load a class of the given signature. "
(Out (Out
(string signature "JNI signature of the class to find " (string signature "JNI signature of the class to find "
"(for example, \"Ljava/lang/String;\"). " "(for example, \"Ljava/lang/String;\"). "
) )
) )
(Reply (Reply
(Repeat classes "Number of reference types that follow." (Repeat classes "Number of reference types that follow."
(Group ClassInfo (Group ClassInfo
(byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> " (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
"of following reference type. ") "of following reference type. ")
(referenceTypeID typeID "Matching loaded reference type") (referenceTypeID typeID "Matching loaded reference type")
(int status "The current class " (int status "The current class "
"<a href=\"#JDWP_ClassStatus\">status.</a> ") "<a href=\"#JDWP_ClassStatus\">status.</a> ")
) )
) )
) )
...@@ -70,19 +70,19 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -70,19 +70,19 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command AllClasses=3 (Command AllClasses=3
"Returns reference types for all classes currently loaded by the " "Returns reference types for all classes currently loaded by the "
"target VM." "target VM."
(Out (Out
) )
(Reply (Reply
(Repeat classes "Number of reference types that follow." (Repeat classes "Number of reference types that follow."
(Group ClassInfo (Group ClassInfo
(byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> " (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
"of following reference type. ") "of following reference type. ")
(referenceTypeID typeID "Loaded reference type") (referenceTypeID typeID "Loaded reference type")
(string signature (string signature
"The JNI signature of the loaded reference type") "The JNI signature of the loaded reference type")
(int status "The current class " (int status "The current class "
"<a href=\"#JDWP_ClassStatus\">status.</a> ") "<a href=\"#JDWP_ClassStatus\">status.</a> ")
) )
) )
) )
...@@ -92,16 +92,16 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -92,16 +92,16 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command AllThreads=4 (Command AllThreads=4
"Returns all threads currently running in the target VM . " "Returns all threads currently running in the target VM . "
"The returned list contains threads created through " "The returned list contains threads created through "
"java.lang.Thread, all native threads attached to " "java.lang.Thread, all native threads attached to "
"the target VM through JNI, and system threads created " "the target VM through JNI, and system threads created "
"by the target VM. Threads that have not yet been started " "by the target VM. Threads that have not yet been started "
"and threads that have completed their execution are not " "and threads that have completed their execution are not "
"included in the returned list. " "included in the returned list. "
(Out (Out
) )
(Reply (Reply
(Repeat threads "Number of threads that follow." (Repeat threads "Number of threads that follow."
(threadObject thread "A running thread") (threadObject thread "A running thread")
) )
) )
...@@ -111,12 +111,12 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -111,12 +111,12 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command TopLevelThreadGroups=5 (Command TopLevelThreadGroups=5
"Returns all thread groups that do not have a parent. This command " "Returns all thread groups that do not have a parent. This command "
"may be used as the first step in building a tree (or trees) of the " "may be used as the first step in building a tree (or trees) of the "
"existing thread groups." "existing thread groups."
(Out (Out
) )
(Reply (Reply
(Repeat groups "Number of thread groups that follow." (Repeat groups "Number of thread groups that follow."
(threadGroupObject group "A top level thread group") (threadGroupObject group "A top level thread group")
) )
) )
...@@ -125,29 +125,29 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -125,29 +125,29 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
) )
(Command Dispose=6 (Command Dispose=6
"Invalidates this virtual machine mirror. " "Invalidates this virtual machine mirror. "
"The communication channel to the target VM is closed, and " "The communication channel to the target VM is closed, and "
"the target VM prepares to accept another subsequent connection " "the target VM prepares to accept another subsequent connection "
"from this debugger or another debugger, including the " "from this debugger or another debugger, including the "
"following tasks: " "following tasks: "
"<ul>" "<ul>"
"<li>All event requests are cancelled. " "<li>All event requests are cancelled. "
"<li>All threads suspended by the thread-level " "<li>All threads suspended by the thread-level "
"<a href=\"#JDWP_ThreadReference_Resume\">resume</a> command " "<a href=\"#JDWP_ThreadReference_Resume\">resume</a> command "
"or the VM-level " "or the VM-level "
"<a href=\"#JDWP_VirtualMachine_Resume\">resume</a> command " "<a href=\"#JDWP_VirtualMachine_Resume\">resume</a> command "
"are resumed as many times as necessary for them to run. " "are resumed as many times as necessary for them to run. "
"<li>Garbage collection is re-enabled in all cases where it was " "<li>Garbage collection is re-enabled in all cases where it was "
"<a href=\"#JDWP_ObjectReference_DisableCollection\">disabled</a> " "<a href=\"#JDWP_ObjectReference_DisableCollection\">disabled</a> "
"</ul>" "</ul>"
"Any current method invocations executing in the target VM " "Any current method invocations executing in the target VM "
"are continued after the disconnection. Upon completion of any such " "are continued after the disconnection. Upon completion of any such "
"method invocation, the invoking thread continues from the " "method invocation, the invoking thread continues from the "
"location where it was originally stopped. " "location where it was originally stopped. "
"<p>" "<p>"
"Resources originating in " "Resources originating in "
"this VirtualMachine (ObjectReferences, ReferenceTypes, etc.) " "this VirtualMachine (ObjectReferences, ReferenceTypes, etc.) "
"will become invalid. " "will become invalid. "
(Out (Out
) )
(Reply (Reply
...@@ -157,8 +157,8 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -157,8 +157,8 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command IDSizes=7 (Command IDSizes=7
"Returns the sizes of variably-sized data types in the target VM." "Returns the sizes of variably-sized data types in the target VM."
"The returned values indicate the number of bytes used by the " "The returned values indicate the number of bytes used by the "
"identifiers in command and reply packets." "identifiers in command and reply packets."
(Out (Out
) )
(Reply (Reply
...@@ -173,15 +173,15 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -173,15 +173,15 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
) )
(Command Suspend=8 (Command Suspend=8
"Suspends the execution of the application running in the target " "Suspends the execution of the application running in the target "
"VM. All Java threads currently running will be suspended. " "VM. All Java threads currently running will be suspended. "
"<p>" "<p>"
"Unlike java.lang.Thread.suspend, " "Unlike java.lang.Thread.suspend, "
"suspends of both the virtual machine and individual threads are " "suspends of both the virtual machine and individual threads are "
"counted. Before a thread will run again, it must be resumed through " "counted. Before a thread will run again, it must be resumed through "
"the <a href=\"#JDWP_VirtualMachine_Resume\">VM-level resume</a> command " "the <a href=\"#JDWP_VirtualMachine_Resume\">VM-level resume</a> command "
"or the <a href=\"#JDWP_ThreadReference_Resume\">thread-level resume</a> command " "or the <a href=\"#JDWP_ThreadReference_Resume\">thread-level resume</a> command "
"the same number of times it has been suspended. " "the same number of times it has been suspended. "
(Out (Out
) )
(Reply (Reply
...@@ -193,9 +193,9 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -193,9 +193,9 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command Resume=9 (Command Resume=9
"Resumes execution of the application after the suspend " "Resumes execution of the application after the suspend "
"command or an event has stopped it. " "command or an event has stopped it. "
"Suspensions of the Virtual Machine and individual threads are " "Suspensions of the Virtual Machine and individual threads are "
"counted. If a particular thread is suspended n times, it must " "counted. If a particular thread is suspended n times, it must "
"resumed n times before it will continue. " "resumed n times before it will continue. "
(Out (Out
) )
(Reply (Reply
...@@ -207,10 +207,10 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -207,10 +207,10 @@ JDWP "Java(tm) Debug Wire Protocol"
"Terminates the target VM with the given exit code. " "Terminates the target VM with the given exit code. "
"On some platforms, the exit code might be truncated, for " "On some platforms, the exit code might be truncated, for "
"example, to the low order 8 bits. " "example, to the low order 8 bits. "
"All ids previously returned from the target VM become invalid. " "All ids previously returned from the target VM become invalid. "
"Threads running in the VM are abruptly terminated. " "Threads running in the VM are abruptly terminated. "
"A thread death exception is not thrown and " "A thread death exception is not thrown and "
"finally blocks are not run." "finally blocks are not run."
(Out (Out
(int exitCode "the exit code") (int exitCode "the exit code")
) )
...@@ -221,12 +221,12 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -221,12 +221,12 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command CreateString=11 (Command CreateString=11
"Creates a new string object in the target VM and returns " "Creates a new string object in the target VM and returns "
"its id. " "its id. "
(Out (Out
(string utf "UTF-8 characters to use in the created string. ") (string utf "UTF-8 characters to use in the created string. ")
) )
(Reply (Reply
(stringObject stringObject (stringObject stringObject
"Created string (instance of java.lang.String) ") "Created string (instance of java.lang.String) ")
) )
(ErrorSet (ErrorSet
...@@ -235,32 +235,32 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -235,32 +235,32 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command Capabilities=12 (Command Capabilities=12
"Retrieve this VM's capabilities. The capabilities are returned " "Retrieve this VM's capabilities. The capabilities are returned "
"as booleans, each indicating the presence or absence of a " "as booleans, each indicating the presence or absence of a "
"capability. The commands associated with each capability will " "capability. The commands associated with each capability will "
"return the NOT_IMPLEMENTED error if the cabability is not " "return the NOT_IMPLEMENTED error if the cabability is not "
"available." "available."
(Out (Out
) )
(Reply (Reply
(boolean canWatchFieldModification (boolean canWatchFieldModification
"Can the VM watch field modification, and therefore " "Can the VM watch field modification, and therefore "
"can it send the Modification Watchpoint Event?") "can it send the Modification Watchpoint Event?")
(boolean canWatchFieldAccess (boolean canWatchFieldAccess
"Can the VM watch field access, and therefore " "Can the VM watch field access, and therefore "
"can it send the Access Watchpoint Event?") "can it send the Access Watchpoint Event?")
(boolean canGetBytecodes (boolean canGetBytecodes
"Can the VM get the bytecodes of a given method? ") "Can the VM get the bytecodes of a given method? ")
(boolean canGetSyntheticAttribute (boolean canGetSyntheticAttribute
"Can the VM determine whether a field or method is " "Can the VM determine whether a field or method is "
"synthetic? (that is, can the VM determine if the " "synthetic? (that is, can the VM determine if the "
"method or the field was invented by the compiler?) ") "method or the field was invented by the compiler?) ")
(boolean canGetOwnedMonitorInfo (boolean canGetOwnedMonitorInfo
"Can the VM get the owned monitors infornation for " "Can the VM get the owned monitors infornation for "
"a thread?") "a thread?")
(boolean canGetCurrentContendedMonitor (boolean canGetCurrentContendedMonitor
"Can the VM get the current contended monitor of a thread?") "Can the VM get the current contended monitor of a thread?")
(boolean canGetMonitorInfo (boolean canGetMonitorInfo
"Can the VM get the monitor information for a given object? ") "Can the VM get the monitor information for a given object? ")
) )
(ErrorSet (ErrorSet
(Error VM_DEAD) (Error VM_DEAD)
...@@ -268,13 +268,13 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -268,13 +268,13 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command ClassPaths=13 (Command ClassPaths=13
"Retrieve the classpath and bootclasspath of the target VM. " "Retrieve the classpath and bootclasspath of the target VM. "
"If the classpath is not defined, returns an empty list. If the " "If the classpath is not defined, returns an empty list. If the "
"bootclasspath is not defined returns an empty list." "bootclasspath is not defined returns an empty list."
(Out (Out
) )
(Reply (Reply
(string baseDir "Base directory used to resolve relative " (string baseDir "Base directory used to resolve relative "
"paths in either of the following lists.") "paths in either of the following lists.")
(Repeat classpaths "Number of paths in classpath." (Repeat classpaths "Number of paths in classpath."
(string path "One component of classpath") ) (string path "One component of classpath") )
(Repeat bootclasspaths "Number of paths in bootclasspath." (Repeat bootclasspaths "Number of paths in bootclasspath."
...@@ -297,32 +297,32 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -297,32 +297,32 @@ JDWP "Java(tm) Debug Wire Protocol"
"The sender of this command " "The sender of this command "
"promises that no further commands will be sent " "promises that no further commands will be sent "
"referencing a freed ID. "referencing a freed ID.
"<p>" "<p>"
"Use of this command is not required. If it is not sent, " "Use of this command is not required. If it is not sent, "
"resources associated with each ID will be freed by the back-end " "resources associated with each ID will be freed by the back-end "
"at some time after the corresponding object is garbage collected. " "at some time after the corresponding object is garbage collected. "
"It is most useful to use this command to reduce the load on the " "It is most useful to use this command to reduce the load on the "
"back-end if a very large number of " "back-end if a very large number of "
"objects has been retrieved from the back-end (a large array, " "objects has been retrieved from the back-end (a large array, "
"for example) but may not be garbage collected any time soon. " "for example) but may not be garbage collected any time soon. "
"<p>" "<p>"
"IDs may be re-used by the back-end after they " "IDs may be re-used by the back-end after they "
"have been freed with this command." "have been freed with this command."
"This description assumes reference counting, " "This description assumes reference counting, "
"a back-end may use any implementation which operates " "a back-end may use any implementation which operates "
"equivalently. " "equivalently. "
(Out (Out
(Repeat requests "Number of object dispose requests that follow" (Repeat requests "Number of object dispose requests that follow"
(Group Request (Group Request
(object object "The object ID") (object object "The object ID")
(int refCnt "The number of times this object ID has been " (int refCnt "The number of times this object ID has been "
"part of a packet received from the back-end. " "part of a packet received from the back-end. "
"An accurate count prevents the object ID " "An accurate count prevents the object ID "
"from being freed on the back-end if " "from being freed on the back-end if "
"it is part of an incoming packet, not yet " "it is part of an incoming packet, not yet "
"handled by the front-end.") "handled by the front-end.")
) )
) )
) )
(Reply (Reply
) )
...@@ -331,16 +331,16 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -331,16 +331,16 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command HoldEvents=15 (Command HoldEvents=15
"Tells the target VM to stop sending events. Events are not discarded; " "Tells the target VM to stop sending events. Events are not discarded; "
"they are held until a subsequent ReleaseEvents command is sent. " "they are held until a subsequent ReleaseEvents command is sent. "
"This command is useful to control the number of events sent " "This command is useful to control the number of events sent "
"to the debugger VM in situations where very large numbers of events " "to the debugger VM in situations where very large numbers of events "
"are generated. " "are generated. "
"While events are held by the debugger back-end, application " "While events are held by the debugger back-end, application "
"execution may be frozen by the debugger back-end to prevent " "execution may be frozen by the debugger back-end to prevent "
"buffer overflows on the back end. "buffer overflows on the back end.
"Responses to commands are never held and are not affected by this "Responses to commands are never held and are not affected by this
"command. If events are already being held, this command is " "command. If events are already being held, this command is "
"ignored." "ignored."
(Out (Out
) )
(Reply (Reply
...@@ -350,9 +350,9 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -350,9 +350,9 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command ReleaseEvents=16 (Command ReleaseEvents=16
"Tells the target VM to continue sending events. This command is " "Tells the target VM to continue sending events. This command is "
"used to restore normal activity after a HoldEvents command. If " "used to restore normal activity after a HoldEvents command. If "
"there is no current HoldEvents command in effect, this command is " "there is no current HoldEvents command in effect, this command is "
"ignored." "ignored."
(Out (Out
) )
(Reply (Reply
...@@ -362,112 +362,112 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -362,112 +362,112 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command CapabilitiesNew=17 (Command CapabilitiesNew=17
"Retrieve all of this VM's capabilities. The capabilities are returned " "Retrieve all of this VM's capabilities. The capabilities are returned "
"as booleans, each indicating the presence or absence of a " "as booleans, each indicating the presence or absence of a "
"capability. The commands associated with each capability will " "capability. The commands associated with each capability will "
"return the NOT_IMPLEMENTED error if the cabability is not " "return the NOT_IMPLEMENTED error if the cabability is not "
"available." "available."
"Since JDWP version 1.4." "Since JDWP version 1.4."
(Out (Out
) )
(Reply (Reply
(boolean canWatchFieldModification (boolean canWatchFieldModification
"Can the VM watch field modification, and therefore " "Can the VM watch field modification, and therefore "
"can it send the Modification Watchpoint Event?") "can it send the Modification Watchpoint Event?")
(boolean canWatchFieldAccess (boolean canWatchFieldAccess
"Can the VM watch field access, and therefore " "Can the VM watch field access, and therefore "
"can it send the Access Watchpoint Event?") "can it send the Access Watchpoint Event?")
(boolean canGetBytecodes (boolean canGetBytecodes
"Can the VM get the bytecodes of a given method? ") "Can the VM get the bytecodes of a given method? ")
(boolean canGetSyntheticAttribute (boolean canGetSyntheticAttribute
"Can the VM determine whether a field or method is " "Can the VM determine whether a field or method is "
"synthetic? (that is, can the VM determine if the " "synthetic? (that is, can the VM determine if the "
"method or the field was invented by the compiler?) ") "method or the field was invented by the compiler?) ")
(boolean canGetOwnedMonitorInfo (boolean canGetOwnedMonitorInfo
"Can the VM get the owned monitors infornation for " "Can the VM get the owned monitors infornation for "
"a thread?") "a thread?")
(boolean canGetCurrentContendedMonitor (boolean canGetCurrentContendedMonitor
"Can the VM get the current contended monitor of a thread?") "Can the VM get the current contended monitor of a thread?")
(boolean canGetMonitorInfo (boolean canGetMonitorInfo
"Can the VM get the monitor information for a given object? ") "Can the VM get the monitor information for a given object? ")
(boolean canRedefineClasses (boolean canRedefineClasses
"Can the VM redefine classes?") "Can the VM redefine classes?")
(boolean canAddMethod (boolean canAddMethod
"Can the VM add methods when redefining " "Can the VM add methods when redefining "
"classes?") "classes?")
(boolean canUnrestrictedlyRedefineClasses (boolean canUnrestrictedlyRedefineClasses
"Can the VM redefine classes" "Can the VM redefine classes"
"in arbitrary ways?") "in arbitrary ways?")
(boolean canPopFrames (boolean canPopFrames
"Can the VM pop stack frames?") "Can the VM pop stack frames?")
(boolean canUseInstanceFilters (boolean canUseInstanceFilters
"Can the VM filter events by specific object?") "Can the VM filter events by specific object?")
(boolean canGetSourceDebugExtension (boolean canGetSourceDebugExtension
"Can the VM get the source debug extension?") "Can the VM get the source debug extension?")
(boolean canRequestVMDeathEvent (boolean canRequestVMDeathEvent
"Can the VM request VM death events?") "Can the VM request VM death events?")
(boolean canSetDefaultStratum (boolean canSetDefaultStratum
"Can the VM set a default stratum?") "Can the VM set a default stratum?")
(boolean canGetInstanceInfo (boolean canGetInstanceInfo
"Can the VM return instances, counts of instances of classes " "Can the VM return instances, counts of instances of classes "
"and referring objects?") "and referring objects?")
(boolean canRequestMonitorEvents (boolean canRequestMonitorEvents
"Can the VM request monitor events?") "Can the VM request monitor events?")
(boolean canGetMonitorFrameInfo (boolean canGetMonitorFrameInfo
"Can the VM get monitors with frame depth info?") "Can the VM get monitors with frame depth info?")
(boolean canUseSourceNameFilters (boolean canUseSourceNameFilters
"Can the VM filter class prepare events by source name?") "Can the VM filter class prepare events by source name?")
(boolean canGetConstantPool (boolean canGetConstantPool
"Can the VM return the constant pool information?") "Can the VM return the constant pool information?")
(boolean canForceEarlyReturn (boolean canForceEarlyReturn
"Can the VM force early return from a method?") "Can the VM force early return from a method?")
(boolean reserved22 (boolean reserved22
"Reserved for future capability") "Reserved for future capability")
(boolean reserved23 (boolean reserved23
"Reserved for future capability") "Reserved for future capability")
(boolean reserved24 (boolean reserved24
"Reserved for future capability") "Reserved for future capability")
(boolean reserved25 (boolean reserved25
"Reserved for future capability") "Reserved for future capability")
(boolean reserved26 (boolean reserved26
"Reserved for future capability") "Reserved for future capability")
(boolean reserved27 (boolean reserved27
"Reserved for future capability") "Reserved for future capability")
(boolean reserved28 (boolean reserved28
"Reserved for future capability") "Reserved for future capability")
(boolean reserved29 (boolean reserved29
"Reserved for future capability") "Reserved for future capability")
(boolean reserved30 (boolean reserved30
"Reserved for future capability") "Reserved for future capability")
(boolean reserved31 (boolean reserved31
"Reserved for future capability") "Reserved for future capability")
(boolean reserved32 (boolean reserved32
"Reserved for future capability") "Reserved for future capability")
) )
(ErrorSet (ErrorSet
(Error VM_DEAD) (Error VM_DEAD)
) )
) )
(Command RedefineClasses=18 (Command RedefineClasses=18
"Installs new class definitions. " "Installs new class definitions. "
"If there are active stack frames in methods of the redefined classes in the " "If there are active stack frames in methods of the redefined classes in the "
"target VM then those active frames continue to run the bytecodes of the " "target VM then those active frames continue to run the bytecodes of the "
"original method. These methods are considered obsolete - see " "original method. These methods are considered obsolete - see "
"<a href=\"#JDWP_Method_IsObsolete\">IsObsolete</a>. The methods in the " "<a href=\"#JDWP_Method_IsObsolete\">IsObsolete</a>. The methods in the "
"redefined classes will be used for new invokes in the target VM. " "redefined classes will be used for new invokes in the target VM. "
"The original method ID refers to the redefined method. " "The original method ID refers to the redefined method. "
"All breakpoints in the redefined classes are cleared." "All breakpoints in the redefined classes are cleared."
"If resetting of stack frames is desired, the " "If resetting of stack frames is desired, the "
"<a href=\"#JDWP_StackFrame_PopFrames\">PopFrames</a> command can be used " "<a href=\"#JDWP_StackFrame_PopFrames\">PopFrames</a> command can be used "
"to pop frames with obsolete methods." "to pop frames with obsolete methods."
"<p>" "<p>"
"Requires canRedefineClasses capability - see " "Requires canRedefineClasses capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. " "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
"In addition to the canRedefineClasses capability, the target VM must " "In addition to the canRedefineClasses capability, the target VM must "
"have the canAddMethod capability to add methods when redefining classes, " "have the canAddMethod capability to add methods when redefining classes, "
"or the canUnrestrictedlyRedefineClasses to redefine classes in arbitrary " "or the canUnrestrictedlyRedefineClasses to redefine classes in arbitrary "
"ways." "ways."
(Out (Out
(Repeat classes "Number of reference types that follow." (Repeat classes "Number of reference types that follow."
(Group ClassDef (Group ClassDef
(referenceType refType "The reference type.") (referenceType refType "The reference type.")
(Repeat classfile "Number of bytes defining class (below)" (Repeat classfile "Number of bytes defining class (below)"
...@@ -477,7 +477,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -477,7 +477,7 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
) )
) )
(Reply (Reply
) )
(ErrorSet (ErrorSet
(Error INVALID_CLASS "One of the refTypes is not the ID of a reference " (Error INVALID_CLASS "One of the refTypes is not the ID of a reference "
...@@ -501,9 +501,9 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -501,9 +501,9 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command SetDefaultStratum=19 (Command SetDefaultStratum=19
"Set the default stratum. Requires canSetDefaultStratum capability - see " "Set the default stratum. Requires canSetDefaultStratum capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(Out (Out
(string stratumID "default stratum, or empty string to use " (string stratumID "default stratum, or empty string to use "
"reference type default.") "reference type default.")
) )
(Reply (Reply
...@@ -515,28 +515,28 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -515,28 +515,28 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command AllClassesWithGeneric=20 (Command AllClassesWithGeneric=20
"Returns reference types for all classes currently loaded by the " "Returns reference types for all classes currently loaded by the "
"target VM. " "target VM. "
"Both the JNI signature and the generic signature are " "Both the JNI signature and the generic signature are "
"returned for each class. " "returned for each class. "
"Generic signatures are described in the signature attribute " "Generic signatures are described in the signature attribute "
"section in " "section in "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"Since JDWP version 1.5." "Since JDWP version 1.5."
(Out (Out
) )
(Reply (Reply
(Repeat classes "Number of reference types that follow." (Repeat classes "Number of reference types that follow."
(Group ClassInfo (Group ClassInfo
(byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> " (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
"of following reference type. ") "of following reference type. ")
(referenceTypeID typeID "Loaded reference type") (referenceTypeID typeID "Loaded reference type")
(string signature (string signature
"The JNI signature of the loaded reference type.") "The JNI signature of the loaded reference type.")
(string genericSignature (string genericSignature
"The generic signature of the loaded reference type " "The generic signature of the loaded reference type "
"or an empty string if there is none.") "or an empty string if there is none.")
(int status "The current class " (int status "The current class "
"<a href=\"#JDWP_ClassStatus\">status.</a> ") "<a href=\"#JDWP_ClassStatus\">status.</a> ")
) )
) )
) )
...@@ -544,7 +544,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -544,7 +544,7 @@ JDWP "Java(tm) Debug Wire Protocol"
(Error VM_DEAD) (Error VM_DEAD)
) )
) )
(Command InstanceCounts=21 (Command InstanceCounts=21
"Returns the number of instances of each reference type in the input list. " "Returns the number of instances of each reference type in the input list. "
"Only instances that are reachable for the purposes of " "Only instances that are reachable for the purposes of "
...@@ -574,18 +574,18 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -574,18 +574,18 @@ JDWP "Java(tm) Debug Wire Protocol"
(CommandSet ReferenceType=2 (CommandSet ReferenceType=2
(Command Signature=1 (Command Signature=1
"Returns the JNI signature of a reference type. " "Returns the JNI signature of a reference type. "
"JNI signature formats are described in the " "JNI signature formats are described in the "
"<a href=\"http://java.sun.com/products/jdk/1.2/docs/guide/jni/index.html\">Java Native Inteface Specification</a>" "<a href=\"http://java.sun.com/products/jdk/1.2/docs/guide/jni/index.html\">Java Native Inteface Specification</a>"
"<p> "<p>
"For primitive classes " "For primitive classes "
"the returned signature is the signature of the corresponding primitive " "the returned signature is the signature of the corresponding primitive "
"type; for example, \"I\" is returned as the signature of the class " "type; for example, \"I\" is returned as the signature of the class "
"represented by java.lang.Integer.TYPE." "represented by java.lang.Integer.TYPE."
(Out (Out
(referenceType refType "The reference type ID.") (referenceType refType "The reference type ID.")
) )
(Reply (Reply
(string signature (string signature
"The JNI signature for the reference type.") "The JNI signature for the reference type.")
) )
(ErrorSet (ErrorSet
...@@ -598,7 +598,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -598,7 +598,7 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command ClassLoader=2 (Command ClassLoader=2
"Returns the instance of java.lang.ClassLoader which loaded " "Returns the instance of java.lang.ClassLoader which loaded "
"a given reference type. If the reference type was loaded by the " "a given reference type. If the reference type was loaded by the "
"system class loader, the returned object ID is null." "system class loader, the returned object ID is null."
(Out (Out
(referenceType refType "The reference type ID.") (referenceType refType "The reference type ID.")
) )
...@@ -614,16 +614,16 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -614,16 +614,16 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command Modifiers=3 (Command Modifiers=3
"Returns the modifiers (also known as access flags) for a reference type. " "Returns the modifiers (also known as access flags) for a reference type. "
"The returned bit mask contains information on the declaration " "The returned bit mask contains information on the declaration "
"of the reference type. If the reference type is an array or " "of the reference type. If the reference type is an array or "
"a primitive class (for example, java.lang.Integer.TYPE), the " "a primitive class (for example, java.lang.Integer.TYPE), the "
"value of the returned bit mask is undefined." "value of the returned bit mask is undefined."
(Out (Out
(referenceType refType "The reference type ID.") (referenceType refType "The reference type ID.")
) )
(Reply (Reply
(int modBits "Modifier bits as defined in Chapter 4 of " (int modBits "Modifier bits as defined in Chapter 4 of "
"<cite>The Java&trade; Virtual Machine Specification</cite>") "<cite>The Java&trade; Virtual Machine Specification</cite>")
) )
(ErrorSet (ErrorSet
(Error INVALID_CLASS "refType is not the ID of a reference " (Error INVALID_CLASS "refType is not the ID of a reference "
...@@ -635,8 +635,8 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -635,8 +635,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command Fields=4 (Command Fields=4
"Returns information for each field in a reference type. " "Returns information for each field in a reference type. "
"Inherited fields are not included. " "Inherited fields are not included. "
"The field list will include any synthetic fields created " "The field list will include any synthetic fields created "
"by the compiler. " "by the compiler. "
"Fields are returned in the order they occur in the class file." "Fields are returned in the order they occur in the class file."
(Out (Out
(referenceType refType "The reference type ID.") (referenceType refType "The reference type ID.")
...@@ -648,13 +648,13 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -648,13 +648,13 @@ JDWP "Java(tm) Debug Wire Protocol"
(string name "Name of field.") (string name "Name of field.")
(string signature "JNI Signature of field.") (string signature "JNI Signature of field.")
(int modBits "The modifier bit flags (also known as access flags) " (int modBits "The modifier bit flags (also known as access flags) "
"which provide additional information on the " "which provide additional information on the "
"field declaration. Individual flag values are " "field declaration. Individual flag values are "
"defined in Chapter 4 of " "defined in Chapter 4 of "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"In addition, The <code>0xf0000000</code> bit identifies " "In addition, The <code>0xf0000000</code> bit identifies "
"the field as synthetic, if the synthetic attribute " "the field as synthetic, if the synthetic attribute "
"<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.") "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
) )
) )
) )
...@@ -669,9 +669,9 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -669,9 +669,9 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command Methods=5 (Command Methods=5
"Returns information for each method in a reference type. " "Returns information for each method in a reference type. "
"Inherited methods are not included. The list of methods will " "Inherited methods are not included. The list of methods will "
"include constructors (identified with the name \"&lt;init&gt;\"), " "include constructors (identified with the name \"&lt;init&gt;\"), "
"the initialization method (identified with the name \"&lt;clinit&gt;\") " "the initialization method (identified with the name \"&lt;clinit&gt;\") "
"if present, and any synthetic methods created by the compiler. " "if present, and any synthetic methods created by the compiler. "
"Methods are returned in the order they occur in the class file." "Methods are returned in the order they occur in the class file."
(Out (Out
(referenceType refType "The reference type ID.") (referenceType refType "The reference type ID.")
...@@ -683,13 +683,13 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -683,13 +683,13 @@ JDWP "Java(tm) Debug Wire Protocol"
(string name "Name of method.") (string name "Name of method.")
(string signature "JNI signature of method.") (string signature "JNI signature of method.")
(int modBits "The modifier bit flags (also known as access flags) " (int modBits "The modifier bit flags (also known as access flags) "
"which provide additional information on the " "which provide additional information on the "
"method declaration. Individual flag values are " "method declaration. Individual flag values are "
"defined in Chapter 4 of " "defined in Chapter 4 of "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"In addition, The <code>0xf0000000</code> bit identifies " "In addition, The <code>0xf0000000</code> bit identifies "
"the method as synthetic, if the synthetic attribute " "the method as synthetic, if the synthetic attribute "
"<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.") "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
) )
) )
) )
...@@ -703,13 +703,13 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -703,13 +703,13 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command GetValues=6 (Command GetValues=6
"Returns the value of one or more static fields of the " "Returns the value of one or more static fields of the "
"reference type. Each field must be member of the reference type " "reference type. Each field must be member of the reference type "
"or one of its superclasses, superinterfaces, or implemented interfaces. " "or one of its superclasses, superinterfaces, or implemented interfaces. "
"Access control is not enforced; for example, the values of private " "Access control is not enforced; for example, the values of private "
"fields can be obtained." "fields can be obtained."
(Out (Out
(referenceType refType "The reference type ID.") (referenceType refType "The reference type ID.")
(Repeat fields "The number of values to get" (Repeat fields "The number of values to get"
(Group Field (Group Field
(field fieldID "A field to get") (field fieldID "A field to get")
) )
...@@ -717,7 +717,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -717,7 +717,7 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Reply (Reply
(Repeat values "The number of values returned, always equal to fields, " (Repeat values "The number of values returned, always equal to fields, "
"the number of values to get." "the number of values to get."
(value value "The field value") (value value "The field value")
) )
) )
...@@ -731,19 +731,19 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -731,19 +731,19 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command SourceFile=7 (Command SourceFile=7
"Returns the name of source file in which a reference type was " "Returns the name of source file in which a reference type was "
"declared. " "declared. "
(Out (Out
(referenceType refType "The reference type ID.") (referenceType refType "The reference type ID.")
) )
(Reply (Reply
(string sourceFile "The source file name. No path information " (string sourceFile "The source file name. No path information "
"for the file is included") "for the file is included")
) )
(ErrorSet (ErrorSet
(Error INVALID_CLASS "refType is not the ID of a reference " (Error INVALID_CLASS "refType is not the ID of a reference "
"type.") "type.")
(Error INVALID_OBJECT "refType is not a known ID.") (Error INVALID_OBJECT "refType is not a known ID.")
(Error ABSENT_INFORMATION "The source file attribute is absent.") (Error ABSENT_INFORMATION "The source file attribute is absent.")
(Error VM_DEAD) (Error VM_DEAD)
) )
) )
...@@ -757,7 +757,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -757,7 +757,7 @@ JDWP "Java(tm) Debug Wire Protocol"
(Repeat classes "The number of nested classes and interfaces" (Repeat classes "The number of nested classes and interfaces"
(Group TypeInfo (Group TypeInfo
(byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> " (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
"of following reference type. ") "of following reference type. ")
(referenceTypeID typeID "The nested class or interface ID.") (referenceTypeID typeID "The nested class or interface ID.")
) )
) )
...@@ -771,15 +771,15 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -771,15 +771,15 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command Status=9 (Command Status=9
"Returns the current status of the reference type. The status " "Returns the current status of the reference type. The status "
"indicates the extent to which the reference type has been " "indicates the extent to which the reference type has been "
"initialized, as described in section 2.1.6 of " "initialized, as described in section 2.1.6 of "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"If the class is linked the PREPARED and VERIFIED bits in the returned status bits " "If the class is linked the PREPARED and VERIFIED bits in the returned status bits "
"will be set. If the class is initialized the INITIALIZED bit in the returned " "will be set. If the class is initialized the INITIALIZED bit in the returned "
"status bits will be set. If an error occured during initialization then the " "status bits will be set. If an error occured during initialization then the "
"ERROR bit in the returned status bits will be set. " "ERROR bit in the returned status bits will be set. "
"The returned status bits are undefined for array types and for " "The returned status bits are undefined for array types and for "
"primitive classes (such as java.lang.Integer.TYPE). " "primitive classes (such as java.lang.Integer.TYPE). "
(Out (Out
(referenceType refType "The reference type ID.") (referenceType refType "The reference type ID.")
) )
...@@ -831,7 +831,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -831,7 +831,7 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command SourceDebugExtension=12 (Command SourceDebugExtension=12
"Returns the value of the SourceDebugExtension attribute. " "Returns the value of the SourceDebugExtension attribute. "
"Since JDWP version 1.4. Requires canGetSourceDebugExtension capability - see " "Since JDWP version 1.4. Requires canGetSourceDebugExtension capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(Out (Out
(referenceType refType "The reference type ID.") (referenceType refType "The reference type ID.")
) )
...@@ -850,18 +850,18 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -850,18 +850,18 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command SignatureWithGeneric=13 (Command SignatureWithGeneric=13
"Returns the JNI signature of a reference type along with the " "Returns the JNI signature of a reference type along with the "
"generic signature if there is one. " "generic signature if there is one. "
"Generic signatures are described in the signature attribute " "Generic signatures are described in the signature attribute "
"section in " "section in "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"Since JDWP version 1.5." "Since JDWP version 1.5."
"<p> "<p>
(Out (Out
(referenceType refType "The reference type ID.") (referenceType refType "The reference type ID.")
) )
(Reply (Reply
(string signature (string signature
"The JNI signature for the reference type.") "The JNI signature for the reference type.")
(string genericSignature (string genericSignature
"The generic signature for the reference type or an empty " "The generic signature for the reference type or an empty "
"string if there is none.") "string if there is none.")
) )
...@@ -876,10 +876,10 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -876,10 +876,10 @@ JDWP "Java(tm) Debug Wire Protocol"
"Returns information, including the generic signature if any, " "Returns information, including the generic signature if any, "
"for each field in a reference type. " "for each field in a reference type. "
"Inherited fields are not included. " "Inherited fields are not included. "
"The field list will include any synthetic fields created " "The field list will include any synthetic fields created "
"by the compiler. " "by the compiler. "
"Fields are returned in the order they occur in the class file. " "Fields are returned in the order they occur in the class file. "
"Generic signatures are described in the signature attribute " "Generic signatures are described in the signature attribute "
"section in " "section in "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"Since JDWP version 1.5." "Since JDWP version 1.5."
...@@ -895,13 +895,13 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -895,13 +895,13 @@ JDWP "Java(tm) Debug Wire Protocol"
(string genericSignature "The generic signature of the " (string genericSignature "The generic signature of the "
"field, or an empty string if there is none.") "field, or an empty string if there is none.")
(int modBits "The modifier bit flags (also known as access flags) " (int modBits "The modifier bit flags (also known as access flags) "
"which provide additional information on the " "which provide additional information on the "
"field declaration. Individual flag values are " "field declaration. Individual flag values are "
"defined in Chapter 4 of " "defined in Chapter 4 of "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"In addition, The <code>0xf0000000</code> bit identifies " "In addition, The <code>0xf0000000</code> bit identifies "
"the field as synthetic, if the synthetic attribute " "the field as synthetic, if the synthetic attribute "
"<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.") "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
) )
) )
) )
...@@ -917,11 +917,11 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -917,11 +917,11 @@ JDWP "Java(tm) Debug Wire Protocol"
"Returns information, including the generic signature if any, " "Returns information, including the generic signature if any, "
"for each method in a reference type. " "for each method in a reference type. "
"Inherited methodss are not included. The list of methods will " "Inherited methodss are not included. The list of methods will "
"include constructors (identified with the name \"&lt;init&gt;\"), " "include constructors (identified with the name \"&lt;init&gt;\"), "
"the initialization method (identified with the name \"&lt;clinit&gt;\") " "the initialization method (identified with the name \"&lt;clinit&gt;\") "
"if present, and any synthetic methods created by the compiler. " "if present, and any synthetic methods created by the compiler. "
"Methods are returned in the order they occur in the class file. " "Methods are returned in the order they occur in the class file. "
"Generic signatures are described in the signature attribute " "Generic signatures are described in the signature attribute "
"section in " "section in "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"Since JDWP version 1.5." "Since JDWP version 1.5."
...@@ -937,13 +937,13 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -937,13 +937,13 @@ JDWP "Java(tm) Debug Wire Protocol"
(string genericSignature "The generic signature of the method, or " (string genericSignature "The generic signature of the method, or "
"an empty string if there is none.") "an empty string if there is none.")
(int modBits "The modifier bit flags (also known as access flags) " (int modBits "The modifier bit flags (also known as access flags) "
"which provide additional information on the " "which provide additional information on the "
"method declaration. Individual flag values are " "method declaration. Individual flag values are "
"defined in Chapter 4 of " "defined in Chapter 4 of "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"In addition, The <code>0xf0000000</code> bit identifies " "In addition, The <code>0xf0000000</code> bit identifies "
"the method as synthetic, if the synthetic attribute " "the method as synthetic, if the synthetic attribute "
"<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.") "<a href=\"#JDWP_VirtualMachine_Capabilities\">capability</a> is available.")
) )
) )
) )
...@@ -956,16 +956,16 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -956,16 +956,16 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
) )
(Command Instances=16 (Command Instances=16
"Returns instances of this reference type. " "Returns instances of this reference type. "
"Only instances that are reachable for the purposes of " "Only instances that are reachable for the purposes of "
"garbage collection are returned. " "garbage collection are returned. "
"<p>Since JDWP version 1.6. Requires canGetInstanceInfo capability - see " "<p>Since JDWP version 1.6. Requires canGetInstanceInfo capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(Out (Out
(referenceType refType "The reference type ID.") (referenceType refType "The reference type ID.")
(int maxInstances "Maximum number of instances to return. Must be non-negative. " (int maxInstances "Maximum number of instances to return. Must be non-negative. "
"If zero, all instances are returned.") "If zero, all instances are returned.")
) )
(Reply (Reply
(Repeat instances "The number of instances that follow." (Repeat instances "The number of instances that follow."
(tagged-object instance "An instance of this reference type.") (tagged-object instance "An instance of this reference type.")
...@@ -981,22 +981,22 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -981,22 +981,22 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
) )
(Command ClassFileVersion=17 (Command ClassFileVersion=17
"Returns the class file major and minor version numbers, as defined in the class " "Returns the class file major and minor version numbers, as defined in the class "
"file format of the Java Virtual Machine specification. " "file format of the Java Virtual Machine specification. "
"<p>Since JDWP version 1.6. " "<p>Since JDWP version 1.6. "
(Out (Out
(referenceType refType "The class.") (referenceType refType "The class.")
) )
(Reply (Reply
(int majorVersion "Major version number") (int majorVersion "Major version number")
(int minorVersion "Minor version number") (int minorVersion "Minor version number")
) )
(ErrorSet (ErrorSet
(Error INVALID_CLASS "refType is not the ID of a reference " (Error INVALID_CLASS "refType is not the ID of a reference "
"type.") "type.")
(Error INVALID_OBJECT "refType is not a known ID.") (Error INVALID_OBJECT "refType is not a known ID.")
(Error ABSENT_INFORMATION "The class file version information is " (Error ABSENT_INFORMATION "The class file version information is "
"absent for primitive and array types.") "absent for primitive and array types.")
(Error VM_DEAD) (Error VM_DEAD)
) )
) )
...@@ -1005,7 +1005,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1005,7 +1005,7 @@ JDWP "Java(tm) Debug Wire Protocol"
"constant_pool item of the Class File Format in " "constant_pool item of the Class File Format in "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"<p>Since JDWP version 1.6. Requires canGetConstantPool capability - see " "<p>Since JDWP version 1.6. Requires canGetConstantPool capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."" "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>.""
(Out (Out
(referenceType refType "The class.") (referenceType refType "The class.")
) )
...@@ -1024,8 +1024,8 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1024,8 +1024,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(Error INVALID_OBJECT "refType is not a known ID.") (Error INVALID_OBJECT "refType is not a known ID.")
(Error NOT_IMPLEMENTED "If the target virtual machine does not " (Error NOT_IMPLEMENTED "If the target virtual machine does not "
"support the retrieval of constant pool information.") "support the retrieval of constant pool information.")
(Error ABSENT_INFORMATION "The Constant Pool information is " (Error ABSENT_INFORMATION "The Constant Pool information is "
"absent for primitive and array types.") "absent for primitive and array types.")
(Error VM_DEAD) (Error VM_DEAD)
) )
) )
...@@ -1037,7 +1037,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1037,7 +1037,7 @@ JDWP "Java(tm) Debug Wire Protocol"
(classType clazz "The class type ID.") (classType clazz "The class type ID.")
) )
(Reply (Reply
(classType superclass (classType superclass
"The superclass (null if the class ID for java.lang.Object is specified).") "The superclass (null if the class ID for java.lang.Object is specified).")
) )
(ErrorSet (ErrorSet
...@@ -1048,14 +1048,14 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1048,14 +1048,14 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command SetValues=2 (Command SetValues=2
"Sets the value of one or more static fields. " "Sets the value of one or more static fields. "
"Each field must be member of the class type " "Each field must be member of the class type "
"or one of its superclasses, superinterfaces, or implemented interfaces. " "or one of its superclasses, superinterfaces, or implemented interfaces. "
"Access control is not enforced; for example, the values of private " "Access control is not enforced; for example, the values of private "
"fields can be set. Final fields cannot be set." "fields can be set. Final fields cannot be set."
"For primitive values, the value's type must match the " "For primitive values, the value's type must match the "
"field's type exactly. For object values, there must exist a " "field's type exactly. For object values, there must exist a "
"widening reference conversion from the value's type to the "widening reference conversion from the value's type to the
"field's type and the field's type must be loaded. " "field's type and the field's type must be loaded. "
(Out (Out
(classType clazz "The class type ID.") (classType clazz "The class type ID.")
(Repeat values "The number of fields to set." (Repeat values "The number of fields to set."
...@@ -1074,36 +1074,36 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1074,36 +1074,36 @@ JDWP "Java(tm) Debug Wire Protocol"
"object field is not a known ID.") "object field is not a known ID.")
(Error INVALID_FIELDID) (Error INVALID_FIELDID)
(Error VM_DEAD) (Error VM_DEAD)
) )
) )
(Command InvokeMethod=3 (Command InvokeMethod=3
"Invokes a static method. " "Invokes a static method. "
"The method must be member of the class type " "The method must be member of the class type "
"or one of its superclasses, superinterfaces, or implemented interfaces. " "or one of its superclasses, superinterfaces, or implemented interfaces. "
"Access control is not enforced; for example, private " "Access control is not enforced; for example, private "
"methods can be invoked." "methods can be invoked."
"<p>" "<p>"
"The method invocation will occur in the specified thread. " "The method invocation will occur in the specified thread. "
"Method invocation can occur only if the specified thread " "Method invocation can occur only if the specified thread "
"has been suspended by an event. " "has been suspended by an event. "
"Method invocation is not supported " "Method invocation is not supported "
"when the target VM has been suspended by the front-end. " "when the target VM has been suspended by the front-end. "
"<p>" "<p>"
"The specified method is invoked with the arguments in the specified " "The specified method is invoked with the arguments in the specified "
"argument list. " "argument list. "
"The method invocation is synchronous; the reply packet is not " "The method invocation is synchronous; the reply packet is not "
"sent until the invoked method returns in the target VM. " "sent until the invoked method returns in the target VM. "
"The return value (possibly the void value) is " "The return value (possibly the void value) is "
"included in the reply packet. " "included in the reply packet. "
"If the invoked method throws an exception, the " "If the invoked method throws an exception, the "
"exception object ID is set in the reply packet; otherwise, the " "exception object ID is set in the reply packet; otherwise, the "
"exception object ID is null. " "exception object ID is null. "
"<p>" "<p>"
"For primitive arguments, the argument value's type must match the " "For primitive arguments, the argument value's type must match the "
"argument's type exactly. For object arguments, there must exist a " "argument's type exactly. For object arguments, there must exist a "
"widening reference conversion from the argument value's type to the " "widening reference conversion from the argument value's type to the "
"argument's type and the argument's type must be loaded. " "argument's type and the argument's type must be loaded. "
"<p>" "<p>"
"By default, all threads in the target VM are resumed while " "By default, all threads in the target VM are resumed while "
"the method is being invoked if they were previously " "the method is being invoked if they were previously "
"suspended by an event or by command. " "suspended by an event or by command. "
...@@ -1114,28 +1114,28 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1114,28 +1114,28 @@ JDWP "Java(tm) Debug Wire Protocol"
"Note, however, that this implicit resume acts exactly like " "Note, however, that this implicit resume acts exactly like "
"the ThreadReference resume command, so if the thread's suspend " "the ThreadReference resume command, so if the thread's suspend "
"count is greater than 1, it will remain in a suspended state " "count is greater than 1, it will remain in a suspended state "
"during the invocation. By default, when the invocation completes, " "during the invocation. By default, when the invocation completes, "
"all threads in the target VM are suspended, regardless their state " "all threads in the target VM are suspended, regardless their state "
"before the invocation. " "before the invocation. "
"<p>" "<p>"
"The resumption of other threads during the invoke can be prevented " "The resumption of other threads during the invoke can be prevented "
"by specifying the INVOKE_SINGLE_THREADED " "by specifying the INVOKE_SINGLE_THREADED "
"bit flag in the <code>options</code> field; however, " "bit flag in the <code>options</code> field; however, "
"there is no protection against or recovery from the deadlocks " "there is no protection against or recovery from the deadlocks "
"described above, so this option should be used with great caution. " "described above, so this option should be used with great caution. "
"Only the specified thread will be resumed (as described for all " "Only the specified thread will be resumed (as described for all "
"threads above). Upon completion of a single threaded invoke, the invoking thread " "threads above). Upon completion of a single threaded invoke, the invoking thread "
"will be suspended once again. Note that any threads started during " "will be suspended once again. Note that any threads started during "
"the single threaded invocation will not be suspended when the " "the single threaded invocation will not be suspended when the "
"invocation completes. " "invocation completes. "
"<p>" "<p>"
"If the target VM is disconnected during the invoke (for example, through " "If the target VM is disconnected during the invoke (for example, through "
"the VirtualMachine dispose command) the method invocation continues. " "the VirtualMachine dispose command) the method invocation continues. "
(Out (Out
(classType clazz "The class type ID.") (classType clazz "The class type ID.")
(threadObject thread "The thread in which to invoke.") (threadObject thread "The thread in which to invoke.")
(method methodID "The method to invoke.") (method methodID "The method to invoke.")
(Repeat arguments (Repeat arguments
(value arg "The argument value.") (value arg "The argument value.")
) )
(int options "Invocation <a href=\"#JDWP_InvokeOptions\">options</a>") (int options "Invocation <a href=\"#JDWP_InvokeOptions\">options</a>")
...@@ -1155,30 +1155,30 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1155,30 +1155,30 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command NewInstance=4 (Command NewInstance=4
"Creates a new object of this type, invoking the specified " "Creates a new object of this type, invoking the specified "
"constructor. The constructor method ID must be a member of " "constructor. The constructor method ID must be a member of "
"the class type." "the class type."
"<p>" "<p>"
"Instance creation will occur in the specified thread. " "Instance creation will occur in the specified thread. "
"Instance creation can occur only if the specified thread " "Instance creation can occur only if the specified thread "
"has been suspended by an event. " "has been suspended by an event. "
"Method invocation is not supported " "Method invocation is not supported "
"when the target VM has been suspended by the front-end. " "when the target VM has been suspended by the front-end. "
"<p>" "<p>"
"The specified constructor is invoked with the arguments in the specified " "The specified constructor is invoked with the arguments in the specified "
"argument list. " "argument list. "
"The constructor invocation is synchronous; the reply packet is not " "The constructor invocation is synchronous; the reply packet is not "
"sent until the invoked method returns in the target VM. " "sent until the invoked method returns in the target VM. "
"The return value (possibly the void value) is " "The return value (possibly the void value) is "
"included in the reply packet. " "included in the reply packet. "
"If the constructor throws an exception, the " "If the constructor throws an exception, the "
"exception object ID is set in the reply packet; otherwise, the " "exception object ID is set in the reply packet; otherwise, the "
"exception object ID is null. " "exception object ID is null. "
"<p>" "<p>"
"For primitive arguments, the argument value's type must match the " "For primitive arguments, the argument value's type must match the "
"argument's type exactly. For object arguments, there must exist a " "argument's type exactly. For object arguments, there must exist a "
"widening reference conversion from the argument value's type to the " "widening reference conversion from the argument value's type to the "
"argument's type and the argument's type must be loaded. " "argument's type and the argument's type must be loaded. "
"<p>" "<p>"
"By default, all threads in the target VM are resumed while " "By default, all threads in the target VM are resumed while "
"the method is being invoked if they were previously " "the method is being invoked if they were previously "
"suspended by an event or by command. " "suspended by an event or by command. "
...@@ -1189,20 +1189,20 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1189,20 +1189,20 @@ JDWP "Java(tm) Debug Wire Protocol"
"Note, however, that this implicit resume acts exactly like " "Note, however, that this implicit resume acts exactly like "
"the ThreadReference resume command, so if the thread's suspend " "the ThreadReference resume command, so if the thread's suspend "
"count is greater than 1, it will remain in a suspended state " "count is greater than 1, it will remain in a suspended state "
"during the invocation. By default, when the invocation completes, " "during the invocation. By default, when the invocation completes, "
"all threads in the target VM are suspended, regardless their state " "all threads in the target VM are suspended, regardless their state "
"before the invocation. " "before the invocation. "
"<p>" "<p>"
"The resumption of other threads during the invoke can be prevented " "The resumption of other threads during the invoke can be prevented "
"by specifying the INVOKE_SINGLE_THREADED " "by specifying the INVOKE_SINGLE_THREADED "
"bit flag in the <code>options</code> field; however, " "bit flag in the <code>options</code> field; however, "
"there is no protection against or recovery from the deadlocks " "there is no protection against or recovery from the deadlocks "
"described above, so this option should be used with great caution. " "described above, so this option should be used with great caution. "
"Only the specified thread will be resumed (as described for all " "Only the specified thread will be resumed (as described for all "
"threads above). Upon completion of a single threaded invoke, the invoking thread " "threads above). Upon completion of a single threaded invoke, the invoking thread "
"will be suspended once again. Note that any threads started during " "will be suspended once again. Note that any threads started during "
"the single threaded invocation will not be suspended when the " "the single threaded invocation will not be suspended when the "
"invocation completes. " "invocation completes. "
"<p>" "<p>"
"If the target VM is disconnected during the invoke (for example, through " "If the target VM is disconnected during the invoke (for example, through "
"the VirtualMachine dispose command) the method invocation continues. " "the VirtualMachine dispose command) the method invocation continues. "
...@@ -1210,14 +1210,14 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1210,14 +1210,14 @@ JDWP "Java(tm) Debug Wire Protocol"
(classType clazz "The class type ID.") (classType clazz "The class type ID.")
(threadObject thread "The thread in which to invoke the constructor.") (threadObject thread "The thread in which to invoke the constructor.")
(method methodID "The constructor to invoke.") (method methodID "The constructor to invoke.")
(Repeat arguments (Repeat arguments
(value arg "The argument value.") (value arg "The argument value.")
) )
(int options "Constructor invocation <a href=\"#JDWP_InvokeOptions\">options</a>") (int options "Constructor invocation <a href=\"#JDWP_InvokeOptions\">options</a>")
) )
(Reply (Reply
(tagged-object newObject "The newly created object, or null " (tagged-object newObject "The newly created object, or null "
"if the constructor threw an exception.") "if the constructor threw an exception.")
(tagged-object exception "The thrown exception, if any; otherwise, null.") (tagged-object exception "The thrown exception, if any; otherwise, null.")
) )
(ErrorSet (ErrorSet
...@@ -1239,8 +1239,8 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1239,8 +1239,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(arrayType arrType "The array type of the new instance.") (arrayType arrType "The array type of the new instance.")
(int length "The length of the array.") (int length "The length of the array.")
) )
(Reply (Reply
(tagged-object newArray "The newly created array object. ") (tagged-object newArray "The newly created array object. ")
) )
(ErrorSet (ErrorSet
(Error INVALID_ARRAY) (Error INVALID_ARRAY)
...@@ -1254,11 +1254,11 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1254,11 +1254,11 @@ JDWP "Java(tm) Debug Wire Protocol"
(CommandSet Method=6 (CommandSet Method=6
(Command LineTable=1 (Command LineTable=1
"Returns line number information for the method, if present. " "Returns line number information for the method, if present. "
"The line table maps source line numbers to the initial code index " "The line table maps source line numbers to the initial code index "
"of the line. The line table " "of the line. The line table "
"is ordered by code index (from lowest to highest). The line number " "is ordered by code index (from lowest to highest). The line number "
"information is constant unless a new class definition is installed " "information is constant unless a new class definition is installed "
"using <a href=\"#JDWP_VirtualMachine_RedefineClasses\">RedefineClasses</a>." "using <a href=\"#JDWP_VirtualMachine_RedefineClasses\">RedefineClasses</a>."
(Out (Out
(referenceType refType "The class.") (referenceType refType "The class.")
(method methodID "The method.") (method methodID "The method.")
...@@ -1269,7 +1269,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1269,7 +1269,7 @@ JDWP "Java(tm) Debug Wire Protocol"
(Repeat lines "The number of entries in the line table for this method." (Repeat lines "The number of entries in the line table for this method."
(Group LineInfo (Group LineInfo
(long lineCodeIndex "Initial code index of the line, " (long lineCodeIndex "Initial code index of the line, "
"start <= lineCodeIndex < end") "start <= lineCodeIndex < end")
(int lineNumber "Line number.") (int lineNumber "Line number.")
) )
) )
...@@ -1284,9 +1284,9 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1284,9 +1284,9 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command VariableTable=2 (Command VariableTable=2
"Returns variable information for the method. The variable table " "Returns variable information for the method. The variable table "
"includes arguments and locals declared within the method. For " "includes arguments and locals declared within the method. For "
"instance methods, the \"this\" reference is included in the " "instance methods, the \"this\" reference is included in the "
"table. Also, synthetic variables may be present. " "table. Also, synthetic variables may be present. "
(Out (Out
(referenceType refType "The class.") (referenceType refType "The class.")
(method methodID "The method.") (method methodID "The method.")
...@@ -1297,16 +1297,16 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1297,16 +1297,16 @@ JDWP "Java(tm) Debug Wire Protocol"
(Repeat slots "The number of variables." (Repeat slots "The number of variables."
(Group SlotInfo "Information about the variable." (Group SlotInfo "Information about the variable."
(long codeIndex (long codeIndex
"First code index at which the variable is visible (unsigned). " "First code index at which the variable is visible (unsigned). "
"Used in conjunction with <code>length</code>. " "Used in conjunction with <code>length</code>. "
"The variable can be get or set only when the current " "The variable can be get or set only when the current "
"<code>codeIndex</code> <= current frame code index < <code>codeIndex + length</code> ") "<code>codeIndex</code> <= current frame code index < <code>codeIndex + length</code> ")
(string name "The variable's name.") (string name "The variable's name.")
(string signature "The variable type's JNI signature.") (string signature "The variable type's JNI signature.")
(int length (int length
"Unsigned value used in conjunction with <code>codeIndex</code>. " "Unsigned value used in conjunction with <code>codeIndex</code>. "
"The variable can be get or set only when the current " "The variable can be get or set only when the current "
"<code>codeIndex</code> <= current frame code index < <code>code index + length</code> ") "<code>codeIndex</code> <= current frame code index < <code>code index + length</code> ")
(int slot "The local variable's index in its frame") (int slot "The local variable's index in its frame")
) )
) )
...@@ -1323,8 +1323,8 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1323,8 +1323,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command Bytecodes=3 (Command Bytecodes=3
"Retrieve the method's bytecodes as defined in " "Retrieve the method's bytecodes as defined in "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"Requires canGetBytecodes capability - see " "Requires canGetBytecodes capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(Out (Out
(referenceType refType "The class.") (referenceType refType "The class.")
(method methodID "The method.") (method methodID "The method.")
...@@ -1346,11 +1346,11 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1346,11 +1346,11 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command IsObsolete=4 (Command IsObsolete=4
"Determine if this method is obsolete. A method is obsolete if it has been replaced " "Determine if this method is obsolete. A method is obsolete if it has been replaced "
"by a non-equivalent method using the " "by a non-equivalent method using the "
"<a href=\"#JDWP_VirtualMachine_RedefineClasses\">RedefineClasses</a> command. " "<a href=\"#JDWP_VirtualMachine_RedefineClasses\">RedefineClasses</a> command. "
"The original and redefined methods are considered equivalent if their bytecodes are " "The original and redefined methods are considered equivalent if their bytecodes are "
"the same except for indices into the constant pool and the referenced constants are " "the same except for indices into the constant pool and the referenced constants are "
"equal." "equal."
(Out (Out
(referenceType refType "The class.") (referenceType refType "The class.")
(method methodID "The method.") (method methodID "The method.")
...@@ -1358,7 +1358,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1358,7 +1358,7 @@ JDWP "Java(tm) Debug Wire Protocol"
(Reply (Reply
(boolean isObsolete "true if this method has been replaced" (boolean isObsolete "true if this method has been replaced"
"by a non-equivalent method using" "by a non-equivalent method using"
"the RedefineClasses command.") "the RedefineClasses command.")
) )
(ErrorSet (ErrorSet
(Error INVALID_CLASS "refType is not the ID of a reference " (Error INVALID_CLASS "refType is not the ID of a reference "
...@@ -1373,10 +1373,10 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1373,10 +1373,10 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command VariableTableWithGeneric=5 (Command VariableTableWithGeneric=5
"Returns variable information for the method, including " "Returns variable information for the method, including "
"generic signatures for the variables. The variable table " "generic signatures for the variables. The variable table "
"includes arguments and locals declared within the method. For " "includes arguments and locals declared within the method. For "
"instance methods, the \"this\" reference is included in the " "instance methods, the \"this\" reference is included in the "
"table. Also, synthetic variables may be present. " "table. Also, synthetic variables may be present. "
"Generic signatures are described in the signature attribute " "Generic signatures are described in the signature attribute "
"section in " "section in "
"<cite>The Java&trade; Virtual Machine Specification</cite>. " "<cite>The Java&trade; Virtual Machine Specification</cite>. "
"Since JDWP version 1.5." "Since JDWP version 1.5."
...@@ -1390,18 +1390,18 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1390,18 +1390,18 @@ JDWP "Java(tm) Debug Wire Protocol"
(Repeat slots "The number of variables." (Repeat slots "The number of variables."
(Group SlotInfo "Information about the variable." (Group SlotInfo "Information about the variable."
(long codeIndex (long codeIndex
"First code index at which the variable is visible (unsigned). " "First code index at which the variable is visible (unsigned). "
"Used in conjunction with <code>length</code>. " "Used in conjunction with <code>length</code>. "
"The variable can be get or set only when the current " "The variable can be get or set only when the current "
"<code>codeIndex</code> <= current frame code index < <code>codeIndex + length</code> ") "<code>codeIndex</code> <= current frame code index < <code>codeIndex + length</code> ")
(string name "The variable's name.") (string name "The variable's name.")
(string signature "The variable type's JNI signature.") (string signature "The variable type's JNI signature.")
(string genericSignature "The variable type's generic " (string genericSignature "The variable type's generic "
"signature or an empty string if there is none.") "signature or an empty string if there is none.")
(int length (int length
"Unsigned value used in conjunction with <code>codeIndex</code>. " "Unsigned value used in conjunction with <code>codeIndex</code>. "
"The variable can be get or set only when the current " "The variable can be get or set only when the current "
"<code>codeIndex</code> <= current frame code index < <code>code index + length</code> ") "<code>codeIndex</code> <= current frame code index < <code>code index + length</code> ")
(int slot "The local variable's index in its frame") (int slot "The local variable's index in its frame")
) )
) )
...@@ -1416,7 +1416,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1416,7 +1416,7 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
) )
) )
(CommandSet Field=8 (CommandSet Field=8
) )
(CommandSet ObjectReference=9 (CommandSet ObjectReference=9
...@@ -1427,8 +1427,8 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1427,8 +1427,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(object object "The object ID") (object object "The object ID")
) )
(Reply (Reply
(byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> " (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
"of following reference type. ") "of following reference type. ")
(referenceTypeID typeID "The runtime reference type.") (referenceTypeID typeID "The runtime reference type.")
) )
(ErrorSet (ErrorSet
...@@ -1438,10 +1438,10 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1438,10 +1438,10 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command GetValues=2 (Command GetValues=2
"Returns the value of one or more instance fields. " "Returns the value of one or more instance fields. "
"Each field must be member of the object's type " "Each field must be member of the object's type "
"or one of its superclasses, superinterfaces, or implemented interfaces. " "or one of its superclasses, superinterfaces, or implemented interfaces. "
"Access control is not enforced; for example, the values of private " "Access control is not enforced; for example, the values of private "
"fields can be obtained." "fields can be obtained."
(Out (Out
(object object "The object ID") (object object "The object ID")
(Repeat fields "The number of values to get" (Repeat fields "The number of values to get"
...@@ -1452,9 +1452,9 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1452,9 +1452,9 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Reply (Reply
(Repeat values "The number of values returned, always equal to 'fields', " (Repeat values "The number of values returned, always equal to 'fields', "
"the number of values to get. Field values are ordered " "the number of values to get. Field values are ordered "
"in the reply in the same order as corresponding fieldIDs " "in the reply in the same order as corresponding fieldIDs "
"in the command." "in the command."
(value value "The field value") (value value "The field value")
) )
) )
...@@ -1466,14 +1466,14 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1466,14 +1466,14 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command SetValues=3 (Command SetValues=3
"Sets the value of one or more instance fields. " "Sets the value of one or more instance fields. "
"Each field must be member of the object's type " "Each field must be member of the object's type "
"or one of its superclasses, superinterfaces, or implemented interfaces. " "or one of its superclasses, superinterfaces, or implemented interfaces. "
"Access control is not enforced; for example, the values of private " "Access control is not enforced; for example, the values of private "
"fields can be set. " "fields can be set. "
"For primitive values, the value's type must match the " "For primitive values, the value's type must match the "
"field's type exactly. For object values, there must be a " "field's type exactly. For object values, there must be a "
"widening reference conversion from the value's type to the "widening reference conversion from the value's type to the
"field's type and the field's type must be loaded. " "field's type and the field's type must be loaded. "
(Out (Out
(object object "The object ID") (object object "The object ID")
(Repeat values "The number of fields to set." (Repeat values "The number of fields to set."
...@@ -1489,13 +1489,13 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1489,13 +1489,13 @@ JDWP "Java(tm) Debug Wire Protocol"
(Error INVALID_OBJECT) (Error INVALID_OBJECT)
(Error INVALID_FIELDID) (Error INVALID_FIELDID)
(Error VM_DEAD) (Error VM_DEAD)
) )
) )
(Command MonitorInfo=5 (Command MonitorInfo=5
"Returns monitor information for an object. All threads int the VM must " "Returns monitor information for an object. All threads int the VM must "
"be suspended." "be suspended."
"Requires canGetMonitorInfo capability - see " "Requires canGetMonitorInfo capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(Out (Out
(object object "The object ID") (object object "The object ID")
) )
...@@ -1503,7 +1503,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1503,7 +1503,7 @@ JDWP "Java(tm) Debug Wire Protocol"
(threadObject owner "The monitor owner, or null if it is not currently owned.") (threadObject owner "The monitor owner, or null if it is not currently owned.")
(int entryCount "The number of times the monitor has been entered.") (int entryCount "The number of times the monitor has been entered.")
(Repeat waiters "The number of threads that are waiting for the monitor " (Repeat waiters "The number of threads that are waiting for the monitor "
"0 if there is no current owner" "0 if there is no current owner"
(threadObject thread "A thread waiting for this monitor.") (threadObject thread "A thread waiting for this monitor.")
) )
) )
...@@ -1515,32 +1515,32 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1515,32 +1515,32 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command InvokeMethod=6 (Command InvokeMethod=6
"Invokes a instance method. " "Invokes a instance method. "
"The method must be member of the object's type " "The method must be member of the object's type "
"or one of its superclasses, superinterfaces, or implemented interfaces. " "or one of its superclasses, superinterfaces, or implemented interfaces. "
"Access control is not enforced; for example, private " "Access control is not enforced; for example, private "
"methods can be invoked." "methods can be invoked."
"<p>" "<p>"
"The method invocation will occur in the specified thread. " "The method invocation will occur in the specified thread. "
"Method invocation can occur only if the specified thread " "Method invocation can occur only if the specified thread "
"has been suspended by an event. " "has been suspended by an event. "
"Method invocation is not supported " "Method invocation is not supported "
"when the target VM has been suspended by the front-end. " "when the target VM has been suspended by the front-end. "
"<p>" "<p>"
"The specified method is invoked with the arguments in the specified " "The specified method is invoked with the arguments in the specified "
"argument list. " "argument list. "
"The method invocation is synchronous; the reply packet is not " "The method invocation is synchronous; the reply packet is not "
"sent until the invoked method returns in the target VM. " "sent until the invoked method returns in the target VM. "
"The return value (possibly the void value) is " "The return value (possibly the void value) is "
"included in the reply packet. " "included in the reply packet. "
"If the invoked method throws an exception, the " "If the invoked method throws an exception, the "
"exception object ID is set in the reply packet; otherwise, the " "exception object ID is set in the reply packet; otherwise, the "
"exception object ID is null. " "exception object ID is null. "
"<p>" "<p>"
"For primitive arguments, the argument value's type must match the " "For primitive arguments, the argument value's type must match the "
"argument's type exactly. For object arguments, there must be a " "argument's type exactly. For object arguments, there must be a "
"widening reference conversion from the argument value's type to the " "widening reference conversion from the argument value's type to the "
"argument's type and the argument's type must be loaded. " "argument's type and the argument's type must be loaded. "
"<p>" "<p>"
"By default, all threads in the target VM are resumed while " "By default, all threads in the target VM are resumed while "
"the method is being invoked if they were previously " "the method is being invoked if they were previously "
"suspended by an event or by command. " "suspended by an event or by command. "
...@@ -1551,20 +1551,20 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1551,20 +1551,20 @@ JDWP "Java(tm) Debug Wire Protocol"
"Note, however, that this implicit resume acts exactly like " "Note, however, that this implicit resume acts exactly like "
"the ThreadReference resume command, so if the thread's suspend " "the ThreadReference resume command, so if the thread's suspend "
"count is greater than 1, it will remain in a suspended state " "count is greater than 1, it will remain in a suspended state "
"during the invocation. By default, when the invocation completes, " "during the invocation. By default, when the invocation completes, "
"all threads in the target VM are suspended, regardless their state " "all threads in the target VM are suspended, regardless their state "
"before the invocation. " "before the invocation. "
"<p>" "<p>"
"The resumption of other threads during the invoke can be prevented " "The resumption of other threads during the invoke can be prevented "
"by specifying the INVOKE_SINGLE_THREADED " "by specifying the INVOKE_SINGLE_THREADED "
"bit flag in the <code>options</code> field; however, " "bit flag in the <code>options</code> field; however, "
"there is no protection against or recovery from the deadlocks " "there is no protection against or recovery from the deadlocks "
"described above, so this option should be used with great caution. " "described above, so this option should be used with great caution. "
"Only the specified thread will be resumed (as described for all " "Only the specified thread will be resumed (as described for all "
"threads above). Upon completion of a single threaded invoke, the invoking thread " "threads above). Upon completion of a single threaded invoke, the invoking thread "
"will be suspended once again. Note that any threads started during " "will be suspended once again. Note that any threads started during "
"the single threaded invocation will not be suspended when the " "the single threaded invocation will not be suspended when the "
"invocation completes. " "invocation completes. "
"<p>" "<p>"
"If the target VM is disconnected during the invoke (for example, through " "If the target VM is disconnected during the invoke (for example, through "
"the VirtualMachine dispose command) the method invocation continues. " "the VirtualMachine dispose command) the method invocation continues. "
...@@ -1593,29 +1593,29 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1593,29 +1593,29 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
) )
(Command DisableCollection=7 (Command DisableCollection=7
"Prevents garbage collection for the given object. By " "Prevents garbage collection for the given object. By "
"default all objects in back-end replies may be " "default all objects in back-end replies may be "
"collected at any time the target VM is running. A call to " "collected at any time the target VM is running. A call to "
"this command guarantees that the object will not be " "this command guarantees that the object will not be "
"collected. The " "collected. The "
"<a href=\"#JDWP_ObjectReference_EnableCollection\">EnableCollection</a> " "<a href=\"#JDWP_ObjectReference_EnableCollection\">EnableCollection</a> "
"command can be used to " "command can be used to "
"allow collection once again. " "allow collection once again. "
"<p>" "<p>"
"Note that while the target VM is suspended, no garbage " "Note that while the target VM is suspended, no garbage "
"collection will occur because all threads are suspended. " "collection will occur because all threads are suspended. "
"The typical examination of variables, fields, and arrays " "The typical examination of variables, fields, and arrays "
"during the suspension is safe without explicitly disabling " "during the suspension is safe without explicitly disabling "
"garbage collection. " "garbage collection. "
"<p>" "<p>"
"This method should be used sparingly, as it alters the " "This method should be used sparingly, as it alters the "
"pattern of garbage collection in the target VM and, " "pattern of garbage collection in the target VM and, "
"consequently, may result in application behavior under the " "consequently, may result in application behavior under the "
"debugger that differs from its non-debugged behavior. " "debugger that differs from its non-debugged behavior. "
(Out (Out
(object object "The object ID") (object object "The object ID")
) )
(Reply "none" (Reply "none"
) )
(ErrorSet (ErrorSet
(Error INVALID_OBJECT) (Error INVALID_OBJECT)
...@@ -1623,13 +1623,13 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1623,13 +1623,13 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
) )
(Command EnableCollection=8 (Command EnableCollection=8
"Permits garbage collection for this object. By default all " "Permits garbage collection for this object. By default all "
"objects returned by JDWP may become unreachable in the target VM, " "objects returned by JDWP may become unreachable in the target VM, "
"and hence may be garbage collected. A call to this command is " "and hence may be garbage collected. A call to this command is "
"necessary only if garbage collection was previously disabled with " "necessary only if garbage collection was previously disabled with "
"the <a href=\"#JDWP_ObjectReference_DisableCollection\">DisableCollection</a> " "the <a href=\"#JDWP_ObjectReference_DisableCollection\">DisableCollection</a> "
"command." "command."
(Out (Out
(object object "The object ID") (object object "The object ID")
) )
(Reply "none" (Reply "none"
...@@ -1640,7 +1640,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1640,7 +1640,7 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command IsCollected=9 (Command IsCollected=9
"Determines whether an object has been garbage collected in the " "Determines whether an object has been garbage collected in the "
"target VM. " "target VM. "
(Out (Out
(object object "The object ID") (object object "The object ID")
) )
...@@ -1660,13 +1660,13 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1660,13 +1660,13 @@ JDWP "Java(tm) Debug Wire Protocol"
"such as from a local variable in a stack frame, or from a JNI global " "such as from a local variable in a stack frame, or from a JNI global "
"reference. Such non-object referrers are not returned by this command. " "reference. Such non-object referrers are not returned by this command. "
"<p>Since JDWP version 1.6. Requires canGetInstanceInfo capability - see " "<p>Since JDWP version 1.6. Requires canGetInstanceInfo capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(Out (Out
(object object "The object ID") (object object "The object ID")
(int maxReferrers "Maximum number of referring objects to return. " (int maxReferrers "Maximum number of referring objects to return. "
"Must be non-negative. If zero, all referring " "Must be non-negative. If zero, all referring "
"objects are returned.") "objects are returned.")
) )
(Reply (Reply
(Repeat referringObjects "The number of objects that follow." (Repeat referringObjects "The number of objects that follow."
(tagged-object instance "An object that references this object.") (tagged-object instance "An object that references this object.")
...@@ -1714,32 +1714,32 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1714,32 +1714,32 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command Suspend=2 (Command Suspend=2
"Suspends the thread. " "Suspends the thread. "
"<p>" "<p>"
"Unlike java.lang.Thread.suspend(), suspends of both " "Unlike java.lang.Thread.suspend(), suspends of both "
"the virtual machine and individual threads are counted. Before " "the virtual machine and individual threads are counted. Before "
"a thread will run again, it must be resumed the same number " "a thread will run again, it must be resumed the same number "
"of times it has been suspended. " "of times it has been suspended. "
"<p>" "<p>"
"Suspending single threads with command has the same " "Suspending single threads with command has the same "
"dangers java.lang.Thread.suspend(). If the suspended " "dangers java.lang.Thread.suspend(). If the suspended "
"thread holds a monitor needed by another running thread, " "thread holds a monitor needed by another running thread, "
"deadlock is possible in the target VM (at least until the " "deadlock is possible in the target VM (at least until the "
"suspended thread is resumed again). " "suspended thread is resumed again). "
"<p>" "<p>"
"The suspended thread is guaranteed to remain suspended until " "The suspended thread is guaranteed to remain suspended until "
"resumed through one of the JDI resume methods mentioned above; " "resumed through one of the JDI resume methods mentioned above; "
"the application in the target VM cannot resume the suspended thread " "the application in the target VM cannot resume the suspended thread "
"through {@link java.lang.Thread#resume}. " "through {@link java.lang.Thread#resume}. "
"<p>" "<p>"
"Note that this doesn't change the status of the thread (see the " "Note that this doesn't change the status of the thread (see the "
"<a href=\"#JDWP_ThreadReference_Status\">ThreadStatus</a> command.) " "<a href=\"#JDWP_ThreadReference_Status\">ThreadStatus</a> command.) "
"For example, if it was " "For example, if it was "
"Running, it will still appear running to other threads. " "Running, it will still appear running to other threads. "
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
) )
(Reply "none" (Reply "none"
) )
(ErrorSet (ErrorSet
(Error INVALID_THREAD) (Error INVALID_THREAD)
(Error INVALID_OBJECT "thread is not a known ID.") (Error INVALID_OBJECT "thread is not a known ID.")
...@@ -1747,12 +1747,12 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1747,12 +1747,12 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
) )
(Command Resume=3 (Command Resume=3
"Resumes the execution of a given thread. If this thread was " "Resumes the execution of a given thread. If this thread was "
"not previously suspended by the front-end, " "not previously suspended by the front-end, "
"calling this command has no effect. " "calling this command has no effect. "
"Otherwise, the count of pending suspends on this thread is " "Otherwise, the count of pending suspends on this thread is "
"decremented. If it is decremented to 0, the thread will " "decremented. If it is decremented to 0, the thread will "
"continue to execute. " "continue to execute. "
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
) )
...@@ -1766,13 +1766,13 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1766,13 +1766,13 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command Status=4 (Command Status=4
"Returns the current status of a thread. The thread status " "Returns the current status of a thread. The thread status "
"reply indicates the thread status the last time it was running. " "reply indicates the thread status the last time it was running. "
"the suspend status provides information on the thread's " "the suspend status provides information on the thread's "
"suspension, if any." "suspension, if any."
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
) )
(Reply (Reply
(int threadStatus "One of the thread status codes " (int threadStatus "One of the thread status codes "
"See <a href=\"#JDWP_ThreadStatus\">JDWP.ThreadStatus</a>") "See <a href=\"#JDWP_ThreadStatus\">JDWP.ThreadStatus</a>")
(int suspendStatus "One of the suspend status codes " (int suspendStatus "One of the suspend status codes "
...@@ -1803,11 +1803,11 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1803,11 +1803,11 @@ JDWP "Java(tm) Debug Wire Protocol"
"The sequence of frames starts with " "The sequence of frames starts with "
"the currently executing frame, followed by its caller, " "the currently executing frame, followed by its caller, "
"and so on. The thread must be suspended, and the returned " "and so on. The thread must be suspended, and the returned "
"frameID is valid only while the thread is suspended. " "frameID is valid only while the thread is suspended. "
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
(int startFrame "The index of the first frame to retrieve.") (int startFrame "The index of the first frame to retrieve.")
(int length (int length
"The count of frames to retrieve " "The count of frames to retrieve "
"(-1 means all remaining). ") "(-1 means all remaining). ")
) )
...@@ -1827,8 +1827,8 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1827,8 +1827,8 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command FrameCount=7 (Command FrameCount=7
"Returns the count of frames on this thread's stack. " "Returns the count of frames on this thread's stack. "
"The thread must be suspended, and the returned " "The thread must be suspended, and the returned "
"count is valid only while the thread is suspended. " "count is valid only while the thread is suspended. "
"Returns JDWP.Error.errorThreadNotSuspended if not suspended. " "Returns JDWP.Error.errorThreadNotSuspended if not suspended. "
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
...@@ -1844,10 +1844,10 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1844,10 +1844,10 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command OwnedMonitors=8 (Command OwnedMonitors=8
"Returns the objects whose monitors have been entered by this thread. " "Returns the objects whose monitors have been entered by this thread. "
"The thread must be suspended, and the returned information is " "The thread must be suspended, and the returned information is "
"relevant only while the thread is suspended. " "relevant only while the thread is suspended. "
"Requires canGetOwnedMonitorInfo capability - see " "Requires canGetOwnedMonitorInfo capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
) )
...@@ -1865,19 +1865,19 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1865,19 +1865,19 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command CurrentContendedMonitor=9 (Command CurrentContendedMonitor=9
"Returns the object, if any, for which this thread is waiting. The " "Returns the object, if any, for which this thread is waiting. The "
"thread may be waiting to enter a monitor, or it may be waiting, via " "thread may be waiting to enter a monitor, or it may be waiting, via "
"the java.lang.Object.wait method, for another thread to invoke the " "the java.lang.Object.wait method, for another thread to invoke the "
"notify method. " "notify method. "
"The thread must be suspended, and the returned information is " "The thread must be suspended, and the returned information is "
"relevant only while the thread is suspended. " "relevant only while the thread is suspended. "
"Requires canGetCurrentContendedMonitor capability - see " "Requires canGetCurrentContendedMonitor capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
) )
(Reply (Reply
(tagged-object monitor "The contended monitor, or null if " (tagged-object monitor "The contended monitor, or null if "
"there is no current contended monitor. ") "there is no current contended monitor. ")
) )
(ErrorSet (ErrorSet
(Error INVALID_THREAD) (Error INVALID_THREAD)
...@@ -1888,11 +1888,11 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1888,11 +1888,11 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command Stop=10 (Command Stop=10
"Stops the thread with an asynchronous exception, as if done by " "Stops the thread with an asynchronous exception, as if done by "
"java.lang.Thread.stop " "java.lang.Thread.stop "
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
(object throwable "Asynchronous exception. This object must " (object throwable "Asynchronous exception. This object must "
"be an instance of java.lang.Throwable or a subclass") "be an instance of java.lang.Throwable or a subclass")
) )
(Reply "none" (Reply "none"
) )
...@@ -1918,12 +1918,12 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1918,12 +1918,12 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command SuspendCount=12 (Command SuspendCount=12
"Get the suspend count for this thread. The suspend count is the " "Get the suspend count for this thread. The suspend count is the "
"number of times the thread has been suspended through the " "number of times the thread has been suspended through the "
"thread-level or VM-level suspend commands without a corresponding resume " "thread-level or VM-level suspend commands without a corresponding resume "
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
) )
(Reply (Reply
(int suspendCount "The number of outstanding suspends of this thread. ") (int suspendCount "The number of outstanding suspends of this thread. ")
) )
(ErrorSet (ErrorSet
...@@ -1937,20 +1937,20 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1937,20 +1937,20 @@ JDWP "Java(tm) Debug Wire Protocol"
"the monitor was acquired. Returns stack depth of -1 if " "the monitor was acquired. Returns stack depth of -1 if "
"the implementation cannot determine the stack depth " "the implementation cannot determine the stack depth "
"(e.g., for monitors acquired by JNI MonitorEnter)." "(e.g., for monitors acquired by JNI MonitorEnter)."
"The thread must be suspended, and the returned information is " "The thread must be suspended, and the returned information is "
"relevant only while the thread is suspended. " "relevant only while the thread is suspended. "
"Requires canGetMonitorFrameInfo capability - see " "Requires canGetMonitorFrameInfo capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. " "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
"<p>Since JDWP version 1.6. " "<p>Since JDWP version 1.6. "
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
) )
(Reply (Reply
(Repeat owned "The number of owned monitors" (Repeat owned "The number of owned monitors"
(Group monitor (Group monitor
(tagged-object monitor "An owned monitor") (tagged-object monitor "An owned monitor")
(int stack_depth "Stack depth location where monitor was acquired") (int stack_depth "Stack depth location where monitor was acquired")
) )
) )
) )
...@@ -1964,45 +1964,45 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -1964,45 +1964,45 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command ForceEarlyReturn=14 (Command ForceEarlyReturn=14
"Force a method to return before it reaches a return " "Force a method to return before it reaches a return "
"statement. " "statement. "
"<p>" "<p>"
"The method which will return early is referred to as the " "The method which will return early is referred to as the "
"called method. The called method is the current method (as " "called method. The called method is the current method (as "
"defined by the Frames section in " "defined by the Frames section in "
"<cite>The Java&trade; Virtual Machine Specification</cite>) " "<cite>The Java&trade; Virtual Machine Specification</cite>) "
"for the specified thread at the time this command " "for the specified thread at the time this command "
"is received. " "is received. "
"<p>" "<p>"
"The specified thread must be suspended. " "The specified thread must be suspended. "
"The return occurs when execution of Java programming " "The return occurs when execution of Java programming "
"language code is resumed on this thread. Between sending this " "language code is resumed on this thread. Between sending this "
"command and resumption of thread execution, the " "command and resumption of thread execution, the "
"state of the stack is undefined. " "state of the stack is undefined. "
"<p>" "<p>"
"No further instructions are executed in the called " "No further instructions are executed in the called "
"method. Specifically, finally blocks are not executed. Note: " "method. Specifically, finally blocks are not executed. Note: "
"this can cause inconsistent states in the application. " "this can cause inconsistent states in the application. "
"<p>" "<p>"
"A lock acquired by calling the called method (if it is a " "A lock acquired by calling the called method (if it is a "
"synchronized method) and locks acquired by entering " "synchronized method) and locks acquired by entering "
"synchronized blocks within the called method are " "synchronized blocks within the called method are "
"released. Note: this does not apply to JNI locks or " "released. Note: this does not apply to JNI locks or "
"java.util.concurrent.locks locks. " "java.util.concurrent.locks locks. "
"<p>" "<p>"
"Events, such as MethodExit, are generated as they would be in " "Events, such as MethodExit, are generated as they would be in "
"a normal return. " "a normal return. "
"<p>" "<p>"
"The called method must be a non-native Java programming " "The called method must be a non-native Java programming "
"language method. Forcing return on a thread with only one " "language method. Forcing return on a thread with only one "
"frame on the stack causes the thread to exit when resumed. " "frame on the stack causes the thread to exit when resumed. "
"<p>" "<p>"
"For void methods, the value must be a void value. " "For void methods, the value must be a void value. "
"For methods that return primitive values, the value's type must " "For methods that return primitive values, the value's type must "
"match the return type exactly. For object values, there must be a " "match the return type exactly. For object values, there must be a "
"widening reference conversion from the value's type to the " "widening reference conversion from the value's type to the "
"return type type and the return type must be loaded. " "return type type and the return type must be loaded. "
"<p>" "<p>"
"Since JDWP version 1.6. Requires canForceEarlyReturn capability - see " "Since JDWP version 1.6. Requires canForceEarlyReturn capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
(value value "The value to return. ") (value value "The value to return. ")
...@@ -2050,8 +2050,8 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2050,8 +2050,8 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Reply (Reply
(threadGroupObject parentGroup "The parent thread group object, or " (threadGroupObject parentGroup "The parent thread group object, or "
"null if the given thread group " "null if the given thread group "
"is a top-level thread group") "is a top-level thread group")
) )
(ErrorSet (ErrorSet
(Error INVALID_THREAD_GROUP) (Error INVALID_THREAD_GROUP)
...@@ -2062,7 +2062,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2062,7 +2062,7 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command Children=3 (Command Children=3
"Returns the live threads and active thread groups directly contained " "Returns the live threads and active thread groups directly contained "
"in this thread group. Threads and thread groups in child " "in this thread group. Threads and thread groups in child "
"thread groups are not included. " "thread groups are not included. "
"A thread is alive if it has been started and has not yet been stopped. " "A thread is alive if it has been started and has not yet been stopped. "
"See <a href=../../../api/java/lang/ThreadGroup.html>java.lang.ThreadGroup </a> "See <a href=../../../api/java/lang/ThreadGroup.html>java.lang.ThreadGroup </a>
"for information about active ThreadGroups. "for information about active ThreadGroups.
...@@ -2101,7 +2101,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2101,7 +2101,7 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command GetValues=2 (Command GetValues=2
"Returns a range of array components. The specified range must " "Returns a range of array components. The specified range must "
"be within the bounds of the array. " "be within the bounds of the array. "
(Out (Out
(arrayObject arrayObject "The array object ID. ") (arrayObject arrayObject "The array object ID. ")
(int firstIndex "The first index to retrieve.") (int firstIndex "The first index to retrieve.")
...@@ -2109,8 +2109,8 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2109,8 +2109,8 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Reply (Reply
(typed-sequence values "The retrieved values. If the values " (typed-sequence values "The retrieved values. If the values "
"are objects, they are tagged-values; " "are objects, they are tagged-values; "
"otherwise, they are untagged-values") "otherwise, they are untagged-values")
) )
(ErrorSet (ErrorSet
(Error INVALID_LENGTH "If index is beyond the end of this array.") (Error INVALID_LENGTH "If index is beyond the end of this array.")
...@@ -2121,11 +2121,11 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2121,11 +2121,11 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command SetValues=3 (Command SetValues=3
"Sets a range of array components. The specified range must " "Sets a range of array components. The specified range must "
"be within the bounds of the array. " "be within the bounds of the array. "
"For primitive values, each value's type must match the " "For primitive values, each value's type must match the "
"array component type exactly. For object values, there must be a " "array component type exactly. For object values, there must be a "
"widening reference conversion from the value's type to the "widening reference conversion from the value's type to the
"array component type and the array component type must be loaded. " "array component type and the array component type must be loaded. "
(Out (Out
(arrayObject arrayObject "The array object ID. ") (arrayObject arrayObject "The array object ID. ")
(int firstIndex "The first index to set.") (int firstIndex "The first index to set.")
...@@ -2145,20 +2145,20 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2145,20 +2145,20 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(CommandSet ClassLoaderReference=14 (CommandSet ClassLoaderReference=14
(Command VisibleClasses=1 (Command VisibleClasses=1
"Returns a list of all classes which this class loader has " "Returns a list of all classes which this class loader has "
"been requested to load. This class loader is considered to be " "been requested to load. This class loader is considered to be "
"an <i>initiating</i> class loader for each class in the returned " "an <i>initiating</i> class loader for each class in the returned "
"list. The list contains each " "list. The list contains each "
"reference type defined by this loader and any types for which " "reference type defined by this loader and any types for which "
"loading was delegated by this class loader to another class loader. " "loading was delegated by this class loader to another class loader. "
"<p>" "<p>"
"The visible class list has useful properties with respect to " "The visible class list has useful properties with respect to "
"the type namespace. A particular type name will occur at most " "the type namespace. A particular type name will occur at most "
"once in the list. Each field or variable declared with that " "once in the list. Each field or variable declared with that "
"type name in a class defined by " "type name in a class defined by "
"this class loader must be resolved to that single type. " "this class loader must be resolved to that single type. "
"<p>" "<p>"
"No ordering of the returned list is guaranteed. " "No ordering of the returned list is guaranteed. "
(Out (Out
(classLoaderObject classLoaderObject "The class loader object ID. ") (classLoaderObject classLoaderObject "The class loader object ID. ")
) )
...@@ -2166,8 +2166,8 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2166,8 +2166,8 @@ JDWP "Java(tm) Debug Wire Protocol"
(Repeat classes "The number of visible classes. " (Repeat classes "The number of visible classes. "
(Group ClassInfo (Group ClassInfo
(byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> " (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
"of following reference type. ") "of following reference type. ")
(referenceTypeID typeID (referenceTypeID typeID
"A class visible to this class loader.") "A class visible to this class loader.")
) )
) )
...@@ -2182,175 +2182,175 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2182,175 +2182,175 @@ JDWP "Java(tm) Debug Wire Protocol"
(CommandSet EventRequest=15 (CommandSet EventRequest=15
(Command Set=1 (Command Set=1
"Set an event request. When the event described by this request " "Set an event request. When the event described by this request "
"occurs, an <a href=\"#JDWP_Event\">event</a> is sent from the " "occurs, an <a href=\"#JDWP_Event\">event</a> is sent from the "
"target VM. If an event occurs that has not been requested then it is not sent " "target VM. If an event occurs that has not been requested then it is not sent "
"from the target VM. The two exceptions to this are the VM Start Event and " "from the target VM. The two exceptions to this are the VM Start Event and "
"the VM Death Event which are automatically generated events - see " "the VM Death Event which are automatically generated events - see "
"<a href=\"#JDWP_Event_Composite\">Composite Command</a> for further details." "<a href=\"#JDWP_Event_Composite\">Composite Command</a> for further details."
(Out (Out
(byte eventKind "Event kind to request. " (byte eventKind "Event kind to request. "
"See <a href=\"#JDWP_EventKind\">JDWP.EventKind</a> " "See <a href=\"#JDWP_EventKind\">JDWP.EventKind</a> "
"for a complete list of events that can be requested; " "for a complete list of events that can be requested; "
"some events may require a capability in order to be requested. " "some events may require a capability in order to be requested. "
) )
(byte suspendPolicy (byte suspendPolicy
"What threads are suspended when this event occurs? " "What threads are suspended when this event occurs? "
"Note that the order of events and command replies " "Note that the order of events and command replies "
"accurately reflects the order in which threads are " "accurately reflects the order in which threads are "
"suspended and resumed. For example, if a " "suspended and resumed. For example, if a "
"<a href=\"#JDWP_VirtualMachine_Resume\">VM-wide resume</a> " "<a href=\"#JDWP_VirtualMachine_Resume\">VM-wide resume</a> "
"is processed before an event occurs which suspends the " "is processed before an event occurs which suspends the "
"VM, the reply to the resume command will be written to " "VM, the reply to the resume command will be written to "
"the transport before the suspending event.") "the transport before the suspending event.")
(Repeat modifiers "Constraints used to control the number " (Repeat modifiers "Constraints used to control the number "
"of generated events." "of generated events."
"Modifiers specify additional tests that " "Modifiers specify additional tests that "
"an event must satisfy before it is placed " "an event must satisfy before it is placed "
"in the event queue. Events are filtered by " "in the event queue. Events are filtered by "
"applying each modifier to an event in the " "applying each modifier to an event in the "
"order they are specified in this collection " "order they are specified in this collection "
"Only events that satisfy all modifiers " "Only events that satisfy all modifiers "
"are reported. A value of 0 means there are no " "are reported. A value of 0 means there are no "
"modifiers in the request." "modifiers in the request."
"<p>" "<p>"
"Filtering can improve " "Filtering can improve "
"debugger performance dramatically by "debugger performance dramatically by
"reducing the " "reducing the "
"amount of event traffic sent from the " "amount of event traffic sent from the "
"target VM to the debugger VM. " "target VM to the debugger VM. "
(Select Modifier (Select Modifier
(byte modKind "Modifier kind") (byte modKind "Modifier kind")
(Alt Count=1 (Alt Count=1
"Limit the requested event to be reported at most once after a " "Limit the requested event to be reported at most once after a "
"given number of occurrences. The event is not reported " "given number of occurrences. The event is not reported "
"the first <code>count - 1</code> times this filter is reached. " "the first <code>count - 1</code> times this filter is reached. "
"To request a one-off event, call this method with a count of 1. " "To request a one-off event, call this method with a count of 1. "
"<p>" "<p>"
"Once the count reaches 0, any subsequent filters in this request " "Once the count reaches 0, any subsequent filters in this request "
"are applied. If none of those filters cause the event to be " "are applied. If none of those filters cause the event to be "
"suppressed, the event is reported. Otherwise, the event is not " "suppressed, the event is reported. Otherwise, the event is not "
"reported. In either case subsequent events are never reported for " "reported. In either case subsequent events are never reported for "
"this request. " "this request. "
"This modifier can be used with any event kind." "This modifier can be used with any event kind."
(int count "Count before event. One for one-off.") (int count "Count before event. One for one-off.")
) )
(Alt Conditional=2 "Conditional on expression" (Alt Conditional=2 "Conditional on expression"
(int exprID "For the future") (int exprID "For the future")
) )
(Alt ThreadOnly=3 (Alt ThreadOnly=3
"Restricts reported events to " "Restricts reported events to "
"those in the given thread. " "those in the given thread. "
"This modifier can be used with any event kind " "This modifier can be used with any event kind "
"except for class unload. " "except for class unload. "
(threadObject thread "Required thread") (threadObject thread "Required thread")
) )
(Alt ClassOnly=4 (Alt ClassOnly=4
"For class prepare events, restricts the events " "For class prepare events, restricts the events "
"generated by this request to be the " "generated by this request to be the "
"preparation of the given reference type and any subtypes. " "preparation of the given reference type and any subtypes. "
"For monitor wait and waited events, restricts the events " "For monitor wait and waited events, restricts the events "
"generated by this request to those whose monitor object " "generated by this request to those whose monitor object "
"is of the given reference type or any of its subtypes. " "is of the given reference type or any of its subtypes. "
"For other events, restricts the events generated " "For other events, restricts the events generated "
"by this request to those " "by this request to those "
"whose location is in the given reference type or any of its subtypes. " "whose location is in the given reference type or any of its subtypes. "
"An event will be generated for any location in a reference type that can " "An event will be generated for any location in a reference type that can "
"be safely cast to the given reference type. " "be safely cast to the given reference type. "
"This modifier can be used with any event kind except " "This modifier can be used with any event kind except "
"class unload, thread start, and thread end. " "class unload, thread start, and thread end. "
(referenceType clazz "Required class") (referenceType clazz "Required class")
) )
(Alt ClassMatch=5 (Alt ClassMatch=5
"Restricts reported events to those for classes whose name " "Restricts reported events to those for classes whose name "
"matches the given restricted regular expression. " "matches the given restricted regular expression. "
"For class prepare events, the prepared class name " "For class prepare events, the prepared class name "
"is matched. For class unload events, the " "is matched. For class unload events, the "
"unloaded class name is matched. For monitor wait " "unloaded class name is matched. For monitor wait "
"and waited events, the name of the class of the " "and waited events, the name of the class of the "
"monitor object is matched. For other events, " "monitor object is matched. For other events, "
"the class name of the event's location is matched. " "the class name of the event's location is matched. "
"This modifier can be used with any event kind except " "This modifier can be used with any event kind except "
"thread start and thread end. " "thread start and thread end. "
(string classPattern "Required class pattern. " (string classPattern "Required class pattern. "
"Matches are limited to exact matches of the " "Matches are limited to exact matches of the "
"given class pattern and matches of patterns that " "given class pattern and matches of patterns that "
"begin or end with '*'; for example, " "begin or end with '*'; for example, "
"\"*.Foo\" or \"java.*\". " "\"*.Foo\" or \"java.*\". "
) )
) )
(Alt ClassExclude=6 (Alt ClassExclude=6
"Restricts reported events to those for classes whose name " "Restricts reported events to those for classes whose name "
"does not match the given restricted regular expression. " "does not match the given restricted regular expression. "
"For class prepare events, the prepared class name " "For class prepare events, the prepared class name "
"is matched. For class unload events, the " "is matched. For class unload events, the "
"unloaded class name is matched. For monitor wait and " "unloaded class name is matched. For monitor wait and "
"waited events, the name of the class of the monitor " "waited events, the name of the class of the monitor "
"object is matched. For other events, " "object is matched. For other events, "
"the class name of the event's location is matched. " "the class name of the event's location is matched. "
"This modifier can be used with any event kind except " "This modifier can be used with any event kind except "
"thread start and thread end. " "thread start and thread end. "
(string classPattern "Disallowed class pattern. " (string classPattern "Disallowed class pattern. "
"Matches are limited to exact matches of the " "Matches are limited to exact matches of the "
"given class pattern and matches of patterns that " "given class pattern and matches of patterns that "
"begin or end with '*'; for example, " "begin or end with '*'; for example, "
"\"*.Foo\" or \"java.*\". " "\"*.Foo\" or \"java.*\". "
) )
) )
(Alt LocationOnly=7 (Alt LocationOnly=7
"Restricts reported events to those that occur at " "Restricts reported events to those that occur at "
"the given location. " "the given location. "
"This modifier can be used with " "This modifier can be used with "
"breakpoint, field access, field modification, " "breakpoint, field access, field modification, "
"step, and exception event kinds. " "step, and exception event kinds. "
(location loc "Required location") (location loc "Required location")
) )
(Alt ExceptionOnly=8 (Alt ExceptionOnly=8
"Restricts reported exceptions by their class and " "Restricts reported exceptions by their class and "
"whether they are caught or uncaught. " "whether they are caught or uncaught. "
"This modifier can be used with " "This modifier can be used with "
"exception event kinds only. " "exception event kinds only. "
(referenceType exceptionOrNull (referenceType exceptionOrNull
"Exception to report. Null (0) means report " "Exception to report. Null (0) means report "
"exceptions of all types. " "exceptions of all types. "
"A non-null type restricts the reported exception " "A non-null type restricts the reported exception "
"events to exceptions of the given type or " "events to exceptions of the given type or "
"any of its subtypes. " "any of its subtypes. "
) )
(boolean caught "Report caught exceptions") (boolean caught "Report caught exceptions")
(boolean uncaught "Report uncaught exceptions. " (boolean uncaught "Report uncaught exceptions. "
"Note that it " "Note that it "
"is not always possible to determine whether an " "is not always possible to determine whether an "
"exception is caught or uncaught at the time it is " "exception is caught or uncaught at the time it is "
"thrown. See the exception event catch location under " "thrown. See the exception event catch location under "
"<a href=\"#JDWP_Event_Composite\">composite events</a> " "<a href=\"#JDWP_Event_Composite\">composite events</a> "
"for more information. " "for more information. "
) )
) )
(Alt FieldOnly=9 (Alt FieldOnly=9
"Restricts reported events to those that occur for " "Restricts reported events to those that occur for "
"a given field. " "a given field. "
"This modifier can be used with " "This modifier can be used with "
"field access and field modification event kinds only. " "field access and field modification event kinds only. "
(referenceType declaring "Type in which field is declared.") (referenceType declaring "Type in which field is declared.")
(field fieldID "Required field") (field fieldID "Required field")
) )
(Alt Step=10 (Alt Step=10
"Restricts reported step events " "Restricts reported step events "
"to those which satisfy " "to those which satisfy "
"depth and size constraints. " "depth and size constraints. "
"This modifier can be used with " "This modifier can be used with "
"step event kinds only. " "step event kinds only. "
(threadObject thread "Thread in which to step") (threadObject thread "Thread in which to step")
(int size "size of each step. " (int size "size of each step. "
"See <a href=\"#JDWP_StepSize\">JDWP.StepSize</a>") "See <a href=\"#JDWP_StepSize\">JDWP.StepSize</a>")
...@@ -2358,38 +2358,38 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2358,38 +2358,38 @@ JDWP "Java(tm) Debug Wire Protocol"
"See <a href=\"#JDWP_StepDepth\">JDWP.StepDepth</a>") "See <a href=\"#JDWP_StepDepth\">JDWP.StepDepth</a>")
) )
(Alt InstanceOnly=11 (Alt InstanceOnly=11
"Restricts reported events to those whose " "Restricts reported events to those whose "
"active 'this' object is the given object. " "active 'this' object is the given object. "
"Match value is the null object for static methods. " "Match value is the null object for static methods. "
"This modifier can be used with any event kind " "This modifier can be used with any event kind "
"except class prepare, class unload, thread start, " "except class prepare, class unload, thread start, "
"and thread end. Introduced in JDWP version 1.4." "and thread end. Introduced in JDWP version 1.4."
(object instance "Required 'this' object") (object instance "Required 'this' object")
) )
(Alt SourceNameMatch=12 (Alt SourceNameMatch=12
"Restricts reported class prepare events to those " "Restricts reported class prepare events to those "
"for reference types which have a source name " "for reference types which have a source name "
"which matches the given restricted regular expression. " "which matches the given restricted regular expression. "
"The source names are determined by the reference type's " "The source names are determined by the reference type's "
"<a href=\"#JDWP_ReferenceType_SourceDebugExtension\"> " "<a href=\"#JDWP_ReferenceType_SourceDebugExtension\"> "
"SourceDebugExtension</a>. " "SourceDebugExtension</a>. "
"This modifier can only be used with class prepare " "This modifier can only be used with class prepare "
"events. " "events. "
"Since JDWP version 1.6. Requires the canUseSourceNameFilters " "Since JDWP version 1.6. Requires the canUseSourceNameFilters "
"capability - see " "capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(string sourceNamePattern "Required source name pattern. " (string sourceNamePattern "Required source name pattern. "
"Matches are limited to exact matches of the " "Matches are limited to exact matches of the "
"given pattern and matches of patterns that " "given pattern and matches of patterns that "
"begin or end with '*'; for example, " "begin or end with '*'; for example, "
"\"*.Foo\" or \"java.*\". " "\"*.Foo\" or \"java.*\". "
) )
) )
) )
) )
) )
(Reply (Reply
(int requestID "ID of created request") (int requestID "ID of created request")
...@@ -2410,11 +2410,11 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2410,11 +2410,11 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(Command Clear=2 (Command Clear=2
"Clear an event request. See <a href=\"#JDWP_EventKind\">JDWP.EventKind</a> " "Clear an event request. See <a href=\"#JDWP_EventKind\">JDWP.EventKind</a> "
"for a complete list of events that can be cleared. Only the event request matching " "for a complete list of events that can be cleared. Only the event request matching "
"the specified event kind and requestID is cleared. If there isn't a matching event " "the specified event kind and requestID is cleared. If there isn't a matching event "
"request the command is a no-op and does not result in an error. Automatically " "request the command is a no-op and does not result in an error. Automatically "
"generated events do not have a corresponding event request and may not be cleared " "generated events do not have a corresponding event request and may not be cleared "
"using this command." "using this command."
(Out (Out
(byte eventKind "Event kind to clear") (byte eventKind "Event kind to clear")
(int requestID "ID of request to clear") (int requestID "ID of request to clear")
...@@ -2423,7 +2423,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2423,7 +2423,7 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(ErrorSet (ErrorSet
(Error VM_DEAD) (Error VM_DEAD)
(Error INVALID_EVENT_TYPE) (Error INVALID_EVENT_TYPE)
) )
) )
(Command ClearAllBreakpoints=3 (Command ClearAllBreakpoints=3
...@@ -2440,26 +2440,26 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2440,26 +2440,26 @@ JDWP "Java(tm) Debug Wire Protocol"
(CommandSet StackFrame=16 (CommandSet StackFrame=16
(Command GetValues=1 (Command GetValues=1
"Returns the value of one or more local variables in a " "Returns the value of one or more local variables in a "
"given frame. Each variable must be visible at the frame's code index. " "given frame. Each variable must be visible at the frame's code index. "
"Even if local variable information is not available, values can " "Even if local variable information is not available, values can "
"be retrieved if the front-end is able to " "be retrieved if the front-end is able to "
"determine the correct local variable index. (Typically, this " "determine the correct local variable index. (Typically, this "
"index can be determined for method arguments from the method " "index can be determined for method arguments from the method "
"signature without access to the local variable table information.) " "signature without access to the local variable table information.) "
(Out (Out
(threadObject thread "The frame's thread. ") (threadObject thread "The frame's thread. ")
(frame frame "The frame ID. ") (frame frame "The frame ID. ")
(Repeat slots "The number of values to get. " (Repeat slots "The number of values to get. "
(Group SlotInfo (Group SlotInfo
(int slot "The local variable's index in the frame. ") (int slot "The local variable's index in the frame. ")
(byte sigbyte "A <a href=\"#JDWP_Tag\">tag</a> " (byte sigbyte "A <a href=\"#JDWP_Tag\">tag</a> "
"identifying the type of the variable ") "identifying the type of the variable ")
) )
) )
) )
(Reply (Reply
(Repeat values "The number of values retrieved, always equal to slots, " (Repeat values "The number of values retrieved, always equal to slots, "
"the number of values to get." "the number of values to get."
(value slotValue "The value of the local variable. ") (value slotValue "The value of the local variable. ")
) )
) )
...@@ -2467,32 +2467,32 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2467,32 +2467,32 @@ JDWP "Java(tm) Debug Wire Protocol"
(Error INVALID_THREAD) (Error INVALID_THREAD)
(Error INVALID_OBJECT) (Error INVALID_OBJECT)
(Error INVALID_FRAMEID) (Error INVALID_FRAMEID)
(Error INVALID_SLOT) (Error INVALID_SLOT)
(Error VM_DEAD) (Error VM_DEAD)
) )
) )
(Command SetValues=2 (Command SetValues=2
"Sets the value of one or more local variables. " "Sets the value of one or more local variables. "
"Each variable must be visible at the current frame code index. " "Each variable must be visible at the current frame code index. "
"For primitive values, the value's type must match the " "For primitive values, the value's type must match the "
"variable's type exactly. For object values, there must be a " "variable's type exactly. For object values, there must be a "
"widening reference conversion from the value's type to the "widening reference conversion from the value's type to the
"variable's type and the variable's type must be loaded. " "variable's type and the variable's type must be loaded. "
"<p>" "<p>"
"Even if local variable information is not available, values can " "Even if local variable information is not available, values can "
"be set, if the front-end is able to " "be set, if the front-end is able to "
"determine the correct local variable index. (Typically, this "determine the correct local variable index. (Typically, this
"index can be determined for method arguments from the method " "index can be determined for method arguments from the method "
"signature without access to the local variable table information.) " "signature without access to the local variable table information.) "
(Out (Out
(threadObject thread "The frame's thread. ") (threadObject thread "The frame's thread. ")
(frame frame "The frame ID. ") (frame frame "The frame ID. ")
(Repeat slotValues "The number of values to set. " (Repeat slotValues "The number of values to set. "
(Group SlotInfo (Group SlotInfo
(int slot "The slot ID. ") (int slot "The slot ID. ")
(value slotValue "The value to set. ") (value slotValue "The value to set. ")
) )
) )
) )
(Reply "none" (Reply "none"
) )
...@@ -2521,17 +2521,17 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2521,17 +2521,17 @@ JDWP "Java(tm) Debug Wire Protocol"
(Error VM_DEAD) (Error VM_DEAD)
) )
) )
(Command PopFrames=4 (Command PopFrames=4
"Pop the top-most stack frames of the thread stack, up to, and including 'frame'. " "Pop the top-most stack frames of the thread stack, up to, and including 'frame'. "
"The thread must be suspended to perform this command. " "The thread must be suspended to perform this command. "
"The top-most stack frames are discarded and the stack frame previous to 'frame' " "The top-most stack frames are discarded and the stack frame previous to 'frame' "
"becomes the current frame. The operand stack is restored -- the argument values " "becomes the current frame. The operand stack is restored -- the argument values "
"are added back and if the invoke was not <code>invokestatic</code>, " "are added back and if the invoke was not <code>invokestatic</code>, "
"<code>objectref</code> is added back as well. The Java virtual machine " "<code>objectref</code> is added back as well. The Java virtual machine "
"program counter is restored to the opcode of the invoke instruction." "program counter is restored to the opcode of the invoke instruction."
"<p>" "<p>"
"Since JDWP version 1.4. Requires canPopFrames capability - see " "Since JDWP version 1.4. Requires canPopFrames capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(Out (Out
(threadObject thread "The thread object ID. ") (threadObject thread "The thread object ID. ")
(frame frame "The frame ID. ") (frame frame "The frame ID. ")
...@@ -2557,9 +2557,9 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2557,9 +2557,9 @@ JDWP "Java(tm) Debug Wire Protocol"
(classObject classObject "The class object. ") (classObject classObject "The class object. ")
) )
(Reply (Reply
(byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> " (byte refTypeTag "<a href=\"#JDWP_TypeTag\">Kind</a> "
"of following reference type. ") "of following reference type. ")
(referenceTypeID typeID "reflected reference type") (referenceTypeID typeID "reflected reference type")
) )
(ErrorSet (ErrorSet
(Error INVALID_OBJECT) (Error INVALID_OBJECT)
...@@ -2569,349 +2569,349 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2569,349 +2569,349 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(CommandSet Event=64 (CommandSet Event=64
(Command Composite=100 (Command Composite=100
"Several events may occur at a given time in the target VM. " "Several events may occur at a given time in the target VM. "
"For example, there may be more than one breakpoint request " "For example, there may be more than one breakpoint request "
"for a given location " "for a given location "
"or you might single step to the same location as a " "or you might single step to the same location as a "
"breakpoint request. These events are delivered " "breakpoint request. These events are delivered "
"together as a composite event. For uniformity, a " "together as a composite event. For uniformity, a "
"composite event is always used " "composite event is always used "
"to deliver events, even if there is only one event to report. " "to deliver events, even if there is only one event to report. "
"<P>" "<P>"
"The events that are grouped in a composite event are restricted in the " "The events that are grouped in a composite event are restricted in the "
"following ways: " "following ways: "
"<P>" "<P>"
"<UL>" "<UL>"
"<LI>Only with other thread start events for the same thread:" "<LI>Only with other thread start events for the same thread:"
" <UL>" " <UL>"
" <LI>Thread Start Event" " <LI>Thread Start Event"
" </UL>" " </UL>"
"<LI>Only with other thread death events for the same thread:" "<LI>Only with other thread death events for the same thread:"
" <UL>" " <UL>"
" <LI>Thread Death Event" " <LI>Thread Death Event"
" </UL>" " </UL>"
"<LI>Only with other class prepare events for the same class:" "<LI>Only with other class prepare events for the same class:"
" <UL>" " <UL>"
" <LI>Class Prepare Event" " <LI>Class Prepare Event"
" </UL>" " </UL>"
"<LI>Only with other class unload events for the same class:" "<LI>Only with other class unload events for the same class:"
" <UL>" " <UL>"
" <LI>Class Unload Event" " <LI>Class Unload Event"
" </UL>" " </UL>"
"<LI>Only with other access watchpoint events for the same field access:" "<LI>Only with other access watchpoint events for the same field access:"
" <UL>" " <UL>"
" <LI>Access Watchpoint Event" " <LI>Access Watchpoint Event"
" </UL>" " </UL>"
"<LI>Only with other modification watchpoint events for the same field " "<LI>Only with other modification watchpoint events for the same field "
"modification:" "modification:"
" <UL>" " <UL>"
" <LI>Modification Watchpoint Event" " <LI>Modification Watchpoint Event"
" </UL>" " </UL>"
"<LI>Only with other Monitor contended enter events for the same monitor object: " "<LI>Only with other Monitor contended enter events for the same monitor object: "
" <UL>" " <UL>"
" <LI>Monitor Contended Enter Event" " <LI>Monitor Contended Enter Event"
" </UL>" " </UL>"
"<LI>Only with other Monitor contended entered events for the same monitor object: " "<LI>Only with other Monitor contended entered events for the same monitor object: "
" <UL>" " <UL>"
" <LI>Monitor Contended Entered Event" " <LI>Monitor Contended Entered Event"
" </UL>" " </UL>"
"<LI>Only with other Monitor wait events for the same monitor object: " "<LI>Only with other Monitor wait events for the same monitor object: "
" <UL>" " <UL>"
" <LI>Monitor Wait Event" " <LI>Monitor Wait Event"
" </UL>" " </UL>"
"<LI>Only with other Monitor waited events for the same monitor object: " "<LI>Only with other Monitor waited events for the same monitor object: "
" <UL>" " <UL>"
" <LI>Monitor Waited Event" " <LI>Monitor Waited Event"
" </UL>" " </UL>"
"<LI>Only with other ExceptionEvents for the same exception occurrance:" "<LI>Only with other ExceptionEvents for the same exception occurrance:"
" <UL>" " <UL>"
" <LI>ExceptionEvent" " <LI>ExceptionEvent"
" </UL>" " </UL>"
"<LI>Only with other members of this group, at the same location " "<LI>Only with other members of this group, at the same location "
"and in the same thread: " "and in the same thread: "
" <UL>" " <UL>"
" <LI>Breakpoint Event" " <LI>Breakpoint Event"
" <LI>Step Event" " <LI>Step Event"
" <LI>Method Entry Event" " <LI>Method Entry Event"
" <LI>Method Exit Event" " <LI>Method Exit Event"
" </UL>" " </UL>"
"</UL>" "</UL>"
"<P>" "<P>"
"The VM Start Event and VM Death Event are automatically generated events. " "The VM Start Event and VM Death Event are automatically generated events. "
"This means they do not need to be requested using the " "This means they do not need to be requested using the "
"<a href=\"#JDWP_EventRequest_Set\">EventRequest.Set</a> command. " "<a href=\"#JDWP_EventRequest_Set\">EventRequest.Set</a> command. "
"The VM Start event signals the completion of VM initialization. The VM Death " "The VM Start event signals the completion of VM initialization. The VM Death "
"event signals the termination of the VM." "event signals the termination of the VM."
"If there is a debugger connected at the time when an automatically generated " "If there is a debugger connected at the time when an automatically generated "
"event occurs it is sent from the target VM. Automatically generated events may " "event occurs it is sent from the target VM. Automatically generated events may "
"also be requested using the EventRequest.Set command and thus multiple events " "also be requested using the EventRequest.Set command and thus multiple events "
"of the same event kind will be sent from the target VM when an event occurs." "of the same event kind will be sent from the target VM when an event occurs."
"Automatically generated events are sent with the requestID field " "Automatically generated events are sent with the requestID field "
"in the Event Data set to 0. The value of the suspendPolicy field in the " "in the Event Data set to 0. The value of the suspendPolicy field in the "
"Event Data depends on the event. For the automatically generated VM Start " "Event Data depends on the event. For the automatically generated VM Start "
"Event the value of suspendPolicy is not defined and is therefore implementation " "Event the value of suspendPolicy is not defined and is therefore implementation "
"or configuration specific. In the Sun implementation, for example, the " "or configuration specific. In the Sun implementation, for example, the "
"suspendPolicy is specified as an option to the JDWP agent at launch-time." "suspendPolicy is specified as an option to the JDWP agent at launch-time."
"The automatically generated VM Death Event will have the suspendPolicy set to " "The automatically generated VM Death Event will have the suspendPolicy set to "
"NONE." "NONE."
(Event "Generated event" (Event "Generated event"
(byte suspendPolicy (byte suspendPolicy
"Which threads where suspended by this composite event?") "Which threads where suspended by this composite event?")
(Repeat events "Events in set." (Repeat events "Events in set."
(Select Events (Select Events
(byte eventKind "Event kind selector") (byte eventKind "Event kind selector")
(Alt VMStart=JDWP.EventKind.VM_START (Alt VMStart=JDWP.EventKind.VM_START
"Notification of initialization of a target VM. This event is " "Notification of initialization of a target VM. This event is "
"received before the main thread is started and before any " "received before the main thread is started and before any "
"application code has been executed. Before this event occurs " "application code has been executed. Before this event occurs "
"a significant amount of system code has executed and a number " "a significant amount of system code has executed and a number "
"of system classes have been loaded. " "of system classes have been loaded. "
"This event is always generated by the target VM, even " "This event is always generated by the target VM, even "
"if not explicitly requested." "if not explicitly requested."
(int requestID (int requestID
"Request that generated event (or 0 if this " "Request that generated event (or 0 if this "
"event is automatically generated.") "event is automatically generated.")
(threadObject thread "Initial thread") (threadObject thread "Initial thread")
) )
(Alt SingleStep=JDWP.EventKind.SINGLE_STEP (Alt SingleStep=JDWP.EventKind.SINGLE_STEP
"Notification of step completion in the target VM. The step event " "Notification of step completion in the target VM. The step event "
"is generated before the code at its location is executed. " "is generated before the code at its location is executed. "
(int requestID "Request that generated event") (int requestID "Request that generated event")
(threadObject thread "Stepped thread") (threadObject thread "Stepped thread")
(location location "Location stepped to") (location location "Location stepped to")
) )
(Alt Breakpoint=JDWP.EventKind.BREAKPOINT (Alt Breakpoint=JDWP.EventKind.BREAKPOINT
"Notification of a breakpoint in the target VM. The breakpoint event " "Notification of a breakpoint in the target VM. The breakpoint event "
"is generated before the code at its location is executed. " "is generated before the code at its location is executed. "
(int requestID "Request that generated event") (int requestID "Request that generated event")
(threadObject thread "Thread which hit breakpoint") (threadObject thread "Thread which hit breakpoint")
(location location "Location hit") (location location "Location hit")
) )
(Alt MethodEntry=JDWP.EventKind.METHOD_ENTRY (Alt MethodEntry=JDWP.EventKind.METHOD_ENTRY
"Notification of a method invocation in the target VM. This event " "Notification of a method invocation in the target VM. This event "
"is generated before any code in the invoked method has executed. " "is generated before any code in the invoked method has executed. "
"Method entry events are generated for both native and non-native " "Method entry events are generated for both native and non-native "
"methods. " "methods. "
"<P>" "<P>"
"In some VMs method entry events can occur for a particular thread " "In some VMs method entry events can occur for a particular thread "
"before its thread start event occurs if methods are called " "before its thread start event occurs if methods are called "
"as part of the thread's initialization. " "as part of the thread's initialization. "
(int requestID "Request that generated event") (int requestID "Request that generated event")
(threadObject thread "Thread which entered method") (threadObject thread "Thread which entered method")
(location location "The initial executable location in the method.") (location location "The initial executable location in the method.")
) )
(Alt MethodExit=JDWP.EventKind.METHOD_EXIT (Alt MethodExit=JDWP.EventKind.METHOD_EXIT
"Notification of a method return in the target VM. This event " "Notification of a method return in the target VM. This event "
"is generated after all code in the method has executed, but the " "is generated after all code in the method has executed, but the "
"location of this event is the last executed location in the method. " "location of this event is the last executed location in the method. "
"Method exit events are generated for both native and non-native " "Method exit events are generated for both native and non-native "
"methods. Method exit events are not generated if the method terminates " "methods. Method exit events are not generated if the method terminates "
"with a thrown exception. " "with a thrown exception. "
(int requestID "Request that generated event") (int requestID "Request that generated event")
(threadObject thread "Thread which exited method") (threadObject thread "Thread which exited method")
(location location "Location of exit") (location location "Location of exit")
) )
(Alt MethodExitWithReturnValue=JDWP.EventKind.METHOD_EXIT_WITH_RETURN_VALUE (Alt MethodExitWithReturnValue=JDWP.EventKind.METHOD_EXIT_WITH_RETURN_VALUE
"Notification of a method return in the target VM. This event " "Notification of a method return in the target VM. This event "
"is generated after all code in the method has executed, but the " "is generated after all code in the method has executed, but the "
"location of this event is the last executed location in the method. " "location of this event is the last executed location in the method. "
"Method exit events are generated for both native and non-native " "Method exit events are generated for both native and non-native "
"methods. Method exit events are not generated if the method terminates " "methods. Method exit events are not generated if the method terminates "
"with a thrown exception. <p>Since JDWP version 1.6. " "with a thrown exception. <p>Since JDWP version 1.6. "
(int requestID "Request that generated event") (int requestID "Request that generated event")
(threadObject thread "Thread which exited method") (threadObject thread "Thread which exited method")
(location location "Location of exit") (location location "Location of exit")
(value value "Value that will be returned by the method") (value value "Value that will be returned by the method")
) )
(Alt MonitorContendedEnter=JDWP.EventKind.MONITOR_CONTENDED_ENTER (Alt MonitorContendedEnter=JDWP.EventKind.MONITOR_CONTENDED_ENTER
"Notification that a thread in the target VM is attempting " "Notification that a thread in the target VM is attempting "
"to enter a monitor that is already acquired by another thread. " "to enter a monitor that is already acquired by another thread. "
"Requires canRequestMonitorEvents capability - see " "Requires canRequestMonitorEvents capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. " "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
"<p>Since JDWP version 1.6. " "<p>Since JDWP version 1.6. "
(int requestID (int requestID
"Request that generated event") "Request that generated event")
(threadObject thread "Thread which is trying to enter the monitor") (threadObject thread "Thread which is trying to enter the monitor")
(tagged-object object "Monitor object reference") (tagged-object object "Monitor object reference")
(location location "Location of contended monitor enter") (location location "Location of contended monitor enter")
) )
(Alt MonitorContendedEntered=JDWP.EventKind.MONITOR_CONTENDED_ENTERED (Alt MonitorContendedEntered=JDWP.EventKind.MONITOR_CONTENDED_ENTERED
"Notification of a thread in the target VM is entering a monitor " "Notification of a thread in the target VM is entering a monitor "
"after waiting for it to be released by another thread. " "after waiting for it to be released by another thread. "
"Requires canRequestMonitorEvents capability - see " "Requires canRequestMonitorEvents capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. " "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
"<p>Since JDWP version 1.6. " "<p>Since JDWP version 1.6. "
(int requestID (int requestID
"Request that generated event") "Request that generated event")
(threadObject thread "Thread which entered monitor") (threadObject thread "Thread which entered monitor")
(tagged-object object "Monitor object reference") (tagged-object object "Monitor object reference")
(location location "Location of contended monitor enter") (location location "Location of contended monitor enter")
) )
(Alt MonitorWait=JDWP.EventKind.MONITOR_WAIT (Alt MonitorWait=JDWP.EventKind.MONITOR_WAIT
"Notification of a thread about to wait on a monitor object. " "Notification of a thread about to wait on a monitor object. "
"Requires canRequestMonitorEvents capability - see " "Requires canRequestMonitorEvents capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. " "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
"<p>Since JDWP version 1.6. " "<p>Since JDWP version 1.6. "
(int requestID (int requestID
"Request that generated event") "Request that generated event")
(threadObject thread "Thread which is about to wait") (threadObject thread "Thread which is about to wait")
(tagged-object object "Monitor object reference") (tagged-object object "Monitor object reference")
(location location "Location at which the wait will occur") (location location "Location at which the wait will occur")
(long timeout "Thread wait time in milliseconds") (long timeout "Thread wait time in milliseconds")
) )
(Alt MonitorWaited=JDWP.EventKind.MONITOR_WAITED (Alt MonitorWaited=JDWP.EventKind.MONITOR_WAITED
"Notification that a thread in the target VM has finished waiting on " "Notification that a thread in the target VM has finished waiting on "
"Requires canRequestMonitorEvents capability - see " "Requires canRequestMonitorEvents capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. " "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>. "
"a monitor object. " "a monitor object. "
"<p>Since JDWP version 1.6. " "<p>Since JDWP version 1.6. "
(int requestID (int requestID
"Request that generated event") "Request that generated event")
(threadObject thread "Thread which waited") (threadObject thread "Thread which waited")
(tagged-object object "Monitor object reference") (tagged-object object "Monitor object reference")
(location location "Location at which the wait occured") (location location "Location at which the wait occured")
(boolean timed_out "True if timed out") (boolean timed_out "True if timed out")
) )
(Alt Exception=JDWP.EventKind.EXCEPTION (Alt Exception=JDWP.EventKind.EXCEPTION
"Notification of an exception in the target VM. " "Notification of an exception in the target VM. "
"If the exception is thrown from a non-native method, " "If the exception is thrown from a non-native method, "
"the exception event is generated at the location where the " "the exception event is generated at the location where the "
"exception is thrown. " "exception is thrown. "
"If the exception is thrown from a native method, the exception event " "If the exception is thrown from a native method, the exception event "
"is generated at the first non-native location reached after the exception " "is generated at the first non-native location reached after the exception "
"is thrown. " "is thrown. "
(int requestID "Request that generated event") (int requestID "Request that generated event")
(threadObject thread "Thread with exception") (threadObject thread "Thread with exception")
(location location "Location of exception throw " (location location "Location of exception throw "
"(or first non-native location after throw if thrown from a native method)") "(or first non-native location after throw if thrown from a native method)")
(tagged-object exception "Thrown exception") (tagged-object exception "Thrown exception")
(location catchLocation (location catchLocation
"Location of catch, or 0 if not caught. An exception " "Location of catch, or 0 if not caught. An exception "
"is considered to be caught if, at the point of the throw, the " "is considered to be caught if, at the point of the throw, the "
"current location is dynamically enclosed in a try statement that " "current location is dynamically enclosed in a try statement that "
"handles the exception. (See the JVM specification for details). " "handles the exception. (See the JVM specification for details). "
"If there is such a try statement, the catch location is the " "If there is such a try statement, the catch location is the "
"first location in the appropriate catch clause. " "first location in the appropriate catch clause. "
"<p>" "<p>"
"If there are native methods in the call stack at the time of the " "If there are native methods in the call stack at the time of the "
"exception, there are important restrictions to note about the " "exception, there are important restrictions to note about the "
"returned catch location. In such cases, " "returned catch location. In such cases, "
"it is not possible to predict whether an exception will be handled " "it is not possible to predict whether an exception will be handled "
"by some native method on the call stack. " "by some native method on the call stack. "
"Thus, it is possible that exceptions considered uncaught " "Thus, it is possible that exceptions considered uncaught "
"here will, in fact, be handled by a native method and not cause " "here will, in fact, be handled by a native method and not cause "
"termination of the target VM. Furthermore, it cannot be assumed that the " "termination of the target VM. Furthermore, it cannot be assumed that the "
"catch location returned here will ever be reached by the throwing " "catch location returned here will ever be reached by the throwing "
"thread. If there is " "thread. If there is "
"a native frame between the current location and the catch location, " "a native frame between the current location and the catch location, "
"the exception might be handled and cleared in that native method " "the exception might be handled and cleared in that native method "
"instead. " "instead. "
"<p>" "<p>"
"Note that compilers can generate try-catch blocks in some cases " "Note that compilers can generate try-catch blocks in some cases "
"where they are not explicit in the source code; for example, " "where they are not explicit in the source code; for example, "
"the code generated for <code>synchronized</code> and " "the code generated for <code>synchronized</code> and "
"<code>finally</code> blocks can contain implicit try-catch blocks. " "<code>finally</code> blocks can contain implicit try-catch blocks. "
"If such an implicitly generated try-catch is " "If such an implicitly generated try-catch is "
"present on the call stack at the time of the throw, the exception " "present on the call stack at the time of the throw, the exception "
"will be considered caught even though it appears to be uncaught from " "will be considered caught even though it appears to be uncaught from "
"examination of the source code. " "examination of the source code. "
) )
) )
(Alt ThreadStart=JDWP.EventKind.THREAD_START (Alt ThreadStart=JDWP.EventKind.THREAD_START
"Notification of a new running thread in the target VM. " "Notification of a new running thread in the target VM. "
"The new thread can be the result of a call to " "The new thread can be the result of a call to "
"<code>java.lang.Thread.start</code> or the result of " "<code>java.lang.Thread.start</code> or the result of "
"attaching a new thread to the VM though JNI. The " "attaching a new thread to the VM though JNI. The "
"notification is generated by the new thread some time before " "notification is generated by the new thread some time before "
"its execution starts. " "its execution starts. "
"Because of this timing, it is possible to receive other events " "Because of this timing, it is possible to receive other events "
"for the thread before this event is received. (Notably, " "for the thread before this event is received. (Notably, "
"Method Entry Events and Method Exit Events might occur " "Method Entry Events and Method Exit Events might occur "
"during thread initialization. " "during thread initialization. "
"It is also possible for the " "It is also possible for the "
"<a href=\"#JDWP_VirtualMachine_AllThreads\">VirtualMachine AllThreads</a> " "<a href=\"#JDWP_VirtualMachine_AllThreads\">VirtualMachine AllThreads</a> "
"command to return " "command to return "
"a thread before its thread start event is received. " "a thread before its thread start event is received. "
"<p>" "<p>"
"Note that this event gives no information " "Note that this event gives no information "
"about the creation of the thread object which may have happened " "about the creation of the thread object which may have happened "
"much earlier, depending on the VM being debugged. " "much earlier, depending on the VM being debugged. "
(int requestID "Request that generated event") (int requestID "Request that generated event")
(threadObject thread "Started thread") (threadObject thread "Started thread")
) )
(Alt ThreadDeath=JDWP.EventKind.THREAD_DEATH (Alt ThreadDeath=JDWP.EventKind.THREAD_DEATH
"Notification of a completed thread in the target VM. The " "Notification of a completed thread in the target VM. The "
"notification is generated by the dying thread before it terminates. " "notification is generated by the dying thread before it terminates. "
"Because of this timing, it is possible " "Because of this timing, it is possible "
"for {@link VirtualMachine#allThreads} to return this thread " "for {@link VirtualMachine#allThreads} to return this thread "
"after this event is received. " "after this event is received. "
"<p>" "<p>"
"Note that this event gives no information " "Note that this event gives no information "
"about the lifetime of the thread object. It may or may not be collected " "about the lifetime of the thread object. It may or may not be collected "
"soon depending on what references exist in the target VM. " "soon depending on what references exist in the target VM. "
(int requestID "Request that generated event") (int requestID "Request that generated event")
(threadObject thread "Ending thread") (threadObject thread "Ending thread")
) )
(Alt ClassPrepare=JDWP.EventKind.CLASS_PREPARE (Alt ClassPrepare=JDWP.EventKind.CLASS_PREPARE
"Notification of a class prepare in the target VM. See the JVM " "Notification of a class prepare in the target VM. See the JVM "
"specification for a definition of class preparation. Class prepare " "specification for a definition of class preparation. Class prepare "
"events are not generated for primtiive classes (for example, " "events are not generated for primtiive classes (for example, "
"java.lang.Integer.TYPE). " "java.lang.Integer.TYPE). "
(int requestID "Request that generated event") (int requestID "Request that generated event")
(threadObject thread "Preparing thread. " (threadObject thread "Preparing thread. "
"In rare cases, this event may occur in a debugger system " "In rare cases, this event may occur in a debugger system "
"thread within the target VM. Debugger threads take precautions " "thread within the target VM. Debugger threads take precautions "
"to prevent these events, but they cannot be avoided under some " "to prevent these events, but they cannot be avoided under some "
"conditions, especially for some subclasses of " "conditions, especially for some subclasses of "
"java.lang.Error. " "java.lang.Error. "
"If the event was generated by a debugger system thread, the " "If the event was generated by a debugger system thread, the "
"value returned by this method is null, and if the requested " "value returned by this method is null, and if the requested "
"<a href=\"#JDWP_SuspendPolicy\">suspend policy</a> " "<a href=\"#JDWP_SuspendPolicy\">suspend policy</a> "
"for the event was EVENT_THREAD " "for the event was EVENT_THREAD "
"all threads will be suspended instead, and the " "all threads will be suspended instead, and the "
"composite event's suspend policy will reflect this change. " "composite event's suspend policy will reflect this change. "
"<p>" "<p>"
"Note that the discussion above does not apply to system threads " "Note that the discussion above does not apply to system threads "
"created by the target VM during its normal (non-debug) operation. " "created by the target VM during its normal (non-debug) operation. "
) )
(byte refTypeTag "Kind of reference type. " (byte refTypeTag "Kind of reference type. "
"See <a href=\"#JDWP_TypeTag\">JDWP.TypeTag</a>") "See <a href=\"#JDWP_TypeTag\">JDWP.TypeTag</a>")
(referenceTypeID typeID "Type being prepared") (referenceTypeID typeID "Type being prepared")
(string signature "Type signature") (string signature "Type signature")
(int status "Status of type. " (int status "Status of type. "
"See <a href=\"#JDWP_ClassStatus\">JDWP.ClassStatus</a>") "See <a href=\"#JDWP_ClassStatus\">JDWP.ClassStatus</a>")
) )
(Alt ClassUnload=JDWP.EventKind.CLASS_UNLOAD (Alt ClassUnload=JDWP.EventKind.CLASS_UNLOAD
"Notification of a class unload in the target VM. " "Notification of a class unload in the target VM. "
"<p>" "<p>"
"There are severe constraints on the debugger back-end during " "There are severe constraints on the debugger back-end during "
"garbage collection, so unload information is greatly limited. " "garbage collection, so unload information is greatly limited. "
(int requestID "Request that generated event") (int requestID "Request that generated event")
(string signature "Type signature") (string signature "Type signature")
) )
(Alt FieldAccess=JDWP.EventKind.FIELD_ACCESS (Alt FieldAccess=JDWP.EventKind.FIELD_ACCESS
"Notification of a field access in the target VM. " "Notification of a field access in the target VM. "
"Field modifications " "Field modifications "
"are not considered field accesses. " "are not considered field accesses. "
"Requires canWatchFieldAccess capability - see " "Requires canWatchFieldAccess capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(int requestID "Request that generated event") (int requestID "Request that generated event")
(threadObject thread "Accessing thread") (threadObject thread "Accessing thread")
(location location "Location of access") (location location "Location of access")
...@@ -2923,10 +2923,10 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2923,10 +2923,10 @@ JDWP "Java(tm) Debug Wire Protocol"
"Object being accessed (null=0 for statics") "Object being accessed (null=0 for statics")
) )
(Alt FieldModification=JDWP.EventKind.FIELD_MODIFICATION (Alt FieldModification=JDWP.EventKind.FIELD_MODIFICATION
"Notification of a field modification in the target VM. " "Notification of a field modification in the target VM. "
"Requires canWatchFieldModification capability - see " "Requires canWatchFieldModification capability - see "
"<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>." "<a href=\"#JDWP_VirtualMachine_CapabilitiesNew\">CapabilitiesNew</a>."
(int requestID "Request that generated event") (int requestID "Request that generated event")
(threadObject thread "Modifying thread") (threadObject thread "Modifying thread")
(location location "Location of modify") (location location "Location of modify")
...@@ -2938,10 +2938,10 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2938,10 +2938,10 @@ JDWP "Java(tm) Debug Wire Protocol"
"Object being modified (null=0 for statics") "Object being modified (null=0 for statics")
(value valueToBe "Value to be assigned") (value valueToBe "Value to be assigned")
) )
(Alt VMDeath=JDWP.EventKind.VM_DEATH (Alt VMDeath=JDWP.EventKind.VM_DEATH
(int requestID (int requestID
"Request that generated event") "Request that generated event")
) )
) )
) )
) )
...@@ -2950,33 +2950,33 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2950,33 +2950,33 @@ JDWP "Java(tm) Debug Wire Protocol"
(ConstantSet Error (ConstantSet Error
(Constant NONE =0 "No error has occurred.") (Constant NONE =0 "No error has occurred.")
(Constant INVALID_THREAD =10 "Passed thread is null, is not a valid thread or has exited.") (Constant INVALID_THREAD =10 "Passed thread is null, is not a valid thread or has exited.")
(Constant INVALID_THREAD_GROUP =11 "Thread group invalid.") (Constant INVALID_THREAD_GROUP =11 "Thread group invalid.")
(Constant INVALID_PRIORITY =12 "Invalid priority.") (Constant INVALID_PRIORITY =12 "Invalid priority.")
(Constant THREAD_NOT_SUSPENDED =13 "If the specified thread has not been " (Constant THREAD_NOT_SUSPENDED =13 "If the specified thread has not been "
"suspended by an event.") "suspended by an event.")
(Constant THREAD_SUSPENDED =14 "Thread already suspended.") (Constant THREAD_SUSPENDED =14 "Thread already suspended.")
(Constant THREAD_NOT_ALIVE =15 "Thread has not been started or is now dead.") (Constant THREAD_NOT_ALIVE =15 "Thread has not been started or is now dead.")
(Constant INVALID_OBJECT =20 "If this reference type has been unloaded " (Constant INVALID_OBJECT =20 "If this reference type has been unloaded "
"and garbage collected.") "and garbage collected.")
(Constant INVALID_CLASS =21 "Invalid class.") (Constant INVALID_CLASS =21 "Invalid class.")
(Constant CLASS_NOT_PREPARED =22 "Class has been loaded but not yet prepared.") (Constant CLASS_NOT_PREPARED =22 "Class has been loaded but not yet prepared.")
(Constant INVALID_METHODID =23 "Invalid method.") (Constant INVALID_METHODID =23 "Invalid method.")
(Constant INVALID_LOCATION =24 "Invalid location.") (Constant INVALID_LOCATION =24 "Invalid location.")
(Constant INVALID_FIELDID =25 "Invalid field.") (Constant INVALID_FIELDID =25 "Invalid field.")
(Constant INVALID_FRAMEID =30 "Invalid jframeID.") (Constant INVALID_FRAMEID =30 "Invalid jframeID.")
(Constant NO_MORE_FRAMES =31 "There are no more Java or JNI frames on the " (Constant NO_MORE_FRAMES =31 "There are no more Java or JNI frames on the "
"call stack.") "call stack.")
(Constant OPAQUE_FRAME =32 "Information about the frame is not available.") (Constant OPAQUE_FRAME =32 "Information about the frame is not available.")
(Constant NOT_CURRENT_FRAME =33 "Operation can only be performed on current frame.") (Constant NOT_CURRENT_FRAME =33 "Operation can only be performed on current frame.")
(Constant TYPE_MISMATCH =34 "The variable is not an appropriate type for " (Constant TYPE_MISMATCH =34 "The variable is not an appropriate type for "
"the function used.") "the function used.")
(Constant INVALID_SLOT =35 "Invalid slot.") (Constant INVALID_SLOT =35 "Invalid slot.")
(Constant DUPLICATE =40 "Item already set.") (Constant DUPLICATE =40 "Item already set.")
(Constant NOT_FOUND =41 "Desired element not found.") (Constant NOT_FOUND =41 "Desired element not found.")
(Constant INVALID_MONITOR =50 "Invalid monitor.") (Constant INVALID_MONITOR =50 "Invalid monitor.")
(Constant NOT_MONITOR_OWNER =51 "This thread doesn't own the monitor.") (Constant NOT_MONITOR_OWNER =51 "This thread doesn't own the monitor.")
(Constant INTERRUPT =52 "The call has been interrupted before completion.") (Constant INTERRUPT =52 "The call has been interrupted before completion.")
(Constant INVALID_CLASS_FORMAT =60 "The virtual machine attempted to read a class " (Constant INVALID_CLASS_FORMAT =60 "The virtual machine attempted to read a class "
"file and determined that the file is malformed " "file and determined that the file is malformed "
"or otherwise cannot be interpreted as a class file.") "or otherwise cannot be interpreted as a class file.")
...@@ -2985,60 +2985,60 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -2985,60 +2985,60 @@ JDWP "Java(tm) Debug Wire Protocol"
"initializing a class.") "initializing a class.")
(Constant FAILS_VERIFICATION =62 "The verifier detected that a class file, " (Constant FAILS_VERIFICATION =62 "The verifier detected that a class file, "
"though well formed, contained some sort of " "though well formed, contained some sort of "
"internal inconsistency or security problem.") "internal inconsistency or security problem.")
(Constant ADD_METHOD_NOT_IMPLEMENTED (Constant ADD_METHOD_NOT_IMPLEMENTED
=63 "Adding methods has not been implemented.") =63 "Adding methods has not been implemented.")
(Constant SCHEMA_CHANGE_NOT_IMPLEMENTED (Constant SCHEMA_CHANGE_NOT_IMPLEMENTED
=64 "Schema change has not been implemented.") =64 "Schema change has not been implemented.")
(Constant INVALID_TYPESTATE =65 "The state of the thread has been modified, " (Constant INVALID_TYPESTATE =65 "The state of the thread has been modified, "
"and is now inconsistent.") "and is now inconsistent.")
(Constant HIERARCHY_CHANGE_NOT_IMPLEMENTED (Constant HIERARCHY_CHANGE_NOT_IMPLEMENTED
=66 "A direct superclass is different for the new class " =66 "A direct superclass is different for the new class "
"version, or the set of directly implemented " "version, or the set of directly implemented "
"interfaces is different " "interfaces is different "
"and canUnrestrictedlyRedefineClasses is false.") "and canUnrestrictedlyRedefineClasses is false.")
(Constant DELETE_METHOD_NOT_IMPLEMENTED (Constant DELETE_METHOD_NOT_IMPLEMENTED
=67 "The new class version does not declare a method " =67 "The new class version does not declare a method "
"declared in the old class version " "declared in the old class version "
"and canUnrestrictedlyRedefineClasses is false.") "and canUnrestrictedlyRedefineClasses is false.")
(Constant UNSUPPORTED_VERSION =68 "A class file has a version number not supported " (Constant UNSUPPORTED_VERSION =68 "A class file has a version number not supported "
"by this VM.") "by this VM.")
(Constant NAMES_DONT_MATCH =69 "The class name defined in the new class file is " (Constant NAMES_DONT_MATCH =69 "The class name defined in the new class file is "
"different from the name in the old class object.") "different from the name in the old class object.")
(Constant CLASS_MODIFIERS_CHANGE_NOT_IMPLEMENTED (Constant CLASS_MODIFIERS_CHANGE_NOT_IMPLEMENTED
=70 "The new class version has different modifiers and " =70 "The new class version has different modifiers and "
"and canUnrestrictedlyRedefineClasses is false.") "and canUnrestrictedlyRedefineClasses is false.")
(Constant METHOD_MODIFIERS_CHANGE_NOT_IMPLEMENTED (Constant METHOD_MODIFIERS_CHANGE_NOT_IMPLEMENTED
=71 "A method in the new class version has " =71 "A method in the new class version has "
"different modifiers " "different modifiers "
"than its counterpart in the old class version and " "than its counterpart in the old class version and "
"and canUnrestrictedlyRedefineClasses is false.") "and canUnrestrictedlyRedefineClasses is false.")
(Constant NOT_IMPLEMENTED =99 "The functionality is not implemented in " (Constant NOT_IMPLEMENTED =99 "The functionality is not implemented in "
"this virtual machine.") "this virtual machine.")
(Constant NULL_POINTER =100 "Invalid pointer.") (Constant NULL_POINTER =100 "Invalid pointer.")
(Constant ABSENT_INFORMATION =101 "Desired information is not available.") (Constant ABSENT_INFORMATION =101 "Desired information is not available.")
(Constant INVALID_EVENT_TYPE =102 "The specified event type id is not recognized.") (Constant INVALID_EVENT_TYPE =102 "The specified event type id is not recognized.")
(Constant ILLEGAL_ARGUMENT =103 "Illegal argument.") (Constant ILLEGAL_ARGUMENT =103 "Illegal argument.")
(Constant OUT_OF_MEMORY =110 "The function needed to allocate memory and " (Constant OUT_OF_MEMORY =110 "The function needed to allocate memory and "
"no more memory was available for allocation.") "no more memory was available for allocation.")
(Constant ACCESS_DENIED =111 "Debugging has not been enabled in this " (Constant ACCESS_DENIED =111 "Debugging has not been enabled in this "
"virtual machine. JVMTI cannot be used.") "virtual machine. JVMTI cannot be used.")
(Constant VM_DEAD =112 "The virtual machine is not running.") (Constant VM_DEAD =112 "The virtual machine is not running.")
(Constant INTERNAL =113 "An unexpected internal error has occurred.") (Constant INTERNAL =113 "An unexpected internal error has occurred.")
(Constant UNATTACHED_THREAD =115 "The thread being used to call this function " (Constant UNATTACHED_THREAD =115 "The thread being used to call this function "
"is not attached to the virtual machine. " "is not attached to the virtual machine. "
"Calls must be made from attached threads.") "Calls must be made from attached threads.")
(Constant INVALID_TAG =500 "object type id or class tag.") (Constant INVALID_TAG =500 "object type id or class tag.")
(Constant ALREADY_INVOKING =502 "Previous invoke not complete.") (Constant ALREADY_INVOKING =502 "Previous invoke not complete.")
(Constant INVALID_INDEX =503 "Index is invalid.") (Constant INVALID_INDEX =503 "Index is invalid.")
(Constant INVALID_LENGTH =504 "The length is invalid.") (Constant INVALID_LENGTH =504 "The length is invalid.")
(Constant INVALID_STRING =506 "The string is invalid.") (Constant INVALID_STRING =506 "The string is invalid.")
(Constant INVALID_CLASS_LOADER =507 "The class loader is invalid.") (Constant INVALID_CLASS_LOADER =507 "The class loader is invalid.")
(Constant INVALID_ARRAY =508 "The array is invalid.") (Constant INVALID_ARRAY =508 "The array is invalid.")
(Constant TRANSPORT_LOAD =509 "Unable to load the transport.") (Constant TRANSPORT_LOAD =509 "Unable to load the transport.")
(Constant TRANSPORT_INIT =510 "Unable to initialize the transport.") (Constant TRANSPORT_INIT =510 "Unable to initialize the transport.")
(Constant NATIVE_METHOD =511 ) (Constant NATIVE_METHOD =511 )
(Constant INVALID_COUNT =512 "The count is invalid.") (Constant INVALID_COUNT =512 "The count is invalid.")
) )
(ConstantSet EventKind (ConstantSet EventKind
(Constant SINGLE_STEP =1 ) (Constant SINGLE_STEP =1 )
...@@ -3077,7 +3077,7 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -3077,7 +3077,7 @@ JDWP "Java(tm) Debug Wire Protocol"
) )
(ConstantSet SuspendStatus (ConstantSet SuspendStatus
(Constant SUSPEND_STATUS_SUSPENDED = 0x1 ) (Constant SUSPEND_STATUS_SUSPENDED = 0x1 )
) )
(ConstantSet ClassStatus (ConstantSet ClassStatus
(Constant VERIFIED =1 ) (Constant VERIFIED =1 )
...@@ -3086,9 +3086,9 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -3086,9 +3086,9 @@ JDWP "Java(tm) Debug Wire Protocol"
(Constant ERROR =8 ) (Constant ERROR =8 )
) )
(ConstantSet TypeTag (ConstantSet TypeTag
(Constant CLASS=1 "ReferenceType is a class. ") (Constant CLASS=1 "ReferenceType is a class. ")
(Constant INTERFACE=2 "ReferenceType is an interface. ") (Constant INTERFACE=2 "ReferenceType is an interface. ")
(Constant ARRAY=3 "ReferenceType is an array. ") (Constant ARRAY=3 "ReferenceType is an array. ")
) )
(ConstantSet Tag (ConstantSet Tag
(Constant ARRAY = '[' "'[' - an array object (objectID size). ") (Constant ARRAY = '[' "'[' - an array object (objectID size). ")
...@@ -3104,39 +3104,39 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -3104,39 +3104,39 @@ JDWP "Java(tm) Debug Wire Protocol"
(Constant BOOLEAN = 'Z' "'Z' - a boolean value (1 byte).") (Constant BOOLEAN = 'Z' "'Z' - a boolean value (1 byte).")
(Constant STRING = 's' "'s' - a String object (objectID size). ") (Constant STRING = 's' "'s' - a String object (objectID size). ")
(Constant THREAD = 't' "'t' - a Thread object (objectID size). ") (Constant THREAD = 't' "'t' - a Thread object (objectID size). ")
(Constant THREAD_GROUP = 'g' (Constant THREAD_GROUP = 'g'
"'g' - a ThreadGroup object (objectID size). ") "'g' - a ThreadGroup object (objectID size). ")
(Constant CLASS_LOADER = 'l' (Constant CLASS_LOADER = 'l'
"'l' - a ClassLoader object (objectID size). ") "'l' - a ClassLoader object (objectID size). ")
(Constant CLASS_OBJECT = 'c' (Constant CLASS_OBJECT = 'c'
"'c' - a class object object (objectID size). ") "'c' - a class object object (objectID size). ")
) )
(ConstantSet StepDepth (ConstantSet StepDepth
(Constant INTO = 0 (Constant INTO = 0
"Step into any method calls that occur before the end of the step. ") "Step into any method calls that occur before the end of the step. ")
(Constant OVER = 1 (Constant OVER = 1
"Step over any method calls that occur before the end of the step. ") "Step over any method calls that occur before the end of the step. ")
(Constant OUT = 2 (Constant OUT = 2
"Step out of the current method. ") "Step out of the current method. ")
) )
(ConstantSet StepSize (ConstantSet StepSize
(Constant MIN = 0 (Constant MIN = 0
"Step by the minimum possible amount (often a bytecode instruction). ") "Step by the minimum possible amount (often a bytecode instruction). ")
(Constant LINE = 1 (Constant LINE = 1
"Step to the next source line unless there is no line number information in which case a MIN step is done instead.") "Step to the next source line unless there is no line number information in which case a MIN step is done instead.")
) )
(ConstantSet SuspendPolicy (ConstantSet SuspendPolicy
(Constant NONE = 0 (Constant NONE = 0
"Suspend no threads when this event is encountered. ") "Suspend no threads when this event is encountered. ")
(Constant EVENT_THREAD = 1 (Constant EVENT_THREAD = 1
"Suspend the event thread when this event is encountered. ") "Suspend the event thread when this event is encountered. ")
(Constant ALL = 2 (Constant ALL = 2
"Suspend all threads when this event is encountered. ") "Suspend all threads when this event is encountered. ")
) )
(ConstantSet InvokeOptions (ConstantSet InvokeOptions
"The invoke options are a combination of zero or more of the following bit flags:" "The invoke options are a combination of zero or more of the following bit flags:"
(Constant INVOKE_SINGLE_THREADED = 0x01 (Constant INVOKE_SINGLE_THREADED = 0x01
...@@ -3144,5 +3144,3 @@ JDWP "Java(tm) Debug Wire Protocol" ...@@ -3144,5 +3144,3 @@ JDWP "Java(tm) Debug Wire Protocol"
(Constant INVOKE_NONVIRTUAL = 0x02 (Constant INVOKE_NONVIRTUAL = 0x02
"otherwise, normal virtual invoke (instance methods only)") "otherwise, normal virtual invoke (instance methods only)")
) )
makefiles/jprt.gmk
浏览文件 @ e864d64d
...@@ -25,22 +25,21 @@ ...@@ -25,22 +25,21 @@
# JPRT rule to build this workspace # JPRT rule to build this workspace
JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip JPRT_ARCHIVE_BUNDLE = $(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
jprt_build_product: all images jprt_build_product: all images
( $(CD) $(OUTPUTDIR)/j2sdk-image && \ ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
jprt_build_fastdebug: fastdebug images jprt_build_fastdebug: fastdebug images
( $(CD) $(OUTPUTDIR)/j2sdk-image && \ ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
jprt_build_debug: debug images jprt_build_debug: debug images
( $(CD) $(OUTPUTDIR)/j2sdk-image && \ ( $(CD) $(OUTPUTDIR)/j2sdk-image && \
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
# #
# Phonies to avoid accidents. # Phonies to avoid accidents.
# #
.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug .PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
makefiles/jprt.properties
浏览文件 @ e864d64d
...@@ -32,278 +32,277 @@ jprt.tools.default.release=jdk8 ...@@ -32,278 +32,277 @@ jprt.tools.default.release=jdk8
jprt.build.flavors=product,fastdebug jprt.build.flavors=product,fastdebug
# Standard list of jprt build targets for this source tree # Standard list of jprt build targets for this source tree
jprt.build.targets= \ jprt.build.targets= \
solaris_sparc_5.10-{product|fastdebug}, \ solaris_sparc_5.10-{product|fastdebug}, \
solaris_sparcv9_5.10-{product|fastdebug}, \ solaris_sparcv9_5.10-{product|fastdebug}, \
solaris_i586_5.10-{product|fastdebug}, \ solaris_i586_5.10-{product|fastdebug}, \
solaris_x64_5.10-{product|fastdebug}, \ solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \ linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \ linux_x64_2.6-{product|fastdebug}, \
windows_i586_6.1-{product|fastdebug}, \ windows_i586_6.1-{product|fastdebug}, \
windows_x64_6.1-{product|fastdebug} windows_x64_6.1-{product|fastdebug}
# User can select the test set with jprt submit "-testset name" option # User can select the test set with jprt submit "-testset name" option
jprt.my.test.set=${jprt.test.set} jprt.my.test.set=${jprt.test.set}
# Standard vm test target # Standard vm test target
jprt.vm.default.test.targets= \ jprt.vm.default.test.targets= \
solaris_sparc_5.10-product-c1-jvm98, \ solaris_sparc_5.10-product-c1-jvm98, \
solaris_sparcv9_5.10-product-c2-jvm98, \ solaris_sparcv9_5.10-product-c2-jvm98, \
solaris_i586_5.10-product-c1-jvm98, \ solaris_i586_5.10-product-c1-jvm98, \
solaris_x64_5.10-product-c2-jvm98, \ solaris_x64_5.10-product-c2-jvm98, \
linux_i586_2.6-product-{c1|c2}-jvm98, \ linux_i586_2.6-product-{c1|c2}-jvm98, \
linux_x64_2.6-product-c2-jvm98, \ linux_x64_2.6-product-c2-jvm98, \
windows_i586_6.1-product-c1-jvm98, \ windows_i586_6.1-product-c1-jvm98, \
windows_x64_6.1-product-c2-jvm98 windows_x64_6.1-product-c2-jvm98
# Select vm testlist to use (allow for testset to be empty too) # Select vm testlist to use (allow for testset to be empty too)
jprt.vm.all.test.targets=${jprt.vm.default.test.targets} jprt.vm.all.test.targets=${jprt.vm.default.test.targets}
jprt.vm..test.targets=${jprt.vm.default.test.targets} jprt.vm..test.targets=${jprt.vm.default.test.targets}
jprt.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets} jprt.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets}
# Default jdk test targets in test/Makefile (no fastdebug & limited c2) # Default jdk test targets in test/Makefile (no fastdebug & limited c2)
jprt.make.rule.default.test.targets= \ jprt.make.rule.default.test.targets= \
\ \
solaris_sparc_5.10-product-c1-jdk_beans1, \ solaris_sparc_5.10-product-c1-jdk_beans1, \
solaris_sparcv9_5.10-product-c2-jdk_beans1, \ solaris_sparcv9_5.10-product-c2-jdk_beans1, \
solaris_i586_5.10-product-c1-jdk_beans1, \ solaris_i586_5.10-product-c1-jdk_beans1, \
solaris_x64_5.10-product-c2-jdk_beans1, \ solaris_x64_5.10-product-c2-jdk_beans1, \
linux_i586_2.6-product-{c1|c2}-jdk_beans1, \ linux_i586_2.6-product-{c1|c2}-jdk_beans1, \
linux_x64_2.6-product-c2-jdk_beans1, \ linux_x64_2.6-product-c2-jdk_beans1, \
windows_i586_6.1-product-c1-jdk_beans1, \ windows_i586_6.1-product-c1-jdk_beans1, \
windows_x64_6.1-product-c2-jdk_beans1, \ windows_x64_6.1-product-c2-jdk_beans1, \
\ \
solaris_sparc_5.10-product-c1-jdk_io, \ solaris_sparc_5.10-product-c1-jdk_io, \
solaris_sparcv9_5.10-product-c2-jdk_io, \ solaris_sparcv9_5.10-product-c2-jdk_io, \
solaris_i586_5.10-product-c1-jdk_io, \ solaris_i586_5.10-product-c1-jdk_io, \
solaris_x64_5.10-product-c2-jdk_io, \ solaris_x64_5.10-product-c2-jdk_io, \
linux_i586_2.6-product-{c1|c2}-jdk_io, \ linux_i586_2.6-product-{c1|c2}-jdk_io, \
linux_x64_2.6-product-c2-jdk_io, \ linux_x64_2.6-product-c2-jdk_io, \
windows_i586_6.1-product-c1-jdk_io, \ windows_i586_6.1-product-c1-jdk_io, \
windows_x64_6.1-product-c2-jdk_io, \ windows_x64_6.1-product-c2-jdk_io, \
\ \
solaris_sparc_5.10-product-c1-jdk_lang, \ solaris_sparc_5.10-product-c1-jdk_lang, \
solaris_sparcv9_5.10-product-c2-jdk_lang, \ solaris_sparcv9_5.10-product-c2-jdk_lang, \
solaris_i586_5.10-product-c1-jdk_lang, \ solaris_i586_5.10-product-c1-jdk_lang, \
solaris_x64_5.10-product-c2-jdk_lang, \ solaris_x64_5.10-product-c2-jdk_lang, \
linux_i586_2.6-product-{c1|c2}-jdk_lang, \ linux_i586_2.6-product-{c1|c2}-jdk_lang, \
linux_x64_2.6-product-c2-jdk_lang, \ linux_x64_2.6-product-c2-jdk_lang, \
windows_i586_6.1-product-c1-jdk_lang, \ windows_i586_6.1-product-c1-jdk_lang, \
windows_x64_6.1-product-c2-jdk_lang, \ windows_x64_6.1-product-c2-jdk_lang, \
\ \
solaris_sparc_5.10-product-c1-jdk_math, \ solaris_sparc_5.10-product-c1-jdk_math, \
solaris_sparcv9_5.10-product-c2-jdk_math, \ solaris_sparcv9_5.10-product-c2-jdk_math, \
solaris_i586_5.10-product-c1-jdk_math, \ solaris_i586_5.10-product-c1-jdk_math, \
solaris_x64_5.10-product-c2-jdk_math, \ solaris_x64_5.10-product-c2-jdk_math, \
linux_i586_2.6-product-{c1|c2}-jdk_math, \ linux_i586_2.6-product-{c1|c2}-jdk_math, \
linux_x64_2.6-product-c2-jdk_math, \ linux_x64_2.6-product-c2-jdk_math, \
windows_i586_6.1-product-c1-jdk_math, \ windows_i586_6.1-product-c1-jdk_math, \
windows_x64_6.1-product-c2-jdk_math, \ windows_x64_6.1-product-c2-jdk_math, \
\ \
solaris_sparc_5.10-product-c1-jdk_misc, \ solaris_sparc_5.10-product-c1-jdk_misc, \
solaris_sparcv9_5.10-product-c2-jdk_misc, \ solaris_sparcv9_5.10-product-c2-jdk_misc, \
solaris_i586_5.10-product-c1-jdk_misc, \ solaris_i586_5.10-product-c1-jdk_misc, \
solaris_x64_5.10-product-c2-jdk_misc, \ solaris_x64_5.10-product-c2-jdk_misc, \
linux_i586_2.6-product-{c1|c2}-jdk_misc, \ linux_i586_2.6-product-{c1|c2}-jdk_misc, \
linux_x64_2.6-product-c2-jdk_misc, \ linux_x64_2.6-product-c2-jdk_misc, \
windows_i586_6.1-product-c1-jdk_misc, \ windows_i586_6.1-product-c1-jdk_misc, \
windows_x64_6.1-product-c2-jdk_misc, \ windows_x64_6.1-product-c2-jdk_misc, \
\ \
solaris_sparc_5.10-product-c1-jdk_net, \ solaris_sparc_5.10-product-c1-jdk_net, \
solaris_sparcv9_5.10-product-c2-jdk_net, \ solaris_sparcv9_5.10-product-c2-jdk_net, \
solaris_i586_5.10-product-c1-jdk_net, \ solaris_i586_5.10-product-c1-jdk_net, \
solaris_x64_5.10-product-c2-jdk_net, \ solaris_x64_5.10-product-c2-jdk_net, \
linux_i586_2.6-product-{c1|c2}-jdk_net, \ linux_i586_2.6-product-{c1|c2}-jdk_net, \
linux_x64_2.6-product-c2-jdk_net, \ linux_x64_2.6-product-c2-jdk_net, \
windows_i586_6.1-product-c1-jdk_net, \ windows_i586_6.1-product-c1-jdk_net, \
windows_x64_6.1-product-c2-jdk_net, \ windows_x64_6.1-product-c2-jdk_net, \
\ \
solaris_sparc_5.10-product-c1-jdk_nio1, \ solaris_sparc_5.10-product-c1-jdk_nio1, \
solaris_sparcv9_5.10-product-c2-jdk_nio1, \ solaris_sparcv9_5.10-product-c2-jdk_nio1, \
solaris_i586_5.10-product-c1-jdk_nio1, \ solaris_i586_5.10-product-c1-jdk_nio1, \
solaris_x64_5.10-product-c2-jdk_nio1, \ solaris_x64_5.10-product-c2-jdk_nio1, \
linux_i586_2.6-product-{c1|c2}-jdk_nio1, \ linux_i586_2.6-product-{c1|c2}-jdk_nio1, \
linux_x64_2.6-product-c2-jdk_nio1, \ linux_x64_2.6-product-c2-jdk_nio1, \
windows_i586_6.1-product-c1-jdk_nio1, \ windows_i586_6.1-product-c1-jdk_nio1, \
windows_x64_6.1-product-c2-jdk_nio1, \ windows_x64_6.1-product-c2-jdk_nio1, \
\ \
solaris_sparc_5.10-product-c1-jdk_nio2, \ solaris_sparc_5.10-product-c1-jdk_nio2, \
solaris_sparcv9_5.10-product-c2-jdk_nio2, \ solaris_sparcv9_5.10-product-c2-jdk_nio2, \
solaris_i586_5.10-product-c1-jdk_nio2, \ solaris_i586_5.10-product-c1-jdk_nio2, \
solaris_x64_5.10-product-c2-jdk_nio2, \ solaris_x64_5.10-product-c2-jdk_nio2, \
linux_i586_2.6-product-{c1|c2}-jdk_nio2, \ linux_i586_2.6-product-{c1|c2}-jdk_nio2, \
linux_x64_2.6-product-c2-jdk_nio2, \ linux_x64_2.6-product-c2-jdk_nio2, \
windows_i586_6.1-product-c1-jdk_nio2, \ windows_i586_6.1-product-c1-jdk_nio2, \
windows_x64_6.1-product-c2-jdk_nio2, \ windows_x64_6.1-product-c2-jdk_nio2, \
\ \
solaris_sparc_5.10-product-c1-jdk_nio3, \ solaris_sparc_5.10-product-c1-jdk_nio3, \
solaris_sparcv9_5.10-product-c2-jdk_nio3, \ solaris_sparcv9_5.10-product-c2-jdk_nio3, \
solaris_i586_5.10-product-c1-jdk_nio3, \ solaris_i586_5.10-product-c1-jdk_nio3, \
solaris_x64_5.10-product-c2-jdk_nio3, \ solaris_x64_5.10-product-c2-jdk_nio3, \
linux_i586_2.6-product-{c1|c2}-jdk_nio3, \ linux_i586_2.6-product-{c1|c2}-jdk_nio3, \
linux_x64_2.6-product-c2-jdk_nio3, \ linux_x64_2.6-product-c2-jdk_nio3, \
windows_i586_6.1-product-c1-jdk_nio3, \ windows_i586_6.1-product-c1-jdk_nio3, \
windows_x64_6.1-product-c2-jdk_nio3, \ windows_x64_6.1-product-c2-jdk_nio3, \
\ \
solaris_sparc_5.10-product-c1-jdk_security1, \ solaris_sparc_5.10-product-c1-jdk_security1, \
solaris_sparcv9_5.10-product-c2-jdk_security1, \ solaris_sparcv9_5.10-product-c2-jdk_security1, \
solaris_i586_5.10-product-c1-jdk_security1, \ solaris_i586_5.10-product-c1-jdk_security1, \
solaris_x64_5.10-product-c2-jdk_security1, \ solaris_x64_5.10-product-c2-jdk_security1, \
linux_i586_2.6-product-{c1|c2}-jdk_security1, \ linux_i586_2.6-product-{c1|c2}-jdk_security1, \
linux_x64_2.6-product-c2-jdk_security1, \ linux_x64_2.6-product-c2-jdk_security1, \
windows_i586_6.1-product-c1-jdk_security1, \ windows_i586_6.1-product-c1-jdk_security1, \
windows_x64_6.1-product-c2-jdk_security1, \ windows_x64_6.1-product-c2-jdk_security1, \
\ \
solaris_sparc_5.10-product-c1-jdk_text, \ solaris_sparc_5.10-product-c1-jdk_text, \
solaris_sparcv9_5.10-product-c2-jdk_text, \ solaris_sparcv9_5.10-product-c2-jdk_text, \
solaris_i586_5.10-product-c1-jdk_text, \ solaris_i586_5.10-product-c1-jdk_text, \
solaris_x64_5.10-product-c2-jdk_text, \ solaris_x64_5.10-product-c2-jdk_text, \
linux_i586_2.6-product-{c1|c2}-jdk_text, \ linux_i586_2.6-product-{c1|c2}-jdk_text, \
linux_x64_2.6-product-c2-jdk_text, \ linux_x64_2.6-product-c2-jdk_text, \
windows_i586_6.1-product-c1-jdk_text, \ windows_i586_6.1-product-c1-jdk_text, \
windows_x64_6.1-product-c2-jdk_text, \ windows_x64_6.1-product-c2-jdk_text, \
\ \
solaris_sparc_5.10-product-c1-jdk_tools1, \ solaris_sparc_5.10-product-c1-jdk_tools1, \
solaris_sparcv9_5.10-product-c2-jdk_tools1, \ solaris_sparcv9_5.10-product-c2-jdk_tools1, \
solaris_i586_5.10-product-c1-jdk_tools1, \ solaris_i586_5.10-product-c1-jdk_tools1, \
solaris_x64_5.10-product-c2-jdk_tools1, \ solaris_x64_5.10-product-c2-jdk_tools1, \
linux_i586_2.6-product-{c1|c2}-jdk_tools1, \ linux_i586_2.6-product-{c1|c2}-jdk_tools1, \
linux_x64_2.6-product-c2-jdk_tools1, \ linux_x64_2.6-product-c2-jdk_tools1, \
windows_i586_6.1-product-c1-jdk_tools1, \ windows_i586_6.1-product-c1-jdk_tools1, \
windows_x64_6.1-product-c2-jdk_tools1, \ windows_x64_6.1-product-c2-jdk_tools1, \
\ \
solaris_sparc_5.10-product-c1-jdk_util, \ solaris_sparc_5.10-product-c1-jdk_util, \
solaris_sparcv9_5.10-product-c2-jdk_util, \ solaris_sparcv9_5.10-product-c2-jdk_util, \
solaris_i586_5.10-product-c1-jdk_util, \ solaris_i586_5.10-product-c1-jdk_util, \
solaris_x64_5.10-product-c2-jdk_util, \ solaris_x64_5.10-product-c2-jdk_util, \
linux_i586_2.6-product-{c1|c2}-jdk_util, \ linux_i586_2.6-product-{c1|c2}-jdk_util, \
linux_x64_2.6-product-c2-jdk_util, \ linux_x64_2.6-product-c2-jdk_util, \
windows_i586_6.1-product-c1-jdk_util, \ windows_i586_6.1-product-c1-jdk_util, \
windows_x64_6.1-product-c2-jdk_util windows_x64_6.1-product-c2-jdk_util
# All jdk test targets in test/Makefile (still no fastdebug & limited c2) # All jdk test targets in test/Makefile (still no fastdebug & limited c2)
jprt.make.rule.all.test.targets= \ jprt.make.rule.all.test.targets= \
\ \
${jprt.make.rule.default.test.targets}, \ ${jprt.make.rule.default.test.targets}, \
\ \
solaris_sparc_5.10-product-c1-jdk_awt, \ solaris_sparc_5.10-product-c1-jdk_awt, \
solaris_sparcv9_5.10-product-c2-jdk_awt, \ solaris_sparcv9_5.10-product-c2-jdk_awt, \
solaris_i586_5.10-product-c1-jdk_awt, \ solaris_i586_5.10-product-c1-jdk_awt, \
solaris_x64_5.10-product-c2-jdk_awt, \ solaris_x64_5.10-product-c2-jdk_awt, \
linux_i586_2.6-product-{c1|c2}-jdk_awt, \ linux_i586_2.6-product-{c1|c2}-jdk_awt, \
linux_x64_2.6-product-c2-jdk_awt, \ linux_x64_2.6-product-c2-jdk_awt, \
windows_i586_6.1-product-c1-jdk_awt, \ windows_i586_6.1-product-c1-jdk_awt, \
windows_x64_6.1-product-c2-jdk_awt, \ windows_x64_6.1-product-c2-jdk_awt, \
\ \
solaris_sparc_5.10-product-c1-jdk_beans2, \ solaris_sparc_5.10-product-c1-jdk_beans2, \
solaris_sparcv9_5.10-product-c2-jdk_beans2, \ solaris_sparcv9_5.10-product-c2-jdk_beans2, \
solaris_i586_5.10-product-c1-jdk_beans2, \ solaris_i586_5.10-product-c1-jdk_beans2, \
solaris_x64_5.10-product-c2-jdk_beans2, \ solaris_x64_5.10-product-c2-jdk_beans2, \
linux_i586_2.6-product-{c1|c2}-jdk_beans2, \ linux_i586_2.6-product-{c1|c2}-jdk_beans2, \
linux_x64_2.6-product-c2-jdk_beans2, \ linux_x64_2.6-product-c2-jdk_beans2, \
windows_i586_6.1-product-c1-jdk_beans2, \ windows_i586_6.1-product-c1-jdk_beans2, \
windows_x64_6.1-product-c2-jdk_beans2, \ windows_x64_6.1-product-c2-jdk_beans2, \
\ \
solaris_sparc_5.10-product-c1-jdk_beans3, \ solaris_sparc_5.10-product-c1-jdk_beans3, \
solaris_sparcv9_5.10-product-c2-jdk_beans3, \ solaris_sparcv9_5.10-product-c2-jdk_beans3, \
solaris_i586_5.10-product-c1-jdk_beans3, \ solaris_i586_5.10-product-c1-jdk_beans3, \
solaris_x64_5.10-product-c2-jdk_beans3, \ solaris_x64_5.10-product-c2-jdk_beans3, \
linux_i586_2.6-product-{c1|c2}-jdk_beans3, \ linux_i586_2.6-product-{c1|c2}-jdk_beans3, \
linux_x64_2.6-product-c2-jdk_beans3, \ linux_x64_2.6-product-c2-jdk_beans3, \
windows_i586_6.1-product-c1-jdk_beans3, \ windows_i586_6.1-product-c1-jdk_beans3, \
windows_x64_6.1-product-c2-jdk_beans3, \ windows_x64_6.1-product-c2-jdk_beans3, \
\ \
solaris_sparc_5.10-product-c1-jdk_management1, \ solaris_sparc_5.10-product-c1-jdk_management1, \
solaris_sparcv9_5.10-product-c2-jdk_management1, \ solaris_sparcv9_5.10-product-c2-jdk_management1, \
solaris_i586_5.10-product-c1-jdk_management1, \ solaris_i586_5.10-product-c1-jdk_management1, \
solaris_x64_5.10-product-c2-jdk_management1, \ solaris_x64_5.10-product-c2-jdk_management1, \
linux_i586_2.6-product-{c1|c2}-jdk_management1, \ linux_i586_2.6-product-{c1|c2}-jdk_management1, \
linux_x64_2.6-product-c2-jdk_management1, \ linux_x64_2.6-product-c2-jdk_management1, \
windows_i586_6.1-product-c1-jdk_management1, \ windows_i586_6.1-product-c1-jdk_management1, \
windows_x64_6.1-product-c2-jdk_management1, \ windows_x64_6.1-product-c2-jdk_management1, \
\ \
solaris_sparc_5.10-product-c1-jdk_management2, \ solaris_sparc_5.10-product-c1-jdk_management2, \
solaris_sparcv9_5.10-product-c2-jdk_management2, \ solaris_sparcv9_5.10-product-c2-jdk_management2, \
solaris_i586_5.10-product-c1-jdk_management2, \ solaris_i586_5.10-product-c1-jdk_management2, \
solaris_x64_5.10-product-c2-jdk_management2, \ solaris_x64_5.10-product-c2-jdk_management2, \
linux_i586_2.6-product-{c1|c2}-jdk_management2, \ linux_i586_2.6-product-{c1|c2}-jdk_management2, \
linux_x64_2.6-product-c2-jdk_management2, \ linux_x64_2.6-product-c2-jdk_management2, \
windows_i586_6.1-product-c1-jdk_management2, \ windows_i586_6.1-product-c1-jdk_management2, \
windows_x64_6.1-product-c2-jdk_management2, \ windows_x64_6.1-product-c2-jdk_management2, \
\ \
solaris_sparc_5.10-product-c1-jdk_rmi, \ solaris_sparc_5.10-product-c1-jdk_rmi, \
solaris_sparcv9_5.10-product-c2-jdk_rmi, \ solaris_sparcv9_5.10-product-c2-jdk_rmi, \
solaris_i586_5.10-product-c1-jdk_rmi, \ solaris_i586_5.10-product-c1-jdk_rmi, \
solaris_x64_5.10-product-c2-jdk_rmi, \ solaris_x64_5.10-product-c2-jdk_rmi, \
linux_i586_2.6-product-{c1|c2}-jdk_rmi, \ linux_i586_2.6-product-{c1|c2}-jdk_rmi, \
linux_x64_2.6-product-c2-jdk_rmi, \ linux_x64_2.6-product-c2-jdk_rmi, \
windows_i586_6.1-product-c1-jdk_rmi, \ windows_i586_6.1-product-c1-jdk_rmi, \
windows_x64_6.1-product-c2-jdk_rmi, \ windows_x64_6.1-product-c2-jdk_rmi, \
\ \
solaris_sparc_5.10-product-c1-jdk_security2, \ solaris_sparc_5.10-product-c1-jdk_security2, \
solaris_sparcv9_5.10-product-c2-jdk_security2, \ solaris_sparcv9_5.10-product-c2-jdk_security2, \
solaris_i586_5.10-product-c1-jdk_security2, \ solaris_i586_5.10-product-c1-jdk_security2, \
solaris_x64_5.10-product-c2-jdk_security2, \ solaris_x64_5.10-product-c2-jdk_security2, \
linux_i586_2.6-product-{c1|c2}-jdk_security2, \ linux_i586_2.6-product-{c1|c2}-jdk_security2, \
linux_x64_2.6-product-c2-jdk_security2, \ linux_x64_2.6-product-c2-jdk_security2, \
windows_i586_6.1-product-c1-jdk_security2, \ windows_i586_6.1-product-c1-jdk_security2, \
windows_x64_6.1-product-c2-jdk_security2, \ windows_x64_6.1-product-c2-jdk_security2, \
\ \
solaris_sparc_5.10-product-c1-jdk_security3, \ solaris_sparc_5.10-product-c1-jdk_security3, \
solaris_sparcv9_5.10-product-c2-jdk_security3, \ solaris_sparcv9_5.10-product-c2-jdk_security3, \
solaris_i586_5.10-product-c1-jdk_security3, \ solaris_i586_5.10-product-c1-jdk_security3, \
solaris_x64_5.10-product-c2-jdk_security3, \ solaris_x64_5.10-product-c2-jdk_security3, \
linux_i586_2.6-product-{c1|c2}-jdk_security3, \ linux_i586_2.6-product-{c1|c2}-jdk_security3, \
linux_x64_2.6-product-c2-jdk_security3, \ linux_x64_2.6-product-c2-jdk_security3, \
windows_i586_6.1-product-c1-jdk_security3, \ windows_i586_6.1-product-c1-jdk_security3, \
windows_x64_6.1-product-c2-jdk_security3, \ windows_x64_6.1-product-c2-jdk_security3, \
\ \
solaris_sparc_5.10-product-c1-jdk_sound, \ solaris_sparc_5.10-product-c1-jdk_sound, \
solaris_sparcv9_5.10-product-c2-jdk_sound, \ solaris_sparcv9_5.10-product-c2-jdk_sound, \
solaris_i586_5.10-product-c1-jdk_sound, \ solaris_i586_5.10-product-c1-jdk_sound, \
solaris_x64_5.10-product-c2-jdk_sound, \ solaris_x64_5.10-product-c2-jdk_sound, \
linux_i586_2.6-product-{c1|c2}-jdk_sound, \ linux_i586_2.6-product-{c1|c2}-jdk_sound, \
linux_x64_2.6-product-c2-jdk_sound, \ linux_x64_2.6-product-c2-jdk_sound, \
windows_i586_6.1-product-c1-jdk_sound, \ windows_i586_6.1-product-c1-jdk_sound, \
windows_x64_6.1-product-c2-jdk_sound, \ windows_x64_6.1-product-c2-jdk_sound, \
\ \
solaris_sparc_5.10-product-c1-jdk_swing, \ solaris_sparc_5.10-product-c1-jdk_swing, \
solaris_sparcv9_5.10-product-c2-jdk_swing, \ solaris_sparcv9_5.10-product-c2-jdk_swing, \
solaris_i586_5.10-product-c1-jdk_swing, \ solaris_i586_5.10-product-c1-jdk_swing, \
solaris_x64_5.10-product-c2-jdk_swing, \ solaris_x64_5.10-product-c2-jdk_swing, \
linux_i586_2.6-product-{c1|c2}-jdk_swing, \ linux_i586_2.6-product-{c1|c2}-jdk_swing, \
linux_x64_2.6-product-c2-jdk_swing, \ linux_x64_2.6-product-c2-jdk_swing, \
windows_i586_6.1-product-c1-jdk_swing, \ windows_i586_6.1-product-c1-jdk_swing, \
windows_x64_6.1-product-c2-jdk_swing, \ windows_x64_6.1-product-c2-jdk_swing, \
\ \
solaris_sparc_5.10-product-c1-jdk_tools2, \ solaris_sparc_5.10-product-c1-jdk_tools2, \
solaris_sparcv9_5.10-product-c2-jdk_tools2, \ solaris_sparcv9_5.10-product-c2-jdk_tools2, \
solaris_i586_5.10-product-c1-jdk_tools2, \ solaris_i586_5.10-product-c1-jdk_tools2, \
solaris_x64_5.10-product-c2-jdk_tools2, \ solaris_x64_5.10-product-c2-jdk_tools2, \
linux_i586_2.6-product-{c1|c2}-jdk_tools2, \ linux_i586_2.6-product-{c1|c2}-jdk_tools2, \
linux_x64_2.6-product-c2-jdk_tools2, \ linux_x64_2.6-product-c2-jdk_tools2, \
windows_i586_6.1-product-c1-jdk_tools2, \ windows_i586_6.1-product-c1-jdk_tools2, \
windows_x64_6.1-product-c2-jdk_tools2 windows_x64_6.1-product-c2-jdk_tools2
# JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken) # JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken)
jprt.my.jck.test.target.set= \ jprt.my.jck.test.target.set= \
solaris_sparc_5.10-product-c1-JCK7TESTRULE, \ solaris_sparc_5.10-product-c1-JCK7TESTRULE, \
solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \ solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \
solaris_i586_5.10-product-c1-JCK7TESTRULE, \ solaris_i586_5.10-product-c1-JCK7TESTRULE, \
solaris_x64_5.10-product-c2-JCK7TESTRULE, \ solaris_x64_5.10-product-c2-JCK7TESTRULE, \
linux_i586_2.6-product-c1-JCK7TESTRULE, \ linux_i586_2.6-product-c1-JCK7TESTRULE, \
linux_x64_2.6-product-c2-JCK7TESTRULE linux_x64_2.6-product-c2-JCK7TESTRULE
# JCK testset targets (e.g. jprt submit -testset jck ... ) # JCK testset targets (e.g. jprt submit -testset jck ... )
jprt.make.rule.jck.test.targets= \ jprt.make.rule.jck.test.targets= \
${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7devtools}, \ ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7devtools}, \
${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7runtime}, \ ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7runtime}, \
${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7compiler} ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7compiler}
# Select list to use (allow for testset to be empty too) # Select list to use (allow for testset to be empty too)
jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets} jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets}
jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets} jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets}
# Directories to be excluded from the source bundles # Directories to be excluded from the source bundles
jprt.bundle.exclude.src.dirs=build dist webrev jprt.bundle.exclude.src.dirs=build dist webrev
makefiles/mapfiles/libawt/mapfile-mawt-vers
浏览文件 @ e864d64d
...@@ -201,7 +201,7 @@ SUNWprivate_1.1 { ...@@ -201,7 +201,7 @@ SUNWprivate_1.1 {
Java_sun_print_CUPSPrinter_initIDs; Java_sun_print_CUPSPrinter_initIDs;
Java_sun_print_CUPSPrinter_getCupsServer; Java_sun_print_CUPSPrinter_getCupsServer;
Java_sun_print_CUPSPrinter_getCupsPort; Java_sun_print_CUPSPrinter_getCupsPort;
Java_sun_print_CUPSPrinter_canConnect; Java_sun_print_CUPSPrinter_canConnect;
Java_sun_print_CUPSPrinter_getMedia; Java_sun_print_CUPSPrinter_getMedia;
Java_sun_print_CUPSPrinter_getPageSizes; Java_sun_print_CUPSPrinter_getPageSizes;
...@@ -230,7 +230,7 @@ SUNWprivate_1.1 { ...@@ -230,7 +230,7 @@ SUNWprivate_1.1 {
Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetColorForState; Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetColorForState;
Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetClassValue; Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetClassValue;
Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetPangoFontName; Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetPangoFontName;
awt_display; awt_display;
awt_Lock; awt_Lock;
awt_Unlock; awt_Unlock;
...@@ -253,7 +253,7 @@ SUNWprivate_1.1 { ...@@ -253,7 +253,7 @@ SUNWprivate_1.1 {
getAwtLockFunctions; getAwtLockFunctions;
getAwtData; getAwtData;
getAwtDisplay; getAwtDisplay;
# libfontmanager entry points # libfontmanager entry points
AWTIsHeadless; AWTIsHeadless;
AWTCountFonts; AWTCountFonts;
...@@ -282,4 +282,3 @@ SUNWprivate_1.1 { ...@@ -282,4 +282,3 @@ SUNWprivate_1.1 {
local: local:
*; *;
}; };
makefiles/mapfiles/libawt/mapfile-vers
浏览文件 @ e864d64d
...@@ -46,9 +46,9 @@ SUNWprivate_1.1 { ...@@ -46,9 +46,9 @@ SUNWprivate_1.1 {
Java_java_awt_MenuBar_initIDs; Java_java_awt_MenuBar_initIDs;
Java_java_awt_ScrollPaneAdjustable_initIDs; Java_java_awt_ScrollPaneAdjustable_initIDs;
Java_java_awt_Toolkit_initIDs; Java_java_awt_Toolkit_initIDs;
Java_sun_awt_DebugSettings_setCTracingOn__Z; Java_sun_awt_DebugSettings_setCTracingOn__Z;
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2; Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I; Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
Java_sun_awt_image_ByteComponentRaster_initIDs; Java_sun_awt_image_ByteComponentRaster_initIDs;
Java_sun_awt_image_GifImageDecoder_initIDs; Java_sun_awt_image_GifImageDecoder_initIDs;
Java_sun_awt_image_GifImageDecoder_parseImage; Java_sun_awt_image_GifImageDecoder_parseImage;
...@@ -156,7 +156,7 @@ SUNWprivate_1.1 { ...@@ -156,7 +156,7 @@ SUNWprivate_1.1 {
colorValueID; colorValueID;
mul8table; mul8table;
jvm; jvm;
# ProcessPath entry points and data # ProcessPath entry points and data
doDrawPath; doDrawPath;
doFillPath; doFillPath;
...@@ -195,4 +195,3 @@ SUNWprivate_1.1 { ...@@ -195,4 +195,3 @@ SUNWprivate_1.1 {
local: local:
*; *;
}; };
makefiles/mapfiles/libawt/mapfile-vers-linux
浏览文件 @ e864d64d
...@@ -47,9 +47,9 @@ SUNWprivate_1.1 { ...@@ -47,9 +47,9 @@ SUNWprivate_1.1 {
Java_java_awt_ScrollPaneAdjustable_initIDs; Java_java_awt_ScrollPaneAdjustable_initIDs;
Java_java_awt_Toolkit_initIDs; Java_java_awt_Toolkit_initIDs;
Java_java_awt_TrayIcon_initIDs; Java_java_awt_TrayIcon_initIDs;
Java_sun_awt_DebugSettings_setCTracingOn__Z; Java_sun_awt_DebugSettings_setCTracingOn__Z;
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2; Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I; Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
Java_sun_awt_image_ByteComponentRaster_initIDs; Java_sun_awt_image_ByteComponentRaster_initIDs;
Java_sun_awt_image_GifImageDecoder_initIDs; Java_sun_awt_image_GifImageDecoder_initIDs;
Java_sun_awt_image_GifImageDecoder_parseImage; Java_sun_awt_image_GifImageDecoder_parseImage;
...@@ -223,8 +223,8 @@ SUNWprivate_1.1 { ...@@ -223,8 +223,8 @@ SUNWprivate_1.1 {
Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama; Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint; Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
Java_sun_awt_X11GraphicsEnvironment_initXRender; Java_sun_awt_X11GraphicsEnvironment_initXRender;
Java_java_awt_AWTEvent_initIDs; Java_java_awt_AWTEvent_initIDs;
Java_java_awt_Button_initIDs; Java_java_awt_Button_initIDs;
...@@ -287,7 +287,7 @@ SUNWprivate_1.1 { ...@@ -287,7 +287,7 @@ SUNWprivate_1.1 {
getAwtLockFunctions; getAwtLockFunctions;
getAwtData; getAwtData;
getAwtDisplay; getAwtDisplay;
# libfontmanager entry points # libfontmanager entry points
AWTIsHeadless; AWTIsHeadless;
AWTCountFonts; AWTCountFonts;
...@@ -314,4 +314,3 @@ SUNWprivate_1.1 { ...@@ -314,4 +314,3 @@ SUNWprivate_1.1 {
local: local:
*; *;
}; };
makefiles/mapfiles/libawt_headless/mapfile-vers
浏览文件 @ e864d64d
...@@ -73,7 +73,7 @@ SUNWprivate_1.1 { ...@@ -73,7 +73,7 @@ SUNWprivate_1.1 {
Java_sun_print_CUPSPrinter_initIDs; Java_sun_print_CUPSPrinter_initIDs;
Java_sun_print_CUPSPrinter_getCupsServer; Java_sun_print_CUPSPrinter_getCupsServer;
Java_sun_print_CUPSPrinter_getCupsPort; Java_sun_print_CUPSPrinter_getCupsPort;
Java_sun_print_CUPSPrinter_canConnect; Java_sun_print_CUPSPrinter_canConnect;
Java_sun_print_CUPSPrinter_getMedia; Java_sun_print_CUPSPrinter_getMedia;
Java_sun_print_CUPSPrinter_getPageSizes; Java_sun_print_CUPSPrinter_getPageSizes;
...@@ -106,4 +106,3 @@ SUNWprivate_1.1 { ...@@ -106,4 +106,3 @@ SUNWprivate_1.1 {
local: local:
*; *;
}; };
makefiles/mapfiles/libawt_xawt/mapfile-vers
浏览文件 @ e864d64d
...@@ -439,7 +439,7 @@ SUNWprivate_1.1 { ...@@ -439,7 +439,7 @@ SUNWprivate_1.1 {
Java_sun_print_CUPSPrinter_initIDs; Java_sun_print_CUPSPrinter_initIDs;
Java_sun_print_CUPSPrinter_getCupsServer; Java_sun_print_CUPSPrinter_getCupsServer;
Java_sun_print_CUPSPrinter_getCupsPort; Java_sun_print_CUPSPrinter_getCupsPort;
Java_sun_print_CUPSPrinter_canConnect; Java_sun_print_CUPSPrinter_canConnect;
Java_sun_print_CUPSPrinter_getMedia; Java_sun_print_CUPSPrinter_getMedia;
Java_sun_print_CUPSPrinter_getPageSizes; Java_sun_print_CUPSPrinter_getPageSizes;
......
makefiles/mapfiles/libfontmanager/mapfile-vers
浏览文件 @ e864d64d
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
SUNWprivate_1.1 { SUNWprivate_1.1 {
global: global:
getSunFontIDs; getSunFontIDs;
newLayoutTableCache; newLayoutTableCache;
freeLayoutTableCache; freeLayoutTableCache;
isNullScalerContext; isNullScalerContext;
Java_sun_font_NullFontScaler_getNullScalerContext; Java_sun_font_NullFontScaler_getNullScalerContext;
......
makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk
浏览文件 @ e864d64d
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
SUNWprivate_1.1 { SUNWprivate_1.1 {
global: global:
getSunFontIDs; getSunFontIDs;
newLayoutTableCache; newLayoutTableCache;
freeLayoutTableCache; freeLayoutTableCache;
isNullScalerContext; isNullScalerContext;
Java_sun_font_NullFontScaler_getNullScalerContext; Java_sun_font_NullFontScaler_getNullScalerContext;
......
makefiles/mapfiles/libj2pcsc/mapfile-vers
浏览文件 @ e864d64d
...@@ -39,7 +39,7 @@ SUNWprivate_1.1 { ...@@ -39,7 +39,7 @@ SUNWprivate_1.1 {
Java_sun_security_smartcardio_PCSC_SCardBeginTransaction; Java_sun_security_smartcardio_PCSC_SCardBeginTransaction;
Java_sun_security_smartcardio_PCSC_SCardEndTransaction; Java_sun_security_smartcardio_PCSC_SCardEndTransaction;
Java_sun_security_smartcardio_PCSC_SCardControl; Java_sun_security_smartcardio_PCSC_SCardControl;
local: local:
*; *;
}; };
makefiles/mapfiles/libjdga/mapfile-vers
浏览文件 @ e864d64d
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
SUNWprivate_1.1 { SUNWprivate_1.1 {
global: global:
JDgaLibInit; JDgaLibInit;
local: local:
*; *;
}; };
makefiles/mapfiles/libjli/mapfile-vers
浏览文件 @ e864d64d
...@@ -36,7 +36,7 @@ SUNWprivate_1.1 { ...@@ -36,7 +36,7 @@ SUNWprivate_1.1 {
JLI_ReportExceptionDescription; JLI_ReportExceptionDescription;
JLI_GetStdArgs; JLI_GetStdArgs;
JLI_GetStdArgc; JLI_GetStdArgc;
local: local:
*; *;
}; };
makefiles/mapfiles/libverify/mapfile-vers
浏览文件 @ e864d64d
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# or visit www.oracle.com if you need additional information or have any # or visit www.oracle.com if you need additional information or have any
# questions. # questions.
# #
SUNWprivate_1.1 { SUNWprivate_1.1 {
global: global:
VerifyClass; VerifyClass;
......
makefiles/profile-includes.txt
浏览文件 @ e864d64d
...@@ -253,4 +253,3 @@ FULL_JRE_JAR_FILES := \ ...@@ -253,4 +253,3 @@ FULL_JRE_JAR_FILES := \
ext/nashorn.jar \ ext/nashorn.jar \
ext/zipfs.jar \ ext/zipfs.jar \
jfr.jar jfr.jar
makefiles/profile-rtjar-includes.txt
浏览文件 @ e864d64d
...@@ -24,22 +24,22 @@ ...@@ -24,22 +24,22 @@
# #
# Included or excluded types must take one of two forms # Included or excluded types must take one of two forms
# - *.class to indicate all classes; or else # - *.class to indicate all classes; or else
# - a full single type name e.g. # - a full single type name e.g.
# com/sun/security/auth/callback/DialogCallbackHandler$$1.class # com/sun/security/auth/callback/DialogCallbackHandler$$1.class
# You can not use arbitrary wildcards like DialogCallbackHandler*.class. # You can not use arbitrary wildcards like DialogCallbackHandler*.class.
# #
# Notes: # Notes:
# - Nested types must use $$ in place of $ as $ is the make meta-character # - Nested types must use $$ in place of $ as $ is the make meta-character
# - If a package is not listed in any profile's inclusion list then it will # - If a package is not listed in any profile's inclusion list then it will
# not appear in any profile. But if a package is also missing from the # not appear in any profile. But if a package is also missing from the
# full JRE's inclusion list then it will still be part of the full JRE. # full JRE's inclusion list then it will still be part of the full JRE.
# This is because the full JRE's inclusion lists are only used to define # This is because the full JRE's inclusion lists are only used to define
# the exclusion lists for profiles; they are not used to define the full # the exclusion lists for profiles; they are not used to define the full
# JRE contents - that is still done with the pre-profile legacy mechanism # JRE contents - that is still done with the pre-profile legacy mechanism
# (all packagesthat can be found, less those not intended for rt.jar). # (all packagesthat can be found, less those not intended for rt.jar).
# This was done to minimize the impact of profiles on the regular # This was done to minimize the impact of profiles on the regular
# non-profile build. # non-profile build.
# #
PROFILE_1_RTJAR_INCLUDE_PACKAGES := \ PROFILE_1_RTJAR_INCLUDE_PACKAGES := \
com/sun/demo/jvmti/hprof \ com/sun/demo/jvmti/hprof \
...@@ -71,11 +71,11 @@ PROFILE_1_RTJAR_INCLUDE_PACKAGES := \ ...@@ -71,11 +71,11 @@ PROFILE_1_RTJAR_INCLUDE_PACKAGES := \
sun/usagetracker \ sun/usagetracker \
sun/util sun/util
PROFILE_1_RTJAR_INCLUDE_TYPES := PROFILE_1_RTJAR_INCLUDE_TYPES :=
PROFILE_1_RTJAR_EXCLUDE_TYPES := PROFILE_1_RTJAR_EXCLUDE_TYPES :=
PROFILE_1_INCLUDE_METAINF_SERVICES := PROFILE_1_INCLUDE_METAINF_SERVICES :=
PROFILE_2_RTJAR_INCLUDE_PACKAGES := \ PROFILE_2_RTJAR_INCLUDE_PACKAGES := \
...@@ -96,12 +96,12 @@ PROFILE_2_RTJAR_INCLUDE_PACKAGES := \ ...@@ -96,12 +96,12 @@ PROFILE_2_RTJAR_INCLUDE_PACKAGES := \
sun/rmi \ sun/rmi \
sun/util/xml sun/util/xml
PROFILE_2_RTJAR_INCLUDE_TYPES := PROFILE_2_RTJAR_INCLUDE_TYPES :=
PROFILE_2_RTJAR_EXCLUDE_TYPES := PROFILE_2_RTJAR_EXCLUDE_TYPES :=
PROFILE_2_INCLUDE_METAINF_SERVICES := \ PROFILE_2_INCLUDE_METAINF_SERVICES := \
META-INF/services/sun.util.spi.XmlPropertiesProvider META-INF/services/sun.util.spi.XmlPropertiesProvider
PROFILE_3_RTJAR_INCLUDE_PACKAGES := \ PROFILE_3_RTJAR_INCLUDE_PACKAGES := \
...@@ -146,7 +146,7 @@ PROFILE_3_RTJAR_INCLUDE_PACKAGES := \ ...@@ -146,7 +146,7 @@ PROFILE_3_RTJAR_INCLUDE_PACKAGES := \
sun/security/smartcardio \ sun/security/smartcardio \
sun/tracing sun/tracing
PROFILE_3_RTJAR_INCLUDE_TYPES := PROFILE_3_RTJAR_INCLUDE_TYPES :=
PROFILE_3_RTJAR_EXCLUDE_TYPES := \ PROFILE_3_RTJAR_EXCLUDE_TYPES := \
com/sun/security/auth/callback/DialogCallbackHandler$$1.class \ com/sun/security/auth/callback/DialogCallbackHandler$$1.class \
...@@ -237,22 +237,20 @@ FULL_JRE_RTJAR_INCLUDE_TYPES := \ ...@@ -237,22 +237,20 @@ FULL_JRE_RTJAR_INCLUDE_TYPES := \
javax/management/remote/rmi/_RMIServer_Stub.class \ javax/management/remote/rmi/_RMIServer_Stub.class \
javax/rmi/*.class javax/rmi/*.class
FULL_JRE_RTJAR_EXCLUDE_TYPES := FULL_JRE_RTJAR_EXCLUDE_TYPES :=
FULL_JRE_INCLUDE_METAINF_SERVICES := \ FULL_JRE_INCLUDE_METAINF_SERVICES := \
META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
META-INF/services/com.sun.tools.internal.xjc.Plugin \ META-INF/services/com.sun.tools.internal.xjc.Plugin \
META-INF/services/javax.print.PrintServiceLookup \ META-INF/services/javax.print.PrintServiceLookup \
META-INF/services/javax.print.StreamPrintServiceFactory \ META-INF/services/javax.print.StreamPrintServiceFactory \
META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \ META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \
META-INF/services/javax.sound.midi.spi.MidiFileReader \ META-INF/services/javax.sound.midi.spi.MidiFileReader \
META-INF/services/javax.sound.midi.spi.MidiFileWriter \ META-INF/services/javax.sound.midi.spi.MidiFileWriter \
META-INF/services/javax.sound.midi.spi.SoundbankReader \ META-INF/services/javax.sound.midi.spi.SoundbankReader \
META-INF/services/javax.sound.sampled.spi.AudioFileReader \ META-INF/services/javax.sound.sampled.spi.AudioFileReader \
META-INF/services/javax.sound.sampled.spi.AudioFileWriter \ META-INF/services/javax.sound.sampled.spi.AudioFileWriter \
META-INF/services/javax.sound.sampled.spi.FormatConversionProvider \ META-INF/services/javax.sound.sampled.spi.FormatConversionProvider \
META-INF/services/javax.sound.sampled.spi.MixerProvider \ META-INF/services/javax.sound.sampled.spi.MixerProvider \
META-INF/services/sun.java2d.cmm.PCMM \ META-INF/services/sun.java2d.cmm.PCMM \
META-INF/services/sun.java2d.pipe.RenderingEngine META-INF/services/sun.java2d.pipe.RenderingEngine
makefiles/scripts/addNotices.sh
浏览文件 @ e864d64d
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# #
# Parse the first contiguous comment block in this script and generate # Parse the first contiguous comment block in this script and generate
# a java comment block. If this script is invoked with a copyright # a java comment block. If this script is invoked with a copyright
# year/year range, the java comment block will contain a Sun copyright. # year/year range, the java comment block will contain a Sun copyright.
COPYRIGHT_YEARS="$1" COPYRIGHT_YEARS="$1"
...@@ -41,5 +41,5 @@ __END__ ...@@ -41,5 +41,5 @@ __END__
fi fi
$NAWK ' /^#.*Copyright.*Oracle/ { next } $NAWK ' /^#.*Copyright.*Oracle/ { next }
/^#([^!]|$)/ { sub(/^#/, " *"); print } /^#([^!]|$)/ { sub(/^#/, " *"); print }
/^$/ { print " */"; exit } ' $0 /^$/ { print " */"; exit } ' $0
makefiles/scripts/genCharsetProvider.sh
浏览文件 @ e864d64d
...@@ -28,17 +28,17 @@ ...@@ -28,17 +28,17 @@
# Generate a charset provider class # Generate a charset provider class
# Required environment variables # Required environment variables
# NAWK awk tool # NAWK awk tool
# TEMPDIR temporary directory # TEMPDIR temporary directory
# HASHER Hasher program # HASHER Hasher program
SPEC=$1; shift SPEC=$1; shift
DST=$1; shift DST=$1; shift
eval `$NAWK <$SPEC ' eval `$NAWK <$SPEC '
/^[ \t]*copyright / { printf "COPYRIGHT_YEARS=\"%s %s\"\n", $2, $3; } /^[ \t]*copyright / { printf "COPYRIGHT_YEARS=\"%s %s\"\n", $2, $3; }
/^[ \t]*package / { printf "PKG=%s\n", $2; } /^[ \t]*package / { printf "PKG=%s\n", $2; }
/^[ \t]*class / { printf "CLASS=%s\n", $2; } /^[ \t]*class / { printf "CLASS=%s\n", $2; }
'` '`
OUT=$DST/$CLASS.java OUT=$DST/$CLASS.java
...@@ -69,50 +69,50 @@ __END__ ...@@ -69,50 +69,50 @@ __END__
# Alias tables # Alias tables
# #
$NAWK <$SPEC >>$OUT ' $NAWK <$SPEC >>$OUT '
BEGIN { n = 1; m = 1; } BEGIN { n = 1; m = 1; }
/^[ \t]*charset / { /^[ \t]*charset / {
csn = $2; cln = $3; csn = $2; cln = $3;
lcsn = tolower(csn); lcsn = tolower(csn);
lcsns[n++] = lcsn; lcsns[n++] = lcsn;
csns[lcsn] = csn; csns[lcsn] = csn;
classMap[lcsn] = cln; classMap[lcsn] = cln;
if (n > 2) if (n > 2)
printf " };\n\n";
printf " static final String[] aliases_%s = new String[] {\n", cln;
}
/^[ \t]*alias / {
acsns[m++] = tolower($2);
aliasMap[tolower($2)] = lcsn;
printf " \"%s\",\n", $2;
}
END {
printf " };\n\n"; printf " };\n\n";
printf " static final String[] aliases_%s = new String[] {\n", cln; }
}
/^[ \t]*alias / {
acsns[m++] = tolower($2);
aliasMap[tolower($2)] = lcsn;
printf " \"%s\",\n", $2;
}
END {
printf " };\n\n";
}
' '
# Prehashed alias and class maps # Prehashed alias and class maps
# #
$NAWK <$SPEC >$TEMPDIR/aliases ' $NAWK <$SPEC >$TEMPDIR/aliases '
/^[ \t]*charset / { /^[ \t]*charset / {
csn = $2; csn = $2;
lcsn = tolower(csn); lcsn = tolower(csn);
} }
/^[ \t]*alias / { /^[ \t]*alias / {
an = tolower($2); an = tolower($2);
printf "%-20s \"%s\"\n", an, lcsn; printf "%-20s \"%s\"\n", an, lcsn;
} }
' '
$NAWK <$SPEC >$TEMPDIR/classes ' $NAWK <$SPEC >$TEMPDIR/classes '
/^[ \t]*charset / { /^[ \t]*charset / {
csn = $2; cln = $3; csn = $2; cln = $3;
lcsn = tolower(csn); lcsn = tolower(csn);
printf "%-20s \"%s\"\n", lcsn, cln; printf "%-20s \"%s\"\n", lcsn, cln;
} }
' '
${HASHER} -i Aliases <$TEMPDIR/aliases >>$OUT ${HASHER} -i Aliases <$TEMPDIR/aliases >>$OUT
......
makefiles/scripts/genExceptions.sh
浏览文件 @ e864d64d
...@@ -32,7 +32,7 @@ DST=$2 ...@@ -32,7 +32,7 @@ DST=$2
gen() { gen() {
ID=$1 ID=$1
WHAT=$2 WHAT=$2
SVUID=$3 SVUID=$3
ARG_TYPE=$4 ARG_TYPE=$4
ARG_ID=$5 ARG_ID=$5
ARG_PROP=$6 ARG_PROP=$6
...@@ -43,7 +43,7 @@ gen() { ...@@ -43,7 +43,7 @@ gen() {
$SH ${SCRIPTS}/addNotices.sh "$COPYRIGHT_YEARS" > $out $SH ${SCRIPTS}/addNotices.sh "$COPYRIGHT_YEARS" > $out
cat >>$out <<__END__ cat >>$out <<__END__
// -- This file was mechanically generated: Do not edit! -- // // -- This file was mechanically generated: Do not edit! -- //
......
makefiles/scripts/localelist.sh
浏览文件 @ e864d64d
...@@ -40,70 +40,67 @@ JAVA_LOCALES= ...@@ -40,70 +40,67 @@ JAVA_LOCALES=
toJavaLocale() toJavaLocale()
{ {
NewLocale=`echo $1 | $NAWK ' NewLocale=`echo $1 | $NAWK '
BEGIN { BEGIN {
# The following values have to be consistent with java.util.Locale. # The following values have to be consistent with java.util.Locale.
javalocales["en"] = "ENGLISH"; javalocales["en"] = "ENGLISH";
javalocales["fr"] = "FRENCH"; javalocales["fr"] = "FRENCH";
javalocales["de"] = "GERMAN"; javalocales["de"] = "GERMAN";
javalocales["it"] = "ITALIAN"; javalocales["it"] = "ITALIAN";
javalocales["ja"] = "JAPANESE"; javalocales["ja"] = "JAPANESE";
javalocales["ko"] = "KOREAN"; javalocales["ko"] = "KOREAN";
javalocales["zh"] = "CHINESE"; javalocales["zh"] = "CHINESE";
javalocales["zh_CN"] = "SIMPLIFIED_CHINESE"; javalocales["zh_CN"] = "SIMPLIFIED_CHINESE";
javalocales["zh_TW"] = "TRADITIONAL_CHINESE"; javalocales["zh_TW"] = "TRADITIONAL_CHINESE";
javalocales["fr_FR"] = "FRANCE"; javalocales["fr_FR"] = "FRANCE";
javalocales["de_DE"] = "GERMANY"; javalocales["de_DE"] = "GERMANY";
javalocales["it_IT"] = "ITALY"; javalocales["it_IT"] = "ITALY";
javalocales["ja_JP"] = "JAPAN"; javalocales["ja_JP"] = "JAPAN";
javalocales["ko_KR"] = "KOREA"; javalocales["ko_KR"] = "KOREA";
javalocales["en_GB"] = "UK"; javalocales["en_GB"] = "UK";
javalocales["en_US"] = "US"; javalocales["en_US"] = "US";
javalocales["en_CA"] = "CANADA"; javalocales["en_CA"] = "CANADA";
javalocales["fr_CA"] = "CANADA_FRENCH"; javalocales["fr_CA"] = "CANADA_FRENCH";
} }
{ {
if ($0 in javalocales) { if ($0 in javalocales) {
print " Locale." javalocales[$0]; print " Locale." javalocales[$0];
} else { } else {
split($0, a, "_"); split($0, a, "_");
if (a[3] != "") { if (a[3] != "") {
print " new Locale(\"" a[1] "\", \"" a[2] "\", \"" a[3] "\")"; print " new Locale(\"" a[1] "\", \"" a[2] "\", \"" a[3] "\")";
} else if (a[2] != "") { } else if (a[2] != "") {
print " new Locale(\"" a[1] "\", \"" a[2] "\")"; print " new Locale(\"" a[1] "\", \"" a[2] "\")";
} else { } else {
print " new Locale(\"" a[1] "\")"; print " new Locale(\"" a[1] "\")";
} }
} }
}'` }'`
JAVA_LOCALES=$JAVA_LOCALES$NewLocale JAVA_LOCALES=$JAVA_LOCALES$NewLocale
} }
# count the number of locales # count the number of locales
counter=0 counter=0
for i in $LOCALES for i in $LOCALES
do do
counter=`expr $counter + 1` counter=`expr $counter + 1`
done done
index=0 index=0
for locale in $LOCALES for locale in $LOCALES
do do
index=`expr $index + 1`; index=`expr $index + 1`;
if [ $index != $counter ] if [ $index != $counter ]
then then
toJavaLocale $locale toJavaLocale $locale
JAVA_LOCALES=$JAVA_LOCALES"," JAVA_LOCALES=$JAVA_LOCALES","
else else
toJavaLocale $locale toJavaLocale $locale
fi fi
done done
# replace the #LOCALE_LIST# in the precompiled CoreResourceBundleControl.java file. # replace the #LOCALE_LIST# in the precompiled CoreResourceBundleControl.java file.
$SED -e "s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@" \ $SED -e "s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@" \
-e "s/#LOCALE_LIST#/$JAVA_LOCALES/g" $2 > $3 -e "s/#LOCALE_LIST#/$JAVA_LOCALES/g" $2 > $3
makefiles/sun/awt/ToBin.java
浏览文件 @ e864d64d
...@@ -36,7 +36,7 @@ public class ToBin { ...@@ -36,7 +36,7 @@ public class ToBin {
BufferedImage bi = null; BufferedImage bi = null;
int iconWidth = im.getWidth(null); int iconWidth = im.getWidth(null);
int iconHeight = im.getHeight(null); int iconHeight = im.getHeight(null);
if (im != null && iconHeight != 0 && iconWidth != 0) { if (im != null && iconHeight != 0 && iconWidth != 0) {
bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB); bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB);
Graphics g = bi.getGraphics(); Graphics g = bi.getGraphics();
try { try {
......
src/solaris/doc/sun/man/man1/ja/javaws.1 已删除 100644 → 0
浏览文件 @ d8bfbbd9
." 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.
."
." 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.
."
.TH javaws 1 "07 May 2011"
.LP
.SH "名前"
\f2javaws\fP コマンド行
.LP
.SH "名前"
.LP
.LP
\f2javaws\fP \- Java Web Start 起動コマンド
.LP
.SH "形式"
.LP
.LP
\f2javaws [run\-options] <jnlp>\fP
.LP
.LP
\f2javaws [control\-options]\fP
.LP
.SH "パラメータ"
.LP
.LP
\f2[run\-options]\fP
.LP
.LP
コマンド行実行オプション。実行オプションは任意の順序で指定できます。各種オプションについては、下の 「実行オプション」を参照してください。
.LP
.LP
\f2<jnlp>\fP
.LP
.LP
JNLP (Java Network Launching Protocol) ファイルのパスまたは URL (Uniform Resource Locator) のどちらかです。
.LP
.LP
\f2[control\-options]\fP
.LP
.LP
コマンド行制御オプション。制御オプションは任意の順序で指定できます。各種オプションについては、下の 「制御オプション」を参照してください。
.LP
.SH "説明"
.LP
.LP
\f2javaws\fP コマンドは、JNLP (Java Network Launching Protocol) のリファレンス実装である Java Web Start を起動します。Java Web Start は、ネットワーク上で動作する Java アプリケーションまたはアプレットを起動します。
.LP
.LP
JNLP ファイルが指定された場合、 \f2javaws\fP は、その JNLP ファイルで指定された Java アプリケーション/アプレットを起動します。
.LP
.LP
\f2javaws\fP 起動ツールには、現在のリリースでサポートされている 1 組のオプションがあります。ただし、これらのオプションは将来のリリースでは削除される可能性があります。
.LP
.SH "実行オプション"
.LP
.LP
\f2\-offline\fP
.LP
.LP
Java Web Start をオフラインモードで実行します。
.LP
.LP
\f2\-Xnosplash\fP
.LP
.LP
初期スプラッシュ画面を表示しません。
.LP
.LP
\f2\-open <arguments>\fP
.LP
.LP
このオプションを指定すると、JNLP ファイル内の引数が \f2\-open <arguments>\fP に置き換わります。
.LP
.LP
\f2\-print <arguments>\fP
.LP
.LP
このオプションを指定すると、JNLP ファイル内の引数が \f2\-print <arguments>\fP に置き換わります。
.LP
.LP
\f2\-online\fP
.LP
.LP
オンラインモードを使用します (デフォルトの動作)。
.LP
.LP
\f2\-wait\fP
.LP
.LP
このオプションを指定した場合、 \f2javaws\fP プロセスは、アプリケーションが終了するまで終了しません。Windows プラットフォーム上では、このオプションは説明したとおりに機能しません。
.LP
.LP
\f2\-verbose\fP
.LP
.LP
追加の出力を表示します。
.LP
.LP
\f2\-J<option>\fP
.LP
.LP
vm にオプションを補います。
.LP
.LP
\f2\-system\fP
.LP
.LP
アプリケーションをシステムキャッシュからのみ実行します。
.LP
.SH "制御オプション"
.LP
.LP
\f2\-viewer\fP
.LP
.LP
Java コントロールパネルでキャッシュビューアを表示します。
.LP
.LP
\f2\-clearcache\fP
.LP
.LP
インストールされていないすべてのアプリケーションをキャッシュから削除します。
.LP
.LP
\f2\-userConfig <property name>\fP
.LP
.LP
指定された配備プロパティーをクリアします。
.LP
.LP
\f2\-userConfig <property name> <property value>\fP
.LP
.LP
指定された配備プロパティーを指定された値に設定します。
.LP
.LP
\f2\-uninstall\fP
.LP
.LP
キャッシュからすべてのアプリケーションを削除します。
.LP
.LP
\f2\-uninstall <jnlp>\fP
.LP
.LP
キャッシュからアプリケーションを削除します。
.LP
.LP
\f2\-import [import\-options] <jnlp>\fP
.LP
.LP
キャッシュにアプリケーションをインポートします。
.LP
.SH "インポートオプション"
.LP
.LP
\f2\-silent\fP
.LP
.LP
サイレントモードでインポートします (UI は表示されません)。
.LP
.LP
\f2\-system\fP
.LP
.LP
システムキャッシュにアプリケーションをインポートします。
.LP
.LP
\f2\-codebase <url>\fP
.LP
.LP
任意の codebase からリソースを取得します。
.LP
.LP
\f2\-shortcut\fP
.LP
.LP
ユーザー許容プロンプトのようにショートカットをインストールします。このオプションは、 \f2\-silent\fP オプションも使用しないと効果がありません。
.LP
.LP
\f2\-association\fP
.LP
.LP
ユーザー許容プロンプトのように関連付けをインストールします。このオプションは、 \f2\-silent\fP オプションも使用しないと効果がありません。
.LP
.SH "ファイル"
.LP
.LP
ユーザーキャッシュ、システムキャッシュ、および deployment.properties ファイルについては、
.na
\f2システムレベルおよびユーザーレベルのプロパティー\fP @
.fi
http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment\-guide/properties.htmlを参照してください。
.LP
.SH "詳細情報"
.LP
.LP
Java Web Start の詳細は、
.na
\f2「Java Web Start」\fP @
.fi
http://java.sun.com/javase/6/docs/technotes/guides/javaws/index.htmlを参照してください。
.LP
src/solaris/doc/sun/man/man1/javaws.1 已删除 100644 → 0
浏览文件 @ d8bfbbd9
." 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.
."
." 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.
."
.TH javaws 1 "10 May 2011"
.LP
.SH "Name"
\f2javaws\fP Command Line
.LP
.SH "NAME"
.LP
.LP
\f2javaws\fP \- Java Web Start launcher command
.LP
.SH "SYNOPSIS"
.LP
.LP
\f2javaws [run\-options] <jnlp>\fP
.LP
.LP
\f2javaws [control\-options]\fP
.LP
.SH "PARAMETERS"
.LP
.LP
\f2[run\-options]\fP
.LP
.LP
Command\-line run\-options. run\-options may be in any order. For a discussion of the various run\-options, see RUN\-OPTIONS below.
.LP
.LP
\f2<jnlp>\fP
.LP
.LP
This can be either the path of, or the Uniform Resource Locater (URL) of the JNLP (Java Network Launching Protocol) file.
.LP
.LP
\f2[control\-options]\fP
.LP
.LP
Command\-line control\-options. control\-options may be in any order. For a discussion of the various control\-options, see CONTROL\-OPTIONS below.
.LP
.SH "DESCRIPTION"
.LP
.LP
The \f2javaws\fP command launches Java Web Start, which is the reference implementation of the Java Network Launching Protocol (JNLP). Java Web Start launches Java applications/applets hosted on a network.
.LP
.LP
If a JNLP file is specified, \f2javaws\fP will launch the Java application/applet specified in the JNLP file.
.LP
.LP
The \f2javaws\fP launcher has a set of options that are supported in the current release. However, the options may be removed in a future release.
.LP
.SH "RUN\-OPTIONS"
.LP
.LP
\f2\-offline\fP
.LP
.LP
Run Java Web Start in offline mode.
.LP
.LP
\f2\-Xnosplash\fP
.LP
.LP
Do not display the initial splash screen.
.LP
.LP
\f2\-open <arguments>\fP
.LP
.LP
If specified, replaces the arguments in the jnlp file with \f2\-open <arguments>\fP.
.LP
.LP
\f2\-print <arguments>\fP
.LP
.LP
If specified, replaces the arguments in the jnlp file with \f2\-print <arguments>\fP.
.LP
.LP
\f2\-online\fP
.LP
.LP
Use online mode (default behavior).
.LP
.LP
\f2\-wait\fP
.LP
.LP
If specified, the \f2javaws\fP process will not exit until the application exits. This option does not function as described on Windows platforms.
.LP
.LP
\f2\-verbose\fP
.LP
.LP
Display additional output.
.LP
.LP
\f2\-J<option>\fP
.LP
.LP
Supply options to the VM.
.LP
.LP
\f2\-system\fP
.LP
.LP
Run the application from the system cache only.
.LP
.SH "CONTROL\-OPTIONS"
.LP
.LP
\f2\-viewer\fP
.LP
.LP
Show the Cache Viewer in the Java Control Panel.
.LP
.LP
\f2\-clearcache\fP
.LP
.LP
Remove all non\-installed applications from the cache.
.LP
.LP
\f2\-userConfig <property name>\fP
.LP
.LP
Clear the specified deployment property.
.LP
.LP
\f2\-userConfig <property name> <property value>\fP
.LP
.LP
Set the specified deployment property to the specified value.
.LP
.LP
\f2\-uninstall\fP
.LP
.LP
Remove all applications from the cache.
.LP
.LP
\f2\-uninstall <jnlp>\fP
.LP
.LP
Remove the application from the cache.
.LP
.LP
\f2\-import [import\-options] <jnlp>\fP
.LP
.LP
Import the application to the cache.
.LP
.SH "IMPORT\-OPTIONS"
.LP
.LP
\f2\-silent\fP
.LP
.LP
Import silently (with no user interface).
.LP
.LP
\f2\-system\fP
.LP
.LP
Import application to the system cache.
.LP
.LP
\f2\-codebase <url>\fP
.LP
.LP
Retrieve resources from the given codebase.
.LP
.LP
\f2\-shortcut\fP
.LP
.LP
Install shortcuts as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
.LP
.LP
\f2\-association\fP
.LP
.LP
Install associations as if user allowed prompt. This option has no effect unless \f2\-silent\fP option is also used.
.LP
.SH "FILES"
.LP
.LP
For information about the user and system cache and deployment.properties files, see
.na
\f2System\- and User\-Level Properties\fP @
.fi
http://download.oracle.com/javase/7/docs/technotes/guides/deployment/deployment\-guide/properties.html.
.LP
.SH "MORE INFORMATION"
.LP
.LP
For more information about Java Web Start, see
.na
\f2Java Web Start\fP @
.fi
http://download.oracle.com/javase/7/docs/technotes/guides/javaws/index.html.
.LP
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或