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,76 +31,76 @@ default: bundles ...@@ -31,76 +31,76 @@ 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" \
...@@ -111,7 +111,7 @@ $(JDK_BUNDLE_DIR)/Info.plist: $(SPEC) ...@@ -111,7 +111,7 @@ $(JDK_BUNDLE_DIR)/Info.plist: $(SPEC)
-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" \
...@@ -122,17 +122,17 @@ $(JRE_BUNDLE_DIR)/Info.plist: $(SPEC) ...@@ -122,17 +122,17 @@ $(JRE_BUNDLE_DIR)/Info.plist: $(SPEC)
-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,12 +47,12 @@ BUILD_DEMOS= ...@@ -47,12 +47,12 @@ 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
...@@ -79,7 +79,7 @@ endif ...@@ -79,7 +79,7 @@ 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
...@@ -96,31 +96,31 @@ define SetupDemo ...@@ -96,31 +96,31 @@ define SetupDemo
# 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) \
...@@ -128,11 +128,11 @@ define SetupDemo ...@@ -128,11 +128,11 @@ define SetupDemo
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 $$@
...@@ -142,7 +142,7 @@ define SetupDemo ...@@ -142,7 +142,7 @@ define SetupDemo
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 && \
...@@ -155,7 +155,7 @@ $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services : \ ...@@ -155,7 +155,7 @@ $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services : \
$(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))
...@@ -179,15 +179,16 @@ ifndef OPENJDK ...@@ -179,15 +179,16 @@ ifndef OPENJDK
$(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/%
$(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%
$(call install-file) $(call install-file)
$(CHMOD) -f ug+w $@ $(CHMOD) -f ug+w $@
endif endif
...@@ -195,7 +196,7 @@ endif ...@@ -195,7 +196,7 @@ 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
...@@ -209,74 +210,74 @@ define SetupJVMTIDemo ...@@ -209,74 +210,74 @@ define SetupJVMTIDemo
# 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
...@@ -285,7 +286,7 @@ define SetupJVMTIDemo ...@@ -285,7 +286,7 @@ define SetupJVMTIDemo
$(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)
...@@ -303,28 +304,28 @@ $(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util)) ...@@ -303,28 +304,28 @@ $(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)
...@@ -334,7 +335,7 @@ $(JDK_OUTPUTDIR)/demo/jpda/examples.jar : $(JPDA_SOURCES) ...@@ -334,7 +335,7 @@ $(JDK_OUTPUTDIR)/demo/jpda/examples.jar : $(JPDA_SOURCES)
(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 $@
...@@ -343,11 +344,11 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jpda/src.zip $(JDK_OUTPUTDIR)/demo/jpda/exa ...@@ -343,11 +344,11 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jpda/src.zip $(JDK_OUTPUTDIR)/demo/jpda/exa
################################################################################################## ##################################################################################################
$(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 $@
...@@ -357,11 +358,11 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/management/index.html \ ...@@ -357,11 +358,11 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/management/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,55 +377,55 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/README ...@@ -376,55 +377,55 @@ 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
...@@ -441,7 +442,7 @@ ifndef OPENJDK ...@@ -441,7 +442,7 @@ 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
......
makefiles/CompileJavaClasses.gmk
浏览文件 @ e864d64d
...@@ -39,13 +39,13 @@ EXCLUDES := ...@@ -39,13 +39,13 @@ 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
...@@ -55,10 +55,10 @@ ifndef OPENJDK ...@@ -55,10 +55,10 @@ 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 \
...@@ -70,7 +70,7 @@ ifndef OPENJDK ...@@ -70,7 +70,7 @@ ifndef OPENJDK
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 \
...@@ -98,26 +98,26 @@ endif ...@@ -98,26 +98,26 @@ 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 \
...@@ -135,8 +135,8 @@ ifneq ($(OPENJDK_TARGET_OS),linux) ...@@ -135,8 +135,8 @@ ifneq ($(OPENJDK_TARGET_OS),linux)
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 \
...@@ -152,25 +152,25 @@ endif ...@@ -152,25 +152,25 @@ 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 \
...@@ -215,22 +215,22 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) ...@@ -215,22 +215,22 @@ ifneq ($(OPENJDK_TARGET_OS), macosx)
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
...@@ -242,7 +242,7 @@ endif ...@@ -242,7 +242,7 @@ 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 \
...@@ -255,16 +255,16 @@ include CopyIntoClasses.gmk ...@@ -255,16 +255,16 @@ 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 \
...@@ -276,9 +276,9 @@ ifeq ($(OPENJDK_TARGET_OS),macosx) ...@@ -276,9 +276,9 @@ ifeq ($(OPENJDK_TARGET_OS),macosx)
# 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,78 +317,78 @@ $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin: ...@@ -317,78 +317,78 @@ $(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
########################################################################################## ##########################################################################################
......
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,13 +60,13 @@ endif ...@@ -60,13 +60,13 @@ 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
...@@ -78,23 +78,23 @@ define SetupLauncher ...@@ -78,23 +78,23 @@ define SetupLauncher
# 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 endif
$1_LDFLAGS := $3 $1_LDFLAGS := $3
$1_LDFLAGS_SUFFIX := $1_LDFLAGS_SUFFIX :=
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
$1_PLIST_FILE:=Info-cmdline.plist $1_PLIST_FILE := Info-cmdline.plist
ifneq ($(11),) ifneq ($(11), )
$1_PLIST_FILE:=$(11) $1_PLIST_FILE := $(11)
ifneq ($$(findstring privileged,$$($1_PLIST_FILE)),) ifneq ($$(findstring privileged, $$($1_PLIST_FILE)), )
$1_CODESIGN:=true $1_CODESIGN := true
endif endif
endif endif
...@@ -108,36 +108,36 @@ define SetupLauncher ...@@ -108,36 +108,36 @@ define SetupLauncher
$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 \
...@@ -147,55 +147,55 @@ define SetupLauncher ...@@ -147,55 +147,55 @@ define SetupLauncher
-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
...@@ -207,10 +207,10 @@ endif ...@@ -207,10 +207,10 @@ 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,79 +219,79 @@ $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java) ...@@ -219,79 +219,79 @@ $(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) \
...@@ -299,7 +299,7 @@ $(eval $(call SetupLauncher,jinfo,\ ...@@ -299,7 +299,7 @@ $(eval $(call SetupLauncher,jinfo,\
-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) \
...@@ -307,21 +307,21 @@ $(eval $(call SetupLauncher,jmap,\ ...@@ -307,21 +307,21 @@ $(eval $(call SetupLauncher,jmap,\
-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) \
...@@ -329,81 +329,81 @@ $(eval $(call SetupLauncher,jstack,\ ...@@ -329,81 +329,81 @@ $(eval $(call SetupLauncher,jstack,\
-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
...@@ -411,11 +411,11 @@ endif ...@@ -411,11 +411,11 @@ 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) \
...@@ -433,57 +433,57 @@ ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc) ...@@ -433,57 +433,57 @@ ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
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
...@@ -527,8 +527,8 @@ endif # OPENJDK_TARGET_OS ...@@ -527,8 +527,8 @@ 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
...@@ -544,22 +544,22 @@ endif ...@@ -544,22 +544,22 @@ 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,8 +586,8 @@ endif ...@@ -586,8 +586,8 @@ 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
...@@ -603,7 +603,7 @@ BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) ...@@ -603,7 +603,7 @@ 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
...@@ -616,17 +616,17 @@ ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) ...@@ -616,17 +616,17 @@ ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
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)
...@@ -637,33 +637,33 @@ endif ...@@ -637,33 +637,33 @@ 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
...@@ -36,7 +36,7 @@ include Setup.gmk ...@@ -36,7 +36,7 @@ include Setup.gmk
include CopyFiles.gmk include CopyFiles.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))
# Build tools # Build tools
include Tools.gmk include Tools.gmk
...@@ -46,13 +46,13 @@ CFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers ...@@ -46,13 +46,13 @@ CFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers
CXXFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers CXXFLAGS_JDKLIB += -I$(JDK_OUTPUTDIR)/gensrc_headers
# 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)
else else
INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/bin INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/bin
endif endif
BUILD_LIBRARIES= BUILD_LIBRARIES =
# Absolute paths to lib files on windows for use in LDFLAGS. Should figure out a more # Absolute paths to lib files on windows for use in LDFLAGS. Should figure out a more
# elegant solution to this. # elegant solution to this.
...@@ -75,47 +75,47 @@ endif ...@@ -75,47 +75,47 @@ endif
# TODO replace with X_FLAGS / X_LIBS # TODO replace with X_FLAGS / X_LIBS
# and add them to configure # and add them to configure
# #
OPENWIN_LIB:=$(OPENWIN_HOME)/lib OPENWIN_LIB := $(OPENWIN_HOME)/lib
########################################################################################## ##########################################################################################
BUILD_LIBFDLIBM_OPTIMIZATION:=HIGH BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
ifneq ($(OPENJDK_TARGET_OS), solaris) ifneq ($(OPENJDK_TARGET_OS), solaris)
BUILD_LIBFDLIBM_OPTIMIZATION:=NONE BUILD_LIBFDLIBM_OPTIMIZATION := NONE
endif endif
ifneq ($(OPENJDK_TARGET_OS),macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
$(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM,\ $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM, \
STATIC_LIBRARY:=fdlibm,\ STATIC_LIBRARY := fdlibm, \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs,\ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
SRC:=$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src,\ SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=$(BUILD_LIBFDLIBM_OPTIMIZATION), \ OPTIMIZATION := $(BUILD_LIBFDLIBM_OPTIMIZATION), \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include,\ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
CFLAGS_windows_debug:=-DLOGGING,\ CFLAGS_windows_debug := -DLOGGING, \
ARFLAGS:=$(ARFLAGS),\ ARFLAGS := $(ARFLAGS), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
else else
# On macosx the old build does partial (incremental) linking of fdlibm instead of # On macosx the old build does partial (incremental) linking of fdlibm instead of
# a plain static library. # a plain static library.
$(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC,\ $(eval $(call SetupNativeCompilation,BUILD_LIBFDLIBM_MAC, \
LIBRARY:=fdlibm,\ LIBRARY := fdlibm, \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm,\ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
SRC:=$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src,\ SRC := $(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/src, \
LANG:=C,\ LANG := C, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include,\ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include, \
LDFLAGS:=-nostdlib -r -arch x86_64,\ LDFLAGS := -nostdlib -r -arch x86_64, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfdlibm,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfdlibm, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX) BUILD_LIBFDLIBM := $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)fdlibm$(STATIC_LIBRARY_SUFFIX)
$(BUILD_LIBFDLIBM) : $(BUILD_LIBFDLIBM_MAC) $(BUILD_LIBFDLIBM): $(BUILD_LIBFDLIBM_MAC)
$(call install-file) $(call install-file)
endif endif
...@@ -123,49 +123,49 @@ BUILD_LIBRARIES += $(BUILD_LIBFDLIBM) ...@@ -123,49 +123,49 @@ BUILD_LIBRARIES += $(BUILD_LIBFDLIBM)
########################################################################################## ##########################################################################################
BUILD_LIBVERIFY_SRC:=check_code.c check_format.c BUILD_LIBVERIFY_SRC := check_code.c check_format.c
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
ifneq ($(OPENJDK_TARGET_CPU), x86_64) ifneq ($(OPENJDK_TARGET_CPU), x86_64)
BUILD_LIBVERIFY_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU) BUILD_LIBVERIFY_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
endif endif
endif endif
LIBVERIFY_OPTIMIZATION:=HIGH LIBVERIFY_OPTIMIZATION := HIGH
ifneq ($(findstring $(OPENJDK_TARGET_OS),solaris linux),) ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
ifeq ($(ENABLE_DEBUG_SYMBOLS), true) ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
LIBVERIFY_OPTIMIZATION:=LOW LIBVERIFY_OPTIMIZATION := LOW
endif endif
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY,\ $(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \
LIBRARY:=verify, \ LIBRARY := verify, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/native/common,\ SRC := $(JDK_TOPDIR)/src/share/native/common, \
INCLUDE_FILES:=$(BUILD_LIBVERIFY_SRC),\ INCLUDE_FILES := $(BUILD_LIBVERIFY_SRC), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=$(LIBVERIFY_OPTIMIZATION), \ OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
CFLAGS:=$(CFLAGS_JDKLIB),\ CFLAGS := $(CFLAGS_JDKLIB), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libverify/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libverify/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_posix:=-ljvm -lc,\ LDFLAGS_SUFFIX_posix := -ljvm -lc, \
LDFLAGS_SUFFIX_windows:=jvm.lib,\ LDFLAGS_SUFFIX_windows := jvm.lib, \
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=verify.dll" \ -D "JDK_FNAME=verify.dll" \
-D "JDK_INTERNAL_NAME=verify" \ -D "JDK_INTERNAL_NAME=verify" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
REORDER:=$(BUILD_LIBVERIFY_REORDER),\ REORDER := $(BUILD_LIBVERIFY_REORDER), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libverify,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libverify, \
DEBUG_SYMBOLS:=true)) DEBUG_SYMBOLS := true))
BUILD_LIBRARIES += $(BUILD_LIBVERIFY) BUILD_LIBRARIES += $(BUILD_LIBVERIFY)
########################################################################################## ##########################################################################################
LIBJAVA_SRC_DIRS:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lang \ LIBJAVA_SRC_DIRS := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lang \
$(JDK_TOPDIR)/src/share/native/java/lang \ $(JDK_TOPDIR)/src/share/native/java/lang \
$(JDK_TOPDIR)/src/share/native/java/lang/ref \ $(JDK_TOPDIR)/src/share/native/java/lang/ref \
$(JDK_TOPDIR)/src/share/native/java/lang/reflect \ $(JDK_TOPDIR)/src/share/native/java/lang/reflect \
...@@ -181,18 +181,18 @@ LIBJAVA_SRC_DIRS:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lan ...@@ -181,18 +181,18 @@ LIBJAVA_SRC_DIRS:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/lan
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/util
ifneq ($(OPENJDK_TARGET_OS),macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
LIBJAVA_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/util/locale/provider LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/util/locale/provider
else else
LIBJAVA_SRC_DIRS+=$(JDK_TOPDIR)/src/macosx/native/sun/util/locale/provider LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/util/locale/provider
endif endif
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
LIBJAVA_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/provider \ LIBJAVA_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/provider \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/io
endif endif
LIBJAVA_CFLAGS:=$(foreach dir,$(LIBJAVA_SRC_DIRS),-I$(dir)) \ LIBJAVA_CFLAGS := $(foreach dir, $(LIBJAVA_SRC_DIRS), -I$(dir)) \
-I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \ -I$(JDK_TOPDIR)/src/share/native/java/lang/fdlibm/include \
-DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"' -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
...@@ -201,20 +201,20 @@ LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \ ...@@ -201,20 +201,20 @@ LIBJAVA_CFLAGS += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
-DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \ -DJDK_MICRO_VERSION='"$(JDK_MICRO_VERSION)"' \
-DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"' -DJDK_BUILD_NUMBER='"$(JDK_BUILD_NUMBER)"'
ifneq (,$(JDK_UPDATE_VERSION)) ifneq (, $(JDK_UPDATE_VERSION))
LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"' LIBJAVA_CFLAGS += -DJDK_UPDATE_VERSION='"$(JDK_UPDATE_VERSION)"'
endif endif
LIBJAVA_EXCLUDE_FILES:=check_code.c check_format.c jspawnhelper.c LIBJAVA_EXCLUDE_FILES := check_code.c check_format.c jspawnhelper.c
ifneq ($(OPENJDK_TARGET_OS),macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
LIBJAVA_EXCLUDE_FILES += java_props_macosx.c LIBJAVA_EXCLUDE_FILES += java_props_macosx.c
else else
BUILD_LIBJAVA_java_props_md.c_CFLAGS:=-x objective-c BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
BUILD_LIBJAVA_java_props_macosx.c_CFLAGS:=-x objective-c BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
endif endif
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
LIBJAVA_EXCLUDE_FILES += \ LIBJAVA_EXCLUDE_FILES += \
UNIXProcess_md.c \ UNIXProcess_md.c \
UnixFileSystem_md.c \ UnixFileSystem_md.c \
...@@ -231,60 +231,60 @@ endif ...@@ -231,60 +231,60 @@ endif
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
ifneq ($(OPENJDK_TARGET_CPU), x86_64) ifneq ($(OPENJDK_TARGET_CPU), x86_64)
LIBJAVA_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU) LIBJAVA_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
endif endif
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA, \
LIBRARY:=java,\ LIBRARY := java, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBJAVA_SRC_DIRS),\ SRC := $(LIBJAVA_SRC_DIRS), \
EXCLUDES:=fdlibm/src zip, \ EXCLUDES := fdlibm/src zip, \
EXCLUDE_FILES:=$(LIBJAVA_EXCLUDE_FILES), \ EXCLUDE_FILES := $(LIBJAVA_EXCLUDE_FILES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=HIGH, \ OPTIMIZATION := HIGH, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(LIBJAVA_CFLAGS),\ $(LIBJAVA_CFLAGS), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjava/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjava/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_posix:=-ljvm -lverify, \ LDFLAGS_SUFFIX_posix := -ljvm -lverify, \
LDFLAGS_SUFFIX_solaris:=-lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc,\ LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
LDFLAGS_SUFFIX_linux:=$(LIBDL) $(BUILD_LIBFDLIBM),\ LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
LDFLAGS_SUFFIX_macosx:=-L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \ LDFLAGS_SUFFIX_macosx := -L$(JDK_OUTPUTDIR)/objs/ -lfdlibm \
-framework CoreFoundation \ -framework CoreFoundation \
-framework Foundation \ -framework Foundation \
-framework Security -framework SystemConfiguration, \ -framework Security -framework SystemConfiguration, \
LDFLAGS_SUFFIX_windows:=-export:winFileHandleOpen -export:handleLseek \ LDFLAGS_SUFFIX_windows := -export:winFileHandleOpen -export:handleLseek \
jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \ jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \ shell32.lib delayimp.lib -DELAYLOAD:shell32.dll \
advapi32.lib,\ advapi32.lib, \
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=java.dll" \ -D "JDK_FNAME=java.dll" \
-D "JDK_INTERNAL_NAME=java" \ -D "JDK_INTERNAL_NAME=java" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
REORDER:=$(LIBJAVA_REORDER), \ REORDER := $(LIBJAVA_REORDER), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjava,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBJAVA) BUILD_LIBRARIES += $(BUILD_LIBJAVA)
$(BUILD_LIBJAVA) : $(LIBJLI_BINARY) $(BUILD_LIBJAVA): $(LIBJLI_BINARY)
$(BUILD_LIBJAVA) : $(BUILD_LIBVERIFY) $(BUILD_LIBJAVA): $(BUILD_LIBVERIFY)
$(BUILD_LIBJAVA) : $(BUILD_LIBFDLIBM) $(BUILD_LIBJAVA): $(BUILD_LIBFDLIBM)
########################################################################################## ##########################################################################################
BUILD_LIBMLIB_SRC:=$(JDK_TOPDIR)/src/share/native/sun/awt/medialib BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib
BUILD_LIBMLIB_CFLAGS:=-D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \ BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
-I$(BUILD_LIBMLIB_SRC) \ -I$(BUILD_LIBMLIB_SRC) \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/medialib -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/medialib
BUILD_LIBMLIB_LDLIBS:= BUILD_LIBMLIB_LDLIBS :=
BUILD_LIBMLIB_IMAGE_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libmlib_image/mapfile-vers BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libmlib_image/mapfile-vers
BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
...@@ -296,38 +296,38 @@ ifneq ($(OPENJDK_TARGET_OS), windows) ...@@ -296,38 +296,38 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL) BUILD_LIBMLIB_LDLIBS += $(LIBM) $(LIBDL)
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE,\ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \
LIBRARY:=mlib_image,\ LIBRARY := mlib_image, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(BUILD_LIBMLIB_SRC),\ SRC := $(BUILD_LIBMLIB_SRC), \
EXCLUDE_FILES:=awt_ImagingLib.c mlib_c_ImageBlendTable.c,\ EXCLUDE_FILES := awt_ImagingLib.c mlib_c_ImageBlendTable.c, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=HIGHEST, \ OPTIMIZATION := HIGHEST, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(BUILD_LIBMLIB_CFLAGS),\ $(BUILD_LIBMLIB_CFLAGS), \
MAPFILE:=$(BUILD_LIBMLIB_IMAGE_MAPFILE), \ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=$(BUILD_LIBMLIB_LDLIBS) \ LDFLAGS_SUFFIX := $(BUILD_LIBMLIB_LDLIBS) \
$(LDFLAGS_JDKLIB_SUFFIX),\ $(LDFLAGS_JDKLIB_SUFFIX), \
LDFLAGS_SUFFIX_solaris:=-lc, \ LDFLAGS_SUFFIX_solaris := -lc, \
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=mlib_image.dll" \ -D "JDK_FNAME=mlib_image.dll" \
-D "JDK_INTERNAL_NAME=mlib_image" \ -D "JDK_INTERNAL_NAME=mlib_image" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBMLIB_IMAGE) : $(BUILD_LIBJAVA) $(BUILD_LIBMLIB_IMAGE): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE) BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH),solaris-sparc) ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
BUILD_LIBMLIB_IMAGE_V_FILES:=\ BUILD_LIBMLIB_IMAGE_V_FILES := \
mlib_v_ImageLookUp.c \ mlib_v_ImageLookUp.c \
mlib_ImageCreate.c \ mlib_ImageCreate.c \
mlib_ImageAffine.c \ mlib_ImageAffine.c \
...@@ -421,37 +421,37 @@ BUILD_LIBMLIB_IMAGE_V_FILES:=\ ...@@ -421,37 +421,37 @@ BUILD_LIBMLIB_IMAGE_V_FILES:=\
mlib_ImageUtils.c \ mlib_ImageUtils.c \
mlib_ImageDivTables.c mlib_ImageDivTables.c
BUILD_LIBMLIB_V_CFLAGS := $(filter-out -DMLIB_NO_LIBSUNMATH,$(BUILD_LIBMLIB_CFLAGS)) BUILD_LIBMLIB_V_CFLAGS := $(filter-out -DMLIB_NO_LIBSUNMATH, $(BUILD_LIBMLIB_CFLAGS))
$(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V,\ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE_V, \
LIBRARY:=mlib_image_v, \ LIBRARY := mlib_image_v, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/native/sun/awt/medialib \ SRC := $(JDK_TOPDIR)/src/share/native/sun/awt/medialib \
$(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib,\ $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib, \
LANG:=C,\ LANG := C, \
INCLUDE_FILES:=$(BUILD_LIBMLIB_IMAGE_V_FILES),\ INCLUDE_FILES := $(BUILD_LIBMLIB_IMAGE_V_FILES), \
OPTIMIZATION:=HIGHEST, \ OPTIMIZATION := HIGHEST, \
CFLAGS:=-xarch=sparcvis \ CFLAGS := -xarch=sparcvis \
$(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il\ $(JDK_TOPDIR)/src/solaris/native/sun/awt/medialib/vis_$(OPENJDK_TARGET_CPU_BITS).il \
$(BUILD_LIBMLIB_V_CFLAGS) \ $(BUILD_LIBMLIB_V_CFLAGS) \
$(CFLAGS_JDKLIB), \ $(CFLAGS_JDKLIB), \
MAPFILE:=$(BUILD_LIBMLIB_IMAGE_MAPFILE), \ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \ $(BUILD_LIBMLIB_LDLIBS) -ljava -ljvm \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmlib_image_v,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmlib_image_v, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA) $(BUILD_LIBMLIB_IMAGE_V): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V) BUILD_LIBRARIES += $(BUILD_LIBMLIB_IMAGE_V)
endif endif
########################################################################################## ##########################################################################################
LIBAWT_DIRS:=\ LIBAWT_DIRS := \
$(JDK_TOPDIR)/src/share/native/sun/awt \ $(JDK_TOPDIR)/src/share/native/sun/awt \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
$(JDK_TOPDIR)/src/share/native/sun/awt/image \ $(JDK_TOPDIR)/src/share/native/sun/awt/image \
...@@ -469,21 +469,21 @@ LIBAWT_DIRS:=\ ...@@ -469,21 +469,21 @@ LIBAWT_DIRS:=\
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/opengl \
$(JDK_TOPDIR)/src/share/native/sun/font $(JDK_TOPDIR)/src/share/native/sun/font
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
LIBAWT_DIRS+=\ LIBAWT_DIRS += \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/d3d
else else
LIBAWT_DIRS+=\ LIBAWT_DIRS += \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
endif endif
LIBAWT_CFLAGS+=-D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \ LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
$(X_CFLAGS) \ $(X_CFLAGS) \
$(foreach dir,$(LIBAWT_DIRS),-I$(dir)) $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
LIBAWT_FILES:=\ LIBAWT_FILES := \
gifdecoder.c \ gifdecoder.c \
imageInitIDs.c \ imageInitIDs.c \
img_globals.c \ img_globals.c \
...@@ -553,11 +553,11 @@ LIBAWT_FILES:=\ ...@@ -553,11 +553,11 @@ LIBAWT_FILES:=\
debug_trace.c \ debug_trace.c \
debug_util.c debug_util.c
ifneq (,$(filter $(OPENJDK_TARGET_OS), solaris linux)) ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris linux))
LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c
endif endif
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBAWT_FILES += awt_LoadLibrary.c img_colors.c LIBAWT_FILES += awt_LoadLibrary.c img_colors.c
LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
endif endif
...@@ -617,22 +617,22 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) ...@@ -617,22 +617,22 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
vis_XorBlit.c \ vis_XorBlit.c \
mlib_v_ImageCopy_blk.s mlib_v_ImageCopy_blk.s
ifeq ($(OPENJDK_TARGET_CPU),sparcv9) ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
LIBAWT_ASFLAGS=-P -xarch=v9a LIBAWT_ASFLAGS = -P -xarch=v9a
else else
LIBAWT_ASFLAGS=-P -xarch=v8plusa LIBAWT_ASFLAGS = -P -xarch=v8plusa
endif endif
else else
LIBAWT_FILES += MapAccelFunc.c LIBAWT_FILES += MapAccelFunc.c
endif endif
ifneq ($(OPENJDK_TARGET_OS),solaris) ifneq ($(OPENJDK_TARGET_OS), solaris)
LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH LIBAWT_CFLAGS += -DMLIB_NO_LIBSUNMATH
endif endif
LIBAWT_LANG:=C LIBAWT_LANG := C
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
LIBAWT_FILES += AccelGlyphCache.c \ LIBAWT_FILES += AccelGlyphCache.c \
ShaderList.c \ ShaderList.c \
CmdIDList.cpp \ CmdIDList.cpp \
...@@ -683,44 +683,45 @@ ifeq ($(OPENJDK_TARGET_OS),windows) ...@@ -683,44 +683,45 @@ ifeq ($(OPENJDK_TARGET_OS),windows)
OGLVertexCache.c \ OGLVertexCache.c \
WGLGraphicsConfig.c \ WGLGraphicsConfig.c \
WGLSurfaceData.c WGLSurfaceData.c
LIBAWT_LANG:=C++
LIBAWT_LANG := C++
LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64) ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
LIBAWT_CFLAGS += -DMLIB_OS64BIT LIBAWT_CFLAGS += -DMLIB_OS64BIT
endif endif
ifdef OPENJDK ifdef OPENJDK
LIBAWT_RC_FLAGS:=-i "$(JDK_TOPDIR)/src/windows/resource/icons" LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/windows/resource/icons"
else else
LIBAWT_RC_FLAGS:=-i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows" LIBAWT_RC_FLAGS := -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
endif endif
LIBAWT_VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/native/sun/windows/awt.rc LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/native/sun/windows/awt.rc
endif endif
ifeq ($(MILESTONE), internal) ifeq ($(MILESTONE), internal)
LIBAWT_CFLAGS += -DINTERNAL_BUILD LIBAWT_CFLAGS += -DINTERNAL_BUILD
endif endif
LIBAWT_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt/mapfile-vers LIBAWT_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt/mapfile-vers
ifeq ($(OPENJDK_TARGET_OS),linux) ifeq ($(OPENJDK_TARGET_OS), linux)
LIBAWT_MAPFILE:= LIBAWT_MAPFILE :=
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT,\ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT, \
LIBRARY:=awt,\ LIBRARY := awt, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBAWT_DIRS),\ SRC := $(LIBAWT_DIRS), \
INCLUDE_FILES:=$(LIBAWT_FILES),\ INCLUDE_FILES := $(LIBAWT_FILES), \
LANG:=$(LIBAWT_LANG),\ LANG := $(LIBAWT_LANG), \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS),\ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
ASFLAGS:=$(LIBAWT_ASFLAGS),\ ASFLAGS := $(LIBAWT_ASFLAGS), \
MAPFILE:=$(LIBAWT_MAPFILE), \ MAPFILE := $(LIBAWT_MAPFILE), \
LDFLAGS:=$(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN),\ LDFLAGS := $(LDFLAGS_JDKLIB) $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_solaris:=-R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\ LDFLAGS_solaris := -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
LDFLAGS_SUFFIX_linux:=-ljvm $(LIBM) $(LIBDL) -ljava,\ LDFLAGS_SUFFIX_linux := -ljvm $(LIBM) $(LIBDL) -ljava, \
LDFLAGS_SUFFIX_solaris:=-ljvm $(LIBM) $(LIBDL) -ljava -lc,\ LDFLAGS_SUFFIX_solaris := -ljvm $(LIBM) $(LIBDL) -ljava -lc, \
LDFLAGS_SUFFIX_macosx:=-lmlib_image -ljvm $(LIBM) \ LDFLAGS_SUFFIX_macosx := -lmlib_image -ljvm $(LIBM) \
-framework Cocoa \ -framework Cocoa \
-framework OpenGL \ -framework OpenGL \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
...@@ -728,8 +729,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT,\ ...@@ -728,8 +729,8 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT,\
-framework JavaRuntimeSupport \ -framework JavaRuntimeSupport \
-framework ApplicationServices \ -framework ApplicationServices \
-framework AudioToolbox \ -framework AudioToolbox \
-ljava,\ -ljava, \
LDFLAGS_SUFFIX_windows:=kernel32.lib user32.lib gdi32.lib winspool.lib \ LDFLAGS_SUFFIX_windows := kernel32.lib user32.lib gdi32.lib winspool.lib \
imm32.lib ole32.lib uuid.lib shell32.lib \ imm32.lib ole32.lib uuid.lib shell32.lib \
comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \ comdlg32.lib winmm.lib comctl32.lib shlwapi.lib \
delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib \ delayimp.lib jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
...@@ -737,19 +738,19 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT,\ ...@@ -737,19 +738,19 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT,\
-DELAYLOAD:shell32.dll -DELAYLOAD:winmm.dll \ -DELAYLOAD:shell32.dll -DELAYLOAD:winmm.dll \
-DELAYLOAD:winspool.drv -DELAYLOAD:imm32.dll \ -DELAYLOAD:winspool.drv -DELAYLOAD:imm32.dll \
-DELAYLOAD:ole32.dll -DELAYLOAD:comdlg32.dll \ -DELAYLOAD:ole32.dll -DELAYLOAD:comdlg32.dll \
-DELAYLOAD:comctl32.dll -DELAYLOAD:shlwapi.dll,\ -DELAYLOAD:comctl32.dll -DELAYLOAD:shlwapi.dll, \
VERSIONINFO_RESOURCE:=$(LIBAWT_VERSIONINFO_RESOURCE),\ VERSIONINFO_RESOURCE := $(LIBAWT_VERSIONINFO_RESOURCE), \
RC_FLAGS:=$(RC_FLAGS) $(LIBAWT_RC_FLAGS) \ RC_FLAGS := $(RC_FLAGS) $(LIBAWT_RC_FLAGS) \
-D "JDK_FNAME=awt.dll" \ -D "JDK_FNAME=awt.dll" \
-D "JDK_INTERNAL_NAME=awt" \ -D "JDK_INTERNAL_NAME=awt" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBAWT) : $(BUILD_LIBJAVA) $(BUILD_LIBAWT): $(BUILD_LIBJAVA)
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
$(BUILD_LIBAWT) : $(BUILD_LIBMLIB_IMAGE) $(BUILD_LIBAWT): $(BUILD_LIBMLIB_IMAGE)
endif endif
BUILD_LIBRARIES += $(BUILD_LIBAWT) BUILD_LIBRARIES += $(BUILD_LIBAWT)
...@@ -762,12 +763,12 @@ BUILD_LIBRARIES += $(BUILD_LIBAWT) ...@@ -762,12 +763,12 @@ BUILD_LIBRARIES += $(BUILD_LIBAWT)
# #
# It's used for libawt_headless _and_ libawt_xawt # It's used for libawt_headless _and_ libawt_xawt
# #
X11_PATH:=/usr/X11R6 X11_PATH := /usr/X11R6
ifneq ($(OPENJDK_TARGET_OS), windows) ifneq ($(OPENJDK_TARGET_OS), windows)
ifndef BUILD_HEADLESS_ONLY ifndef BUILD_HEADLESS_ONLY
LIBAWT_XAWT_DIRS:=\ LIBAWT_XAWT_DIRS := \
$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ $(JDK_TOPDIR)/src/share/native/sun/awt/debug \
$(JDK_TOPDIR)/src/share/native/sun/awt/utility \ $(JDK_TOPDIR)/src/share/native/sun/awt/utility \
$(JDK_TOPDIR)/src/share/native/sun/font \ $(JDK_TOPDIR)/src/share/native/sun/font \
...@@ -778,10 +779,10 @@ LIBAWT_XAWT_DIRS:=\ ...@@ -778,10 +779,10 @@ LIBAWT_XAWT_DIRS:=\
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11 \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/xawt \
LIBAWT_XAWT_CFLAGS:=-DXAWT -DXAWT_HACK \ LIBAWT_XAWT_CFLAGS := -DXAWT -DXAWT_HACK \
-DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
$(CUPS_CFLAGS) \ $(CUPS_CFLAGS) \
$(foreach dir,$(LIBAWT_XAWT_DIRS),-I$(dir)) \ $(foreach dir, $(LIBAWT_XAWT_DIRS), -I$(dir)) \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d \ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/loops \
...@@ -791,25 +792,25 @@ LIBAWT_XAWT_CFLAGS:=-DXAWT -DXAWT_HACK \ ...@@ -791,25 +792,25 @@ LIBAWT_XAWT_CFLAGS:=-DXAWT -DXAWT_HACK \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga
ifeq ($(OPENJDK_TARGET_OS),solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15 LIBAWT_XAWT_CFLAGS += -DFUNCPROTO=15
endif endif
ifeq ($(OPENJDK_TARGET_OS),linux) ifeq ($(OPENJDK_TARGET_OS), linux)
ifndef OPENJDK ifndef OPENJDK
include $(JDK_TOPDIR)/make/closed/xawt.gmk include $(JDK_TOPDIR)/make/closed/xawt.gmk
endif endif
ifeq ($(DISABLE_XRENDER),true) ifeq ($(DISABLE_XRENDER), true)
LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true LIBAWT_XAWT_CFLAGS += -DDISABLE_XRENDER_BY_DEFAULT=true
endif endif
endif endif
ifeq ($(MILESTONE),internal) ifeq ($(MILESTONE), internal)
LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD LIBAWT_XAWT_CFLAGS += -DINTERNAL_BUILD
endif endif
LIBAWT_XAWT_FILES:=\ LIBAWT_XAWT_FILES := \
XlibWrapper.c \ XlibWrapper.c \
XWindow.c \ XWindow.c \
XToolkit.c \ XToolkit.c \
...@@ -867,65 +868,65 @@ LIBAWT_XAWT_FILES:=\ ...@@ -867,65 +868,65 @@ LIBAWT_XAWT_FILES:=\
XRSurfaceData.c \ XRSurfaceData.c \
XRBackendNative.c XRBackendNative.c
LIBAWT_XAWT_LDFLAGS_SUFFIX:=$(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc LIBAWT_XAWT_LDFLAGS_SUFFIX := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
# To match old build, add this to LDFLAGS instead of suffix. # To match old build, add this to LDFLAGS instead of suffix.
LIBAWT_XAWT_LDFLAGS += -lpthread LIBAWT_XAWT_LDFLAGS += -lpthread
endif endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBAWT_XAWT_LDFLAGS_SUFFIX += -lpthread LIBAWT_XAWT_LDFLAGS_SUFFIX += -lpthread
endif endif
# On macosx, the shared library origin is set twice for this lib. # On macosx, the shared library origin is set twice for this lib.
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT,\ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \
LIBRARY:=awt_xawt,\ LIBRARY := awt_xawt, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBAWT_XAWT_DIRS),\ SRC := $(LIBAWT_XAWT_DIRS), \
INCLUDE_FILES:=$(LIBAWT_XAWT_FILES),\ INCLUDE_FILES := $(LIBAWT_XAWT_FILES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
$(X_CFLAGS),\ $(X_CFLAGS), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt_xawt/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_xawt/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(X_LIBS) $(LIBAWT_XAWT_LDFLAGS),\ $(X_LIBS) $(LIBAWT_XAWT_LDFLAGS), \
LDFLAGS_linux:=$(call SET_SHARED_LIBRARY_ORIGIN) \ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN) \
$(call SET_SHARED_LIBRARY_ORIGIN,/..),\ $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
LDFLAGS_solaris:=-L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \ LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
-L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \ -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
-R$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \ -R$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) \
-R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \ -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) \
-R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \ -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
$(call SET_SHARED_LIBRARY_ORIGIN) \ $(call SET_SHARED_LIBRARY_ORIGIN) \
$(call SET_SHARED_LIBRARY_ORIGIN,/..),\ $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN) \ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN) \
$(call SET_SHARED_LIBRARY_ORIGIN). \ $(call SET_SHARED_LIBRARY_ORIGIN). \
$(call SET_SHARED_LIBRARY_ORIGIN) \ $(call SET_SHARED_LIBRARY_ORIGIN) \
$(call SET_SHARED_LIBRARY_ORIGIN).,\ $(call SET_SHARED_LIBRARY_ORIGIN)., \
LDFLAGS_SUFFIX:=$(LIBAWT_XAWT_LDFLAGS_SUFFIX),\ LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \
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=xawt.dll" \ -D "JDK_FNAME=xawt.dll" \
-D "JDK_INTERNAL_NAME=xawt" \ -D "JDK_INTERNAL_NAME=xawt" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_xawt,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_xawt, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBAWT_XAWT) : $(BUILD_LIBJAVA) $(BUILD_LIBAWT_XAWT): $(BUILD_LIBJAVA)
$(BUILD_LIBAWT_XAWT) : $(BUILD_LIBAWT) $(BUILD_LIBAWT_XAWT): $(BUILD_LIBAWT)
BUILD_LIBRARIES += $(BUILD_LIBAWT_XAWT) BUILD_LIBRARIES += $(BUILD_LIBAWT_XAWT)
endif endif
endif endif
########################################################################################## ##########################################################################################
BUILD_LIBZIP_EXCLUDES := BUILD_LIBZIP_EXCLUDES :=
ifeq ($(USE_EXTERNAL_LIBZ),true) ifeq ($(USE_EXTERNAL_LIBZ), true)
LIBZ := -lz LIBZ := -lz
LIBZIP_EXCLUDES += zlib-1.2.5 LIBZIP_EXCLUDES += zlib-1.2.5
else else
...@@ -943,182 +944,183 @@ ifeq ($(LIBZIP_CAN_USE_MMAP), true) ...@@ -943,182 +944,183 @@ ifeq ($(LIBZIP_CAN_USE_MMAP), true)
BUILD_LIBZIP_MMAP := -DUSE_MMAP BUILD_LIBZIP_MMAP := -DUSE_MMAP
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBZIP,\ $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
LIBRARY:=zip,\ LIBRARY := zip, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
SRC:=$(JDK_TOPDIR)/src/share/native/java/util/zip,\ SRC := $(JDK_TOPDIR)/src/share/native/java/util/zip, \
EXCLUDES:=$(LIBZIP_EXCLUDES),\ EXCLUDES := $(LIBZIP_EXCLUDES), \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(ZLIB_CPPFLAGS) \ $(ZLIB_CPPFLAGS) \
-I$(JDK_TOPDIR)/src/share/native/java/io \ -I$(JDK_TOPDIR)/src/share/native/java/io \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io,\ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io, \
CFLAGS_posix:=$(BUILD_LIBZIP_MMAP) -UDEBUG,\ CFLAGS_posix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libzip/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libzip/mapfile-vers, \
REORDER:=$(BUILD_LIBZIP_REORDER), \ REORDER := $(BUILD_LIBZIP_REORDER), \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN) \ $(call SET_SHARED_LIBRARY_ORIGIN) \
$(EXPORT_ZIP_FUNCS), \ $(EXPORT_ZIP_FUNCS), \
LDFLAGS_windows:=-export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \ LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
-export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \ -export:ZIP_ReadEntry -export:ZIP_GetNextEntry jvm.lib \
$(WIN_JAVA_LIB),\ $(WIN_JAVA_LIB), \
LDFLAGS_SUFFIX_linux:=-ljvm -ljava $(LIBZ),\ LDFLAGS_SUFFIX_linux := -ljvm -ljava $(LIBZ), \
LDFLAGS_SUFFIX_solaris:=-ljvm -ljava $(LIBZ) -lc,\ LDFLAGS_SUFFIX_solaris := -ljvm -ljava $(LIBZ) -lc, \
LDFLAGS_SUFFIX_macosx:=$(LIBZ) -ljava -ljvm,\ LDFLAGS_SUFFIX_macosx := $(LIBZ) -ljava -ljvm, \
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=zip.dll" \ -D "JDK_FNAME=zip.dll" \
-D "JDK_INTERNAL_NAME=zip" \ -D "JDK_INTERNAL_NAME=zip" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libzip,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libzip, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBZIP) : $(BUILD_LIBJAVA)
$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBZIP) BUILD_LIBRARIES += $(BUILD_LIBZIP)
########################################################################################## ##########################################################################################
$(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK,\ $(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \
LIBRARY:=unpack, \ LIBRARY := unpack, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
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:=main.cpp,\ EXCLUDE_FILES := main.cpp, \
LANG:=C++,\ LANG := C++, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CXXFLAGS_JDKLIB) \ CFLAGS := $(CXXFLAGS_JDKLIB) \
-DNO_ZLIB -DUNPACK_JNI -DFULL,\ -DNO_ZLIB -DUNPACK_JNI -DFULL, \
CFLAGS_release:=-DPRODUCT,\ CFLAGS_release := -DPRODUCT, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows:=-map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \ LDFLAGS_windows := -map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \
jvm.lib $(WIN_JAVA_LIB),\ jvm.lib $(WIN_JAVA_LIB), \
LDFLAGS_SUFFIX_posix:=-ljvm $(LIBCXX) -ljava -lc,\ LDFLAGS_SUFFIX_posix := -ljvm $(LIBCXX) -ljava -lc, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libunpack,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libunpack, \
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=unpack.dll" \ -D "JDK_FNAME=unpack.dll" \
-D "JDK_INTERNAL_NAME=unpack" \ -D "JDK_INTERNAL_NAME=unpack" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBUNPACK) : $(BUILD_LIBJAVA) $(BUILD_LIBUNPACK): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBUNPACK) BUILD_LIBRARIES += $(BUILD_LIBUNPACK)
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
$(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.map: $(BUILD_LIBUNPACK) $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.map: $(BUILD_LIBUNPACK)
$(ECHO) Copying $(@F) $(ECHO) Copying $(@F)
$(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX),%.map,$<) $@ $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.map, $<) $@
$(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.pdb: $(BUILD_LIBUNPACK) $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.pdb: $(BUILD_LIBUNPACK)
$(ECHO) Copying $(@F) $(ECHO) Copying $(@F)
$(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX),%.pdb,$<) $@ $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.pdb, $<) $@
endif endif
########################################################################################## ##########################################################################################
LIBATTACH_EXCLUDE_FILES:= LIBATTACH_EXCLUDE_FILES :=
ifneq ($(OPENJDK_TARGET_OS),solaris) ifneq ($(OPENJDK_TARGET_OS), solaris)
LIBATTACH_EXCLUDE_FILES+=SolarisVirtualMachine.c LIBATTACH_EXCLUDE_FILES += SolarisVirtualMachine.c
endif endif
ifneq ($(OPENJDK_TARGET_OS),linux) ifneq ($(OPENJDK_TARGET_OS), linux)
LIBATTACH_EXCLUDE_FILES+=LinuxVirtualMachine.c LIBATTACH_EXCLUDE_FILES += LinuxVirtualMachine.c
endif endif
ifneq ($(OPENJDK_TARGET_OS),macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
LIBATTACH_EXCLUDE_FILES+=BsdVirtualMachine.c LIBATTACH_EXCLUDE_FILES += BsdVirtualMachine.c
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBATTACH,\ $(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \
LIBRARY:=attach, \ LIBRARY := attach, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tools/attach,\ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tools/attach, \
EXCLUDE_FILES:=$(LIBATTACH_EXCLUDE_FILES),\ EXCLUDE_FILES := $(LIBATTACH_EXCLUDE_FILES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB),\ CFLAGS := $(CFLAGS_JDKLIB), \
CFLAGS_windows:=/Gy,\ CFLAGS_windows := /Gy, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
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=attach.dll" \ -D "JDK_FNAME=attach.dll" \
-D "JDK_INTERNAL_NAME=attach" \ -D "JDK_INTERNAL_NAME=attach" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_solaris:=-ldoor,\ LDFLAGS_solaris := -ldoor, \
LDFLAGS_windows:=/ORDER:@$(JDK_TOPDIR)/makefiles/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU),\ LDFLAGS_windows := /ORDER:@$(JDK_TOPDIR)/makefiles/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
LDFLAGS_SUFFIX_windows:=$(WIN_JAVA_LIB) advapi32.lib psapi.lib,\ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libattach,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libattach, \
DEBUG_SYMBOLS:=true)) DEBUG_SYMBOLS := true))
$(BUILD_LIBATTACH) : $(BUILD_LIBJAVA) $(BUILD_LIBATTACH): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBATTACH) BUILD_LIBRARIES += $(BUILD_LIBATTACH)
########################################################################################## ##########################################################################################
$(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET,\ $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \
LIBRARY:=dt_socket,\ LIBRARY := dt_socket, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/transport/socket \ SRC := $(JDK_TOPDIR)/src/share/transport/socket \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket,\ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) -DUSE_MMAP \ CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
-I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \ -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
-I$(JDK_TOPDIR)/src/share/transport/socket \ -I$(JDK_TOPDIR)/src/share/transport/socket \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/socket \
-I$(JDK_TOPDIR)/src/share/back/export \ -I$(JDK_TOPDIR)/src/share/back/export \
-I$(JDK_TOPDIR)/src/share/back,\ -I$(JDK_TOPDIR)/src/share/back, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libdt_socket/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libdt_socket/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_linux:=-lpthread,\ LDFLAGS_SUFFIX_linux := -lpthread, \
LDFLAGS_SUFFIX_solaris:=-lnsl -lsocket -lc,\ LDFLAGS_SUFFIX_solaris := -lnsl -lsocket -lc, \
LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib,\ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) -export:jdwpTransport_OnLoad ws2_32.lib, \
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=dt_socket.dll" \ -D "JDK_FNAME=dt_socket.dll" \
-D "JDK_INTERNAL_NAME=dt_socket" \ -D "JDK_INTERNAL_NAME=dt_socket" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdt_socket,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_socket, \
DEBUG_SYMBOLS:=true)) DEBUG_SYMBOLS := true))
$(BUILD_LIBDT_SOCKET) : $(BUILD_LIBJAVA) $(BUILD_LIBDT_SOCKET): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBDT_SOCKET) BUILD_LIBRARIES += $(BUILD_LIBDT_SOCKET)
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call SetupNativeCompilation,BUILD_LIBDT_SHMEM,\ $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SHMEM, \
LIBRARY:=dt_shmem,\ LIBRARY := dt_shmem, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/native/com/sun/tools/jdi \ SRC := $(JDK_TOPDIR)/src/share/native/com/sun/tools/jdi \
$(JDK_TOPDIR)/src/share/transport/shmem \ $(JDK_TOPDIR)/src/share/transport/shmem \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem,\ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) -DUSE_MMAP\ CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
-I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \ -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
-I$(JDK_TOPDIR)/src/share/transport/shmem \ -I$(JDK_TOPDIR)/src/share/transport/shmem \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/transport/shmem \
-I$(JDK_TOPDIR)/src/share/back/export, \ -I$(JDK_TOPDIR)/src/share/back/export, \
LDFLAGS:=$(LDFLAGS_JDKLIB),\ LDFLAGS := $(LDFLAGS_JDKLIB), \
LDFLAGS_windows:=-export:jdwpTransport_OnLoad,\ LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
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=dt_shmem.dll" \ -D "JDK_FNAME=dt_shmem.dll" \
-D "JDK_INTERNAL_NAME=dt_shmem" \ -D "JDK_INTERNAL_NAME=dt_shmem" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdt_shmem,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdt_shmem, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBDT_SHMEM) BUILD_LIBRARIES += $(BUILD_LIBDT_SHMEM)
...@@ -1126,158 +1128,158 @@ endif # OPENJDK_TARGET_OS ...@@ -1126,158 +1128,158 @@ endif # OPENJDK_TARGET_OS
########################################################################################## ##########################################################################################
# JDWP_LOGGING causes log messages to be compiled into the library. # JDWP_LOGGING causes log messages to be compiled into the library.
$(eval $(call SetupNativeCompilation,BUILD_LIBJDWP,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJDWP, \
LIBRARY:=jdwp, \ LIBRARY := jdwp, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/back $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back,\ SRC := $(JDK_TOPDIR)/src/share/back $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) -DJDWP_LOGGING\ CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
-I$(JDK_TOPDIR)/src/share/transport/export \ -I$(JDK_TOPDIR)/src/share/transport/export \
-I$(JDK_TOPDIR)/src/share/back/export \ -I$(JDK_TOPDIR)/src/share/back/export \
-I$(JDK_TOPDIR)/src/share/npt \ -I$(JDK_TOPDIR)/src/share/npt \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
-I$(JDK_TOPDIR)/src/share/back \ -I$(JDK_TOPDIR)/src/share/back \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/back \
-I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers,\ -I$(JDK_OUTPUTDIR)/gensrc_jdwp_headers, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjdwp/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjdwp/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_linux:=$(LIBDL),\ LDFLAGS_SUFFIX_linux := $(LIBDL), \
LDFLAGS_SUFFIX_solaris:=$(LIBDL) -lc,\ LDFLAGS_SUFFIX_solaris := $(LIBDL) -lc, \
LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
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=jdwp.dll" \ -D "JDK_FNAME=jdwp.dll" \
-D "JDK_INTERNAL_NAME=jdwp" \ -D "JDK_INTERNAL_NAME=jdwp" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjdwp,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjdwp, \
DEBUG_SYMBOLS:=true)) DEBUG_SYMBOLS := true))
$(BUILD_LIBJDWP) : $(BUILD_LIBJAVA) $(BUILD_LIBJDWP): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBJDWP) BUILD_LIBRARIES += $(BUILD_LIBJDWP)
########################################################################################## ##########################################################################################
LIBJAAS_MAPFILE:= LIBJAAS_MAPFILE :=
ifneq ($(OPENJDK_TARGET_OS),solaris) ifneq ($(OPENJDK_TARGET_OS), solaris)
LIBJAAS_EXCLUDE_FILES:=Solaris.c LIBJAAS_EXCLUDE_FILES := Solaris.c
else else
# only on solaris...wonder why # only on solaris...wonder why
LIBJAAS_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjaas/mapfile-vers LIBJAAS_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjaas/mapfile-vers
endif endif
LIBJAAS_NAME:=jaas_unix LIBJAAS_NAME := jaas_unix
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
LIBJAAS_NAME:=jaas_nt LIBJAAS_NAME := jaas_nt
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBJAAS,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJAAS, \
LIBRARY:=$(LIBJAAS_NAME),\ LIBRARY := $(LIBJAAS_NAME), \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/security/auth/module,\ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/security/auth/module, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB),\ CFLAGS := $(CFLAGS_JDKLIB), \
MAPFILE:=$(LIBJAAS_MAPFILE),\ MAPFILE := $(LIBJAAS_MAPFILE), \
LDFLAGS:=$(filter-out -ljava,$(LDFLAGS_JDKLIB)) \ LDFLAGS := $(filter-out -ljava, $(LDFLAGS_JDKLIB)) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows:=netapi32.lib user32.lib mpr.lib advapi32.lib,\ LDFLAGS_windows := netapi32.lib user32.lib mpr.lib advapi32.lib, \
LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX), \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
EXCLUDE_FILES:=$(LIBJAAS_EXCLUDE_FILES),\ EXCLUDE_FILES := $(LIBJAAS_EXCLUDE_FILES), \
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=$(LIBJAAS_NAME).dll" \ -D "JDK_FNAME=$(LIBJAAS_NAME).dll" \
-D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \ -D "JDK_INTERNAL_NAME=$(LIBJAAS_NAME)" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjaas,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjaas, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBJAAS) : $(BUILD_LIBJAVA) $(BUILD_LIBJAAS): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBJAAS) BUILD_LIBRARIES += $(BUILD_LIBJAAS)
########################################################################################## ##########################################################################################
$(eval $(call SetupNativeCompilation,BUILD_LIBJSDT,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJSDT, \
LIBRARY:=jsdt,\ LIBRARY := jsdt, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace\ SRC := $(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tracing/dtrace,\ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/tracing/dtrace, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB)\ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace,\ -I$(JDK_TOPDIR)/src/share/native/sun/tracing/dtrace, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjsdt/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsdt/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_linux:=$(LIBDL),\ LDFLAGS_SUFFIX_linux := $(LIBDL), \
LDFLAGS_SUFFIX_windows:=$(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL),\ LDFLAGS_SUFFIX_windows := $(LDFLAGS_JDKLIB_SUFFIX) $(LIBDL), \
LDFLAGS_SUFFIX_macosx:= $(LIBDL),\ LDFLAGS_SUFFIX_macosx := $(LIBDL), \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
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=jsdt.dll" \ -D "JDK_FNAME=jsdt.dll" \
-D "JDK_INTERNAL_NAME=jsdt" \ -D "JDK_INTERNAL_NAME=jsdt" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsdt, \ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsdt, \
DEBUG_SYMBOLS:=true)) DEBUG_SYMBOLS := true))
$(BUILD_LIBJSDT) : $(BUILD_LIBJAVA) $(BUILD_LIBJSDT): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBJSDT) BUILD_LIBRARIES += $(BUILD_LIBJSDT)
########################################################################################## ##########################################################################################
# TODO: Update awt lib path when awt is converted # TODO: Update awt lib path when awt is converted
$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS,\ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
LIBRARY:=lcms,\ LIBRARY := lcms, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms,\ SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=HIGHEST, \ OPTIMIZATION := HIGHEST, \
CFLAGS:=$(filter-out -xc99=%none,$(CFLAGS_JDKLIB)) \ CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
$(SHARED_LIBRARY_FLAGS) \ $(SHARED_LIBRARY_FLAGS) \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d \ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug,\ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
CFLAGS_solaris:=-xc99=no_lib,\ CFLAGS_solaris := -xc99=no_lib, \
CFLAGS_windows:=-DCMS_IS_WINDOWS_,\ CFLAGS_windows := -DCMS_IS_WINDOWS_, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/liblcms/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/liblcms/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_solaris:=/usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2,\ LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
LDFLAGS_windows:=$(WIN_AWT_LIB) $(WIN_JAVA_LIB),\ LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
LDFLAGS_SUFFIX_solaris:=-lawt -ljava -ljvm -lc,\ LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_macosx:=$(LIBM) -lawt -ljava -ljvm,\ LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
LDFLAGS_SUFFIX_linux:=-lm -lawt -ljava -ljvm,\ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
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=lcms.dll" \ -D "JDK_FNAME=lcms.dll" \
-D "JDK_INTERNAL_NAME=lcms" \ -D "JDK_INTERNAL_NAME=lcms" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/liblcms,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBLCMS) BUILD_LIBRARIES += $(BUILD_LIBLCMS)
$(BUILD_LIBLCMS) : $(BUILD_LIBAWT) $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
########################################################################################## ##########################################################################################
ifdef OPENJDK ifdef OPENJDK
BUILD_LIBJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers
else else
BUILD_LIBJPEG_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed BUILD_LIBJPEG_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/mapfile-vers-closed
BUILD_LIBJPEG_CLOSED_SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg BUILD_LIBJPEG_CLOSED_SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/awt/image/jpeg
BUILD_LIBJPEG_CLOSED_INCLUDES:=-I$(BUILD_LIBJPEG_CLOSED_SRC) BUILD_LIBJPEG_CLOSED_INCLUDES := -I$(BUILD_LIBJPEG_CLOSED_SRC)
endif endif
BUILD_LIBJPEG_REORDER:= BUILD_LIBJPEG_REORDER :=
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
ifneq ($(OPENJDK_TARGET_CPU), x86_64) ifneq ($(OPENJDK_TARGET_CPU), x86_64)
BUILD_LIBJPEG_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU) BUILD_LIBJPEG_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
endif endif
endif endif
...@@ -1288,66 +1290,66 @@ endif ...@@ -1288,66 +1290,66 @@ endif
# volatile to prevent the optimization. However, this approach does not # volatile to prevent the optimization. However, this approach does not
# work because we have to declare all variables as volatile in result. # work because we have to declare all variables as volatile in result.
#ifndef CROSS_COMPILE_ARCH #ifndef CROSS_COMPILE_ARCH
# CC_43_OR_NEWER:=\ # CC_43_OR_NEWER := \
# $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \ # $(shell $(EXPR) $(CC_MAJORVER) \> 4 \| \
# \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) ) # \( $(CC_MAJORVER) = 4 \& $(CC_MINORVER) \>= 3 \) )
# ifeq ($(CC_43_OR_NEWER),1) # ifeq ($(CC_43_OR_NEWER), 1)
# BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered # BUILD_LIBJPEG_CFLAGS_linux += -Wno-clobbered
# endif # endif
#endif #endif
$(eval $(call SetupNativeCompilation,BUILD_LIBJPEG,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJPEG, \
LIBRARY:=jpeg, \ LIBRARY := jpeg, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(BUILD_LIBJPEG_CLOSED_SRC) \ SRC := $(BUILD_LIBJPEG_CLOSED_SRC) \
$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=HIGHEST, \ OPTIMIZATION := HIGHEST, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(BUILD_LIBJPEG_CLOSED_INCLUDES) \ $(BUILD_LIBJPEG_CLOSED_INCLUDES) \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg,\ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg, \
MAPFILE:=$(BUILD_LIBJPEG_MAPFILE), \ MAPFILE := $(BUILD_LIBJPEG_MAPFILE), \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows:=$(WIN_JAVA_LIB) jvm.lib,\ LDFLAGS_windows := $(WIN_JAVA_LIB) jvm.lib, \
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
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=jpeg.dll" \ -D "JDK_FNAME=jpeg.dll" \
-D "JDK_INTERNAL_NAME=jpeg" \ -D "JDK_INTERNAL_NAME=jpeg" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
REORDER:=$(BUILD_LIBJPEG_REORDER),\ REORDER := $(BUILD_LIBJPEG_REORDER), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjpeg,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjpeg, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBJPEG) : $(BUILD_LIBJAVA) $(BUILD_LIBJPEG): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBJPEG) BUILD_LIBRARIES += $(BUILD_LIBJPEG)
########################################################################################## ##########################################################################################
ifndef OPENJDK ifndef OPENJDK
FONT_HEADERS:=-I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k FONT_HEADERS := -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k
BUILD_LIBFONTMANAGER_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers
LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
else else
FONT_HEADERS:=$(FREETYPE2_CFLAGS) FONT_HEADERS := $(FREETYPE2_CFLAGS)
BUILD_LIBFONTMANAGER_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk
BUILD_LIBFONTMANAGER_FONTLIB:=$(FREETYPE2_LIBS) BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE2_LIBS)
endif endif
LIBFONTMANAGER_OPTIMIZATION:=HIGH LIBFONTMANAGER_OPTIMIZATION := HIGH
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \ LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
X11TextRenderer.c X11TextRenderer.c
LIBFONTMANAGER_OPTIMIZATION:=HIGHEST LIBFONTMANAGER_OPTIMIZATION := HIGHEST
else else
LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \ LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \
lcdglyph.c lcdglyph.c
endif endif
BUILD_LIBFONTMANAGER_CFLAGS_COMMON:=\ BUILD_LIBFONTMANAGER_CFLAGS_COMMON := \
$(X_CFLAGS) \ $(X_CFLAGS) \
-DLE_STANDALONE -DHEADLESS \ -DLE_STANDALONE -DHEADLESS \
$(FONT_HEADERS) \ $(FONT_HEADERS) \
...@@ -1363,44 +1365,44 @@ BUILD_LIBFONTMANAGER_CFLAGS_COMMON:=\ ...@@ -1363,44 +1365,44 @@ BUILD_LIBFONTMANAGER_CFLAGS_COMMON:=\
# Turn off aliasing with GCC for ExtensionSubtables.cpp # Turn off aliasing with GCC for ExtensionSubtables.cpp
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS:=-fno-strict-aliasing BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER,\ $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
LIBRARY:=fontmanager, \ LIBRARY := fontmanager, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/native/sun/font\ SRC := $(JDK_TOPDIR)/src/share/native/sun/font \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font,\ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/font, \
EXCLUDE_FILES:=$(LIBFONTMANAGER_EXCLUDE_FILES) \ EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
AccelGlyphCache.c,\ AccelGlyphCache.c, \
LANG:=C++,\ LANG := C++, \
CFLAGS:=$(CFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON),\ CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
CXXFLAGS:=$(CXXFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON),\ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBFONTMANAGER_CFLAGS_COMMON), \
OPTIMIZATION:=$(LIBFONTMANAGER_OPTIMIZATION), \ OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \
CFLAGS_windows= -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \ CFLAGS_windows = -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
-DCC_NOEX, \ -DCC_NOEX, \
MAPFILE:=$(BUILD_LIBFONTMANAGER_MAPFILE), \ MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \
LDFLAGS:=$(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ LDFLAGS := $(subst -Xlinker -z -Xlinker defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=$(BUILD_LIBFONTMANAGER_FONTLIB),\ LDFLAGS_SUFFIX := $(BUILD_LIBFONTMANAGER_FONTLIB), \
LDFLAGS_SUFFIX_linux:=-lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc,\ LDFLAGS_SUFFIX_linux := -lawt $(LIBM) $(LIBCXX) -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_solaris:=-lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm,\ LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX) -ljava -ljvm, \
LDFLAGS_SUFFIX_macosx:=-lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \ LDFLAGS_SUFFIX_macosx := -lawt $(LIBM) $(LIBCXX) -undefined dynamic_lookup \
-ljava -ljvm,\ -ljava -ljvm, \
LDFLAGS_SUFFIX_windows:=$(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
$(WIN_AWT_LIB),\ $(WIN_AWT_LIB), \
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=fontmanager.dll" \ -D "JDK_FNAME=fontmanager.dll" \
-D "JDK_INTERNAL_NAME=fontmanager" \ -D "JDK_INTERNAL_NAME=fontmanager" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libfontmanager,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libfontmanager, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBFONTMANAGER) : $(BUILD_LIBAWT) $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT)
ifneq (,$(findstring $(OPENJDK_TARGET_OS),solaris macosx)) ifneq (, $(findstring $(OPENJDK_TARGET_OS), solaris macosx))
$(BUILD_LIBFONTMANAGER) : $(BUILD_LIBAWT_XAWT) $(BUILD_LIBFONTMANAGER): $(BUILD_LIBAWT_XAWT)
endif endif
BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER) BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER)
...@@ -1409,15 +1411,15 @@ BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER) ...@@ -1409,15 +1411,15 @@ BUILD_LIBRARIES += $(BUILD_LIBFONTMANAGER)
ifndef OPENJDK ifndef OPENJDK
# ifeq ($(OPENJDK_TARGET_OS), linux) #ifeq ($(OPENJDK_TARGET_OS), linux)
# ifeq ("$(CC_VER_MAJOR)", "3") # ifeq ("$(CC_VER_MAJOR)", "3")
# OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic # OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
# endif # endif
# endif #endif
# #
# The resulting size of the t2k lib file is (at least on linux) dependant on the order of # The resulting size of the t2k lib file is (at least on linux) dependant on the order of
# the input .o files. Because of this the new build will differ in size to the old build. # the input .o files. Because of this the new build will differ in size to the old build.
BUILD_LIBT2K_CFLAGS_COMMON:=-I$(JDK_TOPDIR)/src/share/native/sun/font \ BUILD_LIBT2K_CFLAGS_COMMON := -I$(JDK_TOPDIR)/src/share/native/sun/font \
-I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \ -I$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
-I$(JDK_TOPDIR)/src/closed/share/native/sun/font \ -I$(JDK_TOPDIR)/src/closed/share/native/sun/font \
-I$(JDK_TOPDIR)/src/share/share/native/sun/font \ -I$(JDK_TOPDIR)/src/share/share/native/sun/font \
...@@ -1427,35 +1429,35 @@ ifndef OPENJDK ...@@ -1427,35 +1429,35 @@ ifndef OPENJDK
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d -I$(JDK_TOPDIR)/src/share/native/sun/java2d
$(eval $(call SetupNativeCompilation,BUILD_LIBT2K,\ $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \
LIBRARY:=t2k, \ LIBRARY := t2k, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/font \ SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/font \
$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \ $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k \
$(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k/ttHints,\ $(JDK_TOPDIR)/src/closed/share/native/sun/font/t2k/ttHints, \
EXCLUDE_FILES:=orion.c,\ EXCLUDE_FILES := orion.c, \
LANG:=C++,\ LANG := C++, \
OPTIMIZATION:=HIGH, \ OPTIMIZATION := HIGH, \
CFLAGS:=$(CFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON),\ CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
CXXFLAGS:=$(CXXFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON),\ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(BUILD_LIBT2K_CFLAGS_COMMON), \
CFLAGS_windows=-DCC_NOEX, \ CFLAGS_windows = -DCC_NOEX, \
CXXFLAGS_windows=-DCC_NOEX, \ CXXFLAGS_windows = -DCC_NOEX, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libt2k/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libt2k/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows:=user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib,\ LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
LDFLAGS_SUFFIX_posix:=$(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc,\ LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_solaris:=-lawt -lawt_xawt,\ LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \
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=t2k.dll" \ -D "JDK_FNAME=t2k.dll" \
-D "JDK_INTERNAL_NAME=t2k" \ -D "JDK_INTERNAL_NAME=t2k" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libt2k,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libt2k, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
# t2k is linked against fontmanager # t2k is linked against fontmanager
$(BUILD_LIBT2K) : $(BUILD_LIBFONTMANAGER) $(BUILD_LIBT2K): $(BUILD_LIBFONTMANAGER)
BUILD_LIBRARIES += $(BUILD_LIBT2K) BUILD_LIBRARIES += $(BUILD_LIBT2K)
endif endif
...@@ -1464,44 +1466,44 @@ endif ...@@ -1464,44 +1466,44 @@ endif
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
ifeq ($(OPENJDK_TARGET_CPU), x86) ifeq ($(OPENJDK_TARGET_CPU), x86)
KERNEL32_LIB:=kernel32.lib KERNEL32_LIB := kernel32.lib
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBJAWT,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
LIBRARY:=jawt, \ LIBRARY := jawt, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows,\ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows, \
INCLUDE_FILES:=jawt.cpp,\ INCLUDE_FILES := jawt.cpp, \
LANG:=C++,\ LANG := C++, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CXXFLAGS_JDKLIB) \ CFLAGS := $(CXXFLAGS_JDKLIB) \
-EHsc -DUNICODE -D_UNICODE \ -EHsc -DUNICODE -D_UNICODE \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/windows \
-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/java2d \ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows, \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/windows, \
LDFLAGS:=$(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \ LDFLAGS := $(LDFLAGS_JDKLIB) $(KERNEL32_LIB) $(LDFLAGS_CXX_JDK) \
advapi32.lib $(WIN_AWT_LIB),\ advapi32.lib $(WIN_AWT_LIB), \
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
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=jawt.dll" \ -D "JDK_FNAME=jawt.dll" \
-D "JDK_INTERNAL_NAME=jawt" \ -D "JDK_INTERNAL_NAME=jawt" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawt,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBJAWT) : $(BUILD_LIBAWT) $(BUILD_LIBJAWT): $(BUILD_LIBAWT)
$(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT) $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX): $(BUILD_LIBJAWT)
$(ECHO) Copying $(@F) $(ECHO) Copying $(@F)
$(CP) $(JDK_OUTPUTDIR)/objs/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@ $(CP) $(JDK_OUTPUTDIR)/objs/libjawt/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $@
BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
else # OPENJDK_TARGET_OS not windows else # OPENJDK_TARGET_OS not windows
JAWT_LIBS:= JAWT_LIBS :=
ifneq ($(OPENJDK_TARGET_OS), solaris) ifneq ($(OPENJDK_TARGET_OS), solaris)
JAWT_LIBS += -lawt JAWT_LIBS += -lawt
endif endif
...@@ -1513,43 +1515,43 @@ else # OPENJDK_TARGET_OS not windows ...@@ -1513,43 +1515,43 @@ else # OPENJDK_TARGET_OS not windows
HEADLESS_CFLAG += -DHEADLESS HEADLESS_CFLAG += -DHEADLESS
endif endif
JAWT_FILES:=jawt.c JAWT_FILES := jawt.c
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
JAWT_FILES:=jawt.m JAWT_FILES := jawt.m
JAWT_LIBS:=-lawt_lwawt JAWT_LIBS := -lawt_lwawt
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBJAWT,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJAWT, \
LIBRARY:=jawt, \ LIBRARY := jawt, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt \
$(JDK_TOPDIR)/src/macosx/native/sun/awt,\ $(JDK_TOPDIR)/src/macosx/native/sun/awt, \
INCLUDE_FILES:=$(JAWT_FILES),\ INCLUDE_FILES := $(JAWT_FILES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB), \ CFLAGS := $(CFLAGS_JDKLIB), \
CFLAGS_linux:=$(HEADLESS_CFLAG),\ CFLAGS_linux := $(HEADLESS_CFLAG), \
CFLAGS_macosx:=-I$(JDK_TOPDIR)/src/solaris/native/sun/awt ,\ CFLAGS_macosx := -I$(JDK_TOPDIR)/src/solaris/native/sun/awt, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjawt/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjawt/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_solaris:=-L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\ LDFLAGS_solaris := -L$(OPENWIN_HOME)/sfw/lib$(OPENJDK_TARGET_CPU_ISADIR) -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
LDFLAGS_SUFFIX_linux:=$(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX_linux := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX), \
LDFLAGS_SUFFIX_solaris:=$(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender,\ LDFLAGS_SUFFIX_solaris := $(JAWT_LIBS) $(LDFLAGS_JDKLIB_SUFFIX) -lXrender, \
LDFLAGS_SUFFIX_macosx:=-Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \ LDFLAGS_SUFFIX_macosx := -Xlinker -rpath -Xlinker @loader_path $(JAWT_LIBS) \
-framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX),\ -framework Cocoa $(LDFLAGS_JDKLIB_SUFFIX), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawt,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawt, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
ifndef BUILD_HEADLESS_ONLY ifndef BUILD_HEADLESS_ONLY
$(BUILD_LIBJAWT) : $(BUILD_LIBAWT_XAWT) $(BUILD_LIBJAWT): $(BUILD_LIBAWT_XAWT)
else else
$(BUILD_LIBJAWT) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX) $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_headless$(SHARED_LIBRARY_SUFFIX)
endif endif
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
$(BUILD_LIBJAWT) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX) $(BUILD_LIBJAWT): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)awt_lwawt$(SHARED_LIBRARY_SUFFIX)
endif endif
endif # OPENJDK_TARGET_OS endif # OPENJDK_TARGET_OS
...@@ -1557,11 +1559,11 @@ BUILD_LIBRARIES += $(BUILD_LIBJAWT) ...@@ -1557,11 +1559,11 @@ BUILD_LIBRARIES += $(BUILD_LIBJAWT)
########################################################################################## ##########################################################################################
LIBINSTRUMENT_SRC :=$(JDK_TOPDIR)/src/share/instrument \ LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/share/instrument \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/io \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument
LIBINSTRUMENT_FILES :=\ LIBINSTRUMENT_FILES := \
EncodingSupport.c \ EncodingSupport.c \
EncodingSupport_md.c \ EncodingSupport_md.c \
FileSystemSupport_md.c \ FileSystemSupport_md.c \
...@@ -1576,14 +1578,14 @@ LIBINSTRUMENT_FILES :=\ ...@@ -1576,14 +1578,14 @@ LIBINSTRUMENT_FILES :=\
Utilities.c \ Utilities.c \
canonicalize_md.c canonicalize_md.c
LIBINSTRUMENT_DIR :=$(JDK_OUTPUTDIR)/objs/libinstrument LIBINSTRUMENT_DIR := $(JDK_OUTPUTDIR)/objs/libinstrument
LIBINSTRUMENT_CFLAGS:=$(CFLAGS_JDKLIB) \ LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/instrument \ -I$(JDK_TOPDIR)/src/share/instrument \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/instrument \
-I$(JDK_TOPDIR)/src/share/bin -I$(JDK_TOPDIR)/src/share/bin
LIBINSTRUMENT_LDFLAGS:= LIBINSTRUMENT_LDFLAGS :=
LIBINSTRUMENT_LDFLAGS_SUFFIX:= LIBINSTRUMENT_LDFLAGS_SUFFIX :=
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
LIBINSTRUMENT_LDFLAGS += $(JDK_OUTPUTDIR)/objs/jli_static.lib $(WIN_JAVA_LIB) \ LIBINSTRUMENT_LDFLAGS += $(JDK_OUTPUTDIR)/objs/jli_static.lib $(WIN_JAVA_LIB) \
...@@ -1591,59 +1593,59 @@ ifeq ($(OPENJDK_TARGET_OS), windows) ...@@ -1591,59 +1593,59 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
# Statically link the C runtime so that there are not dependencies on modules # Statically link the C runtime so that there are not dependencies on modules
# not on the search patch when invoked from the Windows system directory # not on the search patch when invoked from the Windows system directory
# (or elsewhere). # (or elsewhere).
LIBINSTRUMENT_CFLAGS := $(filter-out -MD,$(LIBINSTRUMENT_CFLAGS)) LIBINSTRUMENT_CFLAGS := $(filter-out -MD, $(LIBINSTRUMENT_CFLAGS))
# equivalent of strcasecmp is stricmp on Windows # equivalent of strcasecmp is stricmp on Windows
LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp LIBINSTRUMENT_CFLAGS += -Dstrcasecmp=stricmp
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT,\ $(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \
LIBRARY:=instrument, \ LIBRARY := instrument, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBINSTRUMENT_SRC),\ SRC := $(LIBINSTRUMENT_SRC), \
INCLUDE_FILES:=$(LIBINSTRUMENT_FILES),\ INCLUDE_FILES := $(LIBINSTRUMENT_FILES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(LIBINSTRUMENT_CFLAGS),\ CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
CFLAGS_debug:=-DJPLIS_LOGGING,\ CFLAGS_debug := -DJPLIS_LOGGING, \
CFLAGS_release:=-DNO_JPLIS_LOGGING,\ CFLAGS_release := -DNO_JPLIS_LOGGING, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libinstrument/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libinstrument/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN) \ $(call SET_SHARED_LIBRARY_ORIGIN) \
$(LIBINSTRUMENT_LDFLAGS),\ $(LIBINSTRUMENT_LDFLAGS), \
LDFLAGS_linux:=$(call SET_SHARED_LIBRARY_ORIGIN,/jli),\ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
LDFLAGS_solaris:= $(call SET_SHARED_LIBRARY_ORIGIN,/jli),\ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
LDFLAGS_macosx:=-Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \ LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
-framework Cocoa -framework Security -framework ApplicationServices,\ -framework Cocoa -framework Security -framework ApplicationServices, \
LDFLAGS_SUFFIX:=$(LIBINSTRUMENT_LDFLAGS_SUFFIX),\ LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \
LDFLAGS_SUFFIX_macosx:=-liconv $(LIBZ),\ LDFLAGS_SUFFIX_macosx := -liconv $(LIBZ), \
LDFLAGS_SUFFIX_solaris:=$(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc,\ LDFLAGS_SUFFIX_solaris := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL) -lc, \
LDFLAGS_SUFFIX_linux:=$(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL),\ LDFLAGS_SUFFIX_linux := $(LIBZ) -L $(INSTALL_LIBRARIES_HERE)/jli -ljli $(LIBDL), \
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=instrument.dll" \ -D "JDK_FNAME=instrument.dll" \
-D "JDK_INTERNAL_NAME=instrument" \ -D "JDK_INTERNAL_NAME=instrument" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(LIBINSTRUMENT_DIR),\ OBJECT_DIR := $(LIBINSTRUMENT_DIR), \
DEBUG_SYMBOLS:=true)) DEBUG_SYMBOLS := true))
ifneq (,$(findstring $(OPENJDK_TARGET_OS), macosx windows)) ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows))
$(BUILD_LIBINSTRUMENT) : $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX) $(BUILD_LIBINSTRUMENT): $(JDK_OUTPUTDIR)/objs/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX)
else else
$(BUILD_LIBINSTRUMENT) : $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX) $(BUILD_LIBINSTRUMENT): $(INSTALL_LIBRARIES_HERE)/jli/$(LIBRARY_PREFIX)jli$(SHARED_LIBRARY_SUFFIX)
endif endif
$(BUILD_LIBINSTRUMENT) : $(BUILD_LIBJAVA) $(BUILD_LIBINSTRUMENT): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBINSTRUMENT) BUILD_LIBRARIES += $(BUILD_LIBINSTRUMENT)
########################################################################################## ##########################################################################################
BUILD_LIBMANAGEMENT_SRC:=$(JDK_TOPDIR)/src/share/native/sun/management \ BUILD_LIBMANAGEMENT_SRC := $(JDK_TOPDIR)/src/share/native/sun/management \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/management \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/management \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/management $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/management
BUILD_LIBMANAGEMENT_EXCLUDES:= BUILD_LIBMANAGEMENT_EXCLUDES :=
BUILD_LIBMANAGEMENT_CFLAGS:=-I$(JDK_TOPDIR)/src/share/native/sun/management BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/management
ifneq ($(OPENJDK_TARGET_OS), windows) ifneq ($(OPENJDK_TARGET_OS), windows)
BUILD_LIBMANAGEMENT_EXCLUDES += OperatingSystem_md.c BUILD_LIBMANAGEMENT_EXCLUDES += OperatingSystem_md.c
...@@ -1651,170 +1653,170 @@ else ...@@ -1651,170 +1653,170 @@ else
BUILD_LIBMANAGEMENT_EXCLUDES += UnixOperatingSystem_md.c BUILD_LIBMANAGEMENT_EXCLUDES += UnixOperatingSystem_md.c
endif endif
ifneq ($(OPENJDK_TARGET_OS),solaris) ifneq ($(OPENJDK_TARGET_OS), solaris)
BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c BUILD_LIBMANAGEMENT_EXCLUDES += SolarisOperatingSystem.c
endif endif
ifneq ($(OPENJDK_TARGET_OS),linux) ifneq ($(OPENJDK_TARGET_OS), linux)
BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c BUILD_LIBMANAGEMENT_EXCLUDES += LinuxOperatingSystem.c
endif endif
ifneq ($(OPENJDK_TARGET_OS),macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c BUILD_LIBMANAGEMENT_EXCLUDES += MacosxOperatingSystem.c
endif endif
LIBMANAGEMENT_OPTIMIZATION:=HIGH LIBMANAGEMENT_OPTIMIZATION := HIGH
ifneq ($(findstring $(OPENJDK_TARGET_OS),solaris linux),) ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
ifeq ($(ENABLE_DEBUG_SYMBOLS), true) ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
LIBMANAGEMENT_OPTIMIZATION:=LOW LIBMANAGEMENT_OPTIMIZATION := LOW
endif endif
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT,\ $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \
LIBRARY:=management,\ LIBRARY := management, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(BUILD_LIBMANAGEMENT_SRC),\ SRC := $(BUILD_LIBMANAGEMENT_SRC), \
EXCLUDE_FILES:=$(BUILD_LIBMANAGEMENT_EXCLUDES),\ EXCLUDE_FILES := $(BUILD_LIBMANAGEMENT_EXCLUDES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=$(LIBMANAGEMENT_OPTIMIZATION), \ OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
CFLAGS:=$(CFLAGS_JDKLIB) $(BUILD_LIBMANAGEMENT_CFLAGS),\ CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBMANAGEMENT_CFLAGS), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libmanagement/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libmanagement/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_solaris:=-lkstat,\ LDFLAGS_solaris := -lkstat, \
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX), \
LDFLAGS_SUFFIX_windows:=jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib,\ LDFLAGS_SUFFIX_windows := jvm.lib psapi.lib $(WIN_JAVA_LIB) advapi32.lib, \
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=management.dll" \ -D "JDK_FNAME=management.dll" \
-D "JDK_INTERNAL_NAME=management" \ -D "JDK_INTERNAL_NAME=management" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libmanagement,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libmanagement, \
DEBUG_SYMBOLS:=true)) DEBUG_SYMBOLS := true))
$(BUILD_LIBMANAGEMENT) : $(BUILD_LIBJAVA) $(BUILD_LIBMANAGEMENT): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBMANAGEMENT) BUILD_LIBRARIES += $(BUILD_LIBMANAGEMENT)
########################################################################################## ##########################################################################################
BUILD_LIBHPROF_SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/hprof $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/hprof BUILD_LIBHPROF_SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/hprof $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/hprof
BUILD_LIBHPROF_CFLAGS:=-I$(JDK_TOPDIR)/src/share/demo/jvmti/hprof \ BUILD_LIBHPROF_CFLAGS := -I$(JDK_TOPDIR)/src/share/demo/jvmti/hprof \
-I$(JDK_TOPDIR)/src/share/npt \ -I$(JDK_TOPDIR)/src/share/npt \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt \
-I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo
BUILD_LIBHPROF_LDFLAGS:= BUILD_LIBHPROF_LDFLAGS :=
LIBHPROF_OPTIMIZATION:=HIGHEST LIBHPROF_OPTIMIZATION := HIGHEST
ifneq ($(findstring $(OPENJDK_TARGET_OS),solaris linux),) ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
ifeq ($(ENABLE_DEBUG_SYMBOLS), true) ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
LIBHPROF_OPTIMIZATION:=LOW LIBHPROF_OPTIMIZATION := LOW
endif endif
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBHPROF,\ $(eval $(call SetupNativeCompilation,BUILD_LIBHPROF, \
LIBRARY:=hprof, \ LIBRARY := hprof, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(BUILD_LIBHPROF_SRC),\ SRC := $(BUILD_LIBHPROF_SRC), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=$(LIBHPROF_OPTIMIZATION), \ OPTIMIZATION := $(LIBHPROF_OPTIMIZATION), \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(BUILD_LIBHPROF_CFLAGS),\ $(BUILD_LIBHPROF_CFLAGS), \
CFLAGS_debug:=-DHPROF_LOGGING,\ CFLAGS_debug := -DHPROF_LOGGING, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libhprof/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libhprof/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows:=wsock32.lib winmm.lib advapi32.lib,\ LDFLAGS_windows := wsock32.lib winmm.lib advapi32.lib, \
LDFLAGS_SUFFIX_linux:=$(LIBDL),\ LDFLAGS_SUFFIX_linux := $(LIBDL), \
LDFLAGS_SUFFIX_macosx:=$(LIBDL),\ LDFLAGS_SUFFIX_macosx := $(LIBDL), \
LDFLAGS_SUFFIX_solaris:=-lsocket -lnsl $(LIBDL) -lc,\ LDFLAGS_SUFFIX_solaris := -lsocket -lnsl $(LIBDL) -lc, \
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=hprof.dll" \ -D "JDK_FNAME=hprof.dll" \
-D "JDK_INTERNAL_NAME=hprof" \ -D "JDK_INTERNAL_NAME=hprof" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libhprof_jvmti,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libhprof_jvmti, \
DEBUG_SYMBOLS:=true)) DEBUG_SYMBOLS := true))
BUILD_LIBRARIES += $(BUILD_LIBHPROF) BUILD_LIBRARIES += $(BUILD_LIBHPROF)
########################################################################################## ##########################################################################################
$(eval $(call SetupNativeCompilation,BUILD_LIBJAVA_CRW_DEMO,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVA_CRW_DEMO, \
LIBRARY:=java_crw_demo, \ LIBRARY := java_crw_demo, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo,\ SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo,\ -I$(JDK_TOPDIR)/src/share/demo/jvmti/java_crw_demo, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjava_crw_demo/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjava_crw_demo/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
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=java_crw_demo.dll" \ -D "JDK_FNAME=java_crw_demo.dll" \
-D "JDK_INTERNAL_NAME=java_crw_demo" \ -D "JDK_INTERNAL_NAME=java_crw_demo" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjava_crw_demo,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjava_crw_demo, \
DEBUG_SYMBOLS:=true)) DEBUG_SYMBOLS := true))
BUILD_LIBRARIES += $(BUILD_LIBJAVA_CRW_DEMO) BUILD_LIBRARIES += $(BUILD_LIBJAVA_CRW_DEMO)
########################################################################################## ##########################################################################################
$(eval $(call SetupNativeCompilation,BUILD_LIBNPT,\ $(eval $(call SetupNativeCompilation,BUILD_LIBNPT, \
LIBRARY:=npt, \ LIBRARY := npt, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/npt $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt,\ SRC := $(JDK_TOPDIR)/src/share/npt $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/npt \ -I$(JDK_TOPDIR)/src/share/npt \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt,\ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libnpt/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnpt/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_macosx:=-liconv,\ LDFLAGS_macosx := -liconv, \
LDFLAGS_SUFFIX_windows:=-export:nptInitialize -export:nptTerminate,\ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \
LDFLAGS_SUFFIX_solaris:=-lc, \ LDFLAGS_SUFFIX_solaris := -lc, \
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=npt.dll" \ -D "JDK_FNAME=npt.dll" \
-D "JDK_INTERNAL_NAME=npt" \ -D "JDK_INTERNAL_NAME=npt" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnpt,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnpt, \
DEBUG_SYMBOLS:=true)) DEBUG_SYMBOLS := true))
BUILD_LIBRARIES += $(BUILD_LIBNPT) BUILD_LIBRARIES += $(BUILD_LIBNPT)
########################################################################################## ##########################################################################################
LIBNET_SRC_DIRS:=$(JDK_TOPDIR)/src/share/native/java/net \ LIBNET_SRC_DIRS := $(JDK_TOPDIR)/src/share/native/java/net \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/dns \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/dns \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/spi $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/spi
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
LIBNET_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/www/protocol/http/ntlm LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/www/protocol/http/ntlm
else else
LIBNET_SRC_DIRS+=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/sdp LIBNET_SRC_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/net/sdp
endif endif
LIBNET_CFLAGS:=$(foreach dir,$(LIBNET_SRC_DIRS),-I$(dir)) LIBNET_CFLAGS := $(foreach dir, $(LIBNET_SRC_DIRS), -I$(dir))
LIBNET_EXCLUDE_FILES:= LIBNET_EXCLUDE_FILES :=
ifneq ($(OPENJDK_TARGET_OS),linux) ifneq ($(OPENJDK_TARGET_OS), linux)
LIBNET_EXCLUDE_FILES += linux_close.c LIBNET_EXCLUDE_FILES += linux_close.c
endif endif
ifneq ($(OPENJDK_TARGET_OS),macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
LIBNET_EXCLUDE_FILES += bsd_close.c LIBNET_EXCLUDE_FILES += bsd_close.c
endif endif
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
LIBNET_EXCLUDE_FILES += PlainSocketImpl.c PlainDatagramSocketImpl.c SdpSupport.c LIBNET_EXCLUDE_FILES += PlainSocketImpl.c PlainDatagramSocketImpl.c SdpSupport.c
else else
LIBNET_EXCLUDE_FILES += TwoStacksPlainSocketImpl.c DualStackPlainSocketImpl.c \ LIBNET_EXCLUDE_FILES += TwoStacksPlainSocketImpl.c DualStackPlainSocketImpl.c \
...@@ -1822,33 +1824,33 @@ else ...@@ -1822,33 +1824,33 @@ else
NTLMAuthSequence.c NetworkInterface_winXP.c NTLMAuthSequence.c NetworkInterface_winXP.c
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBNET,\ $(eval $(call SetupNativeCompilation,BUILD_LIBNET, \
LIBRARY:=net,\ LIBRARY := net, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBNET_SRC_DIRS),\ SRC := $(LIBNET_SRC_DIRS), \
EXCLUDE_FILES:=$(LIBNET_EXCLUDE_FILES), \ EXCLUDE_FILES := $(LIBNET_EXCLUDE_FILES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(LIBNET_CFLAGS),\ $(LIBNET_CFLAGS), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libnet/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnet/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_macosx:=-ljvm -ljava,\ LDFLAGS_SUFFIX_macosx := -ljvm -ljava, \
LDFLAGS_SUFFIX_solaris:=-ljvm -ljava -lnsl -lsocket $(LIBDL) -lc ,\ LDFLAGS_SUFFIX_solaris := -ljvm -ljava -lnsl -lsocket $(LIBDL) -lc, \
LDFLAGS_SUFFIX_linux:=$(LIBDL) -ljvm -lpthread -ljava,\ LDFLAGS_SUFFIX_linux := $(LIBDL) -ljvm -lpthread -ljava, \
LDFLAGS_SUFFIX_windows:=ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \ LDFLAGS_SUFFIX_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib \
delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \ delayimp.lib $(WIN_JAVA_LIB) advapi32.lib \
-DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \ -DELAYLOAD:secur32.dll -DELAYLOAD:iphlpapi.dll, \
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=net.dll" \ -D "JDK_FNAME=net.dll" \
-D "JDK_INTERNAL_NAME=net" \ -D "JDK_INTERNAL_NAME=net" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnet,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnet, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBNET) : $(BUILD_LIBJAVA) $(BUILD_LIBNET): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBNET) BUILD_LIBRARIES += $(BUILD_LIBNET)
...@@ -1859,27 +1861,27 @@ $(JDK_OUTPUTDIR)/lib/net.properties: $(JDK_TOPDIR)/src/share/lib/net.properties ...@@ -1859,27 +1861,27 @@ $(JDK_OUTPUTDIR)/lib/net.properties: $(JDK_TOPDIR)/src/share/lib/net.properties
COPY_FILES += $(JDK_OUTPUTDIR)/lib/net.properties COPY_FILES += $(JDK_OUTPUTDIR)/lib/net.properties
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
$(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template : $(JDK_TOPDIR)/src/${OPENJDK_TARGET_OS_API_DIR}/lib/sdp/sdp.conf.template $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/${OPENJDK_TARGET_OS_API_DIR}/lib/sdp/sdp.conf.template
$(ECHO) $(LOG_INFO) Copying $(@F) $(ECHO) $(LOG_INFO) Copying $(@F)
$(call install-file) $(call install-file)
COPY_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template COPY_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template
endif endif
########################################################################################## ##########################################################################################
BUILD_LIBNIO_SRC:=\ BUILD_LIBNIO_SRC := \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/nio \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/nio \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
BUILD_LIBNIO_CFLAGS:=\ BUILD_LIBNIO_CFLAGS := \
-I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \ -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
-I$(JDK_TOPDIR)/src/share/native/java/io \ -I$(JDK_TOPDIR)/src/share/native/java/io \
-I$(JDK_TOPDIR)/src/share/native/java/net \ -I$(JDK_TOPDIR)/src/share/native/java/net \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net
BUILD_LIBNIO_FILES:=\ BUILD_LIBNIO_FILES := \
DatagramChannelImpl.c \ DatagramChannelImpl.c \
DatagramDispatcher.c \ DatagramDispatcher.c \
FileChannelImpl.c \ FileChannelImpl.c \
...@@ -1904,7 +1906,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) ...@@ -1904,7 +1906,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
endif endif
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
BUILD_LIBNIO_FILES += \ BUILD_LIBNIO_FILES += \
EPoll.c \ EPoll.c \
EPollArrayWrapper.c \ EPollArrayWrapper.c \
...@@ -1923,7 +1925,7 @@ ifeq ($(OPENJDK_TARGET_OS), linux) ...@@ -1923,7 +1925,7 @@ ifeq ($(OPENJDK_TARGET_OS), linux)
endif endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/macosx/native/sun/nio/ch BUILD_LIBNIO_SRC += $(JDK_TOPDIR)/src/macosx/native/sun/nio/ch
BUILD_LIBNIO_FILES += \ BUILD_LIBNIO_FILES += \
InheritedChannel.c \ InheritedChannel.c \
...@@ -1941,7 +1943,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) ...@@ -1941,7 +1943,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
endif endif
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
BUILD_LIBNIO_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS) BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
BUILD_LIBNIO_FILES += \ BUILD_LIBNIO_FILES += \
DevPollArrayWrapper.c \ DevPollArrayWrapper.c \
InheritedChannel.c \ InheritedChannel.c \
...@@ -1957,84 +1959,84 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) ...@@ -1957,84 +1959,84 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
UnixNativeDispatcher.c UnixNativeDispatcher.c
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBNIO,\ $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \
LIBRARY:=nio,\ LIBRARY := nio, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(BUILD_LIBNIO_SRC),\ SRC := $(BUILD_LIBNIO_SRC), \
INCLUDE_FILES:=$(BUILD_LIBNIO_FILES), \ INCLUDE_FILES := $(BUILD_LIBNIO_FILES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=HIGH, \ OPTIMIZATION := HIGH, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(BUILD_LIBNIO_CFLAGS),\ $(BUILD_LIBNIO_CFLAGS), \
MAPFILE:=$(BUILD_LIBNIO_MAPFILE), \ MAPFILE := $(BUILD_LIBNIO_MAPFILE), \
LDFLAGS:=$(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \ LDFLAGS := $(LDFLAGS_JDKLIB) $(BUILD_LIBNIO_LDFLAGS) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_linux:=-ljava -lnet -lpthread $(LIBDL),\ LDFLAGS_SUFFIX_linux := -ljava -lnet -lpthread $(LIBDL), \
LDFLAGS_SUFFIX_solaris:=-ljvm -lsocket -lposix4 $(LIBDL) \ LDFLAGS_SUFFIX_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \
-lsendfile -ljava -lnet -lc,\ -lsendfile -ljava -lnet -lc, \
LDFLAGS_SUFFIX_windows:=jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \ LDFLAGS_SUFFIX_windows := jvm.lib ws2_32.lib $(WIN_JAVA_LIB) \
$(JDK_OUTPUTDIR)/objs/libnet/net.lib \ $(JDK_OUTPUTDIR)/objs/libnet/net.lib \
advapi32.lib,\ advapi32.lib, \
LDFLAGS_SUFFIX_macosx:=-ljava -lnet -pthread -framework CoreFoundation,\ LDFLAGS_SUFFIX_macosx := -ljava -lnet -pthread -framework CoreFoundation, \
LDFLAGS_SUFFIX:=,\ LDFLAGS_SUFFIX :=, \
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=nio.dll" \ -D "JDK_FNAME=nio.dll" \
-D "JDK_INTERNAL_NAME=nio" \ -D "JDK_INTERNAL_NAME=nio" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libnio,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libnio, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBNIO) BUILD_LIBRARIES += $(BUILD_LIBNIO)
$(BUILD_LIBNIO) : $(BUILD_LIBNET) $(BUILD_LIBNIO): $(BUILD_LIBNET)
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS_API),posix) ifeq ($(OPENJDK_TARGET_OS_API), posix)
ifneq ($(OPENJDK_TARGET_OS),macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
SCTP_WERROR := -Werror SCTP_WERROR := -Werror
ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc) ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
SCTP_WERROR := SCTP_WERROR :=
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBSCTP,\ $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \
LIBRARY:=sctp,\ LIBRARY := sctp, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch/sctp,\ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch/sctp, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB)\ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \ -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch \
-I$(JDK_TOPDIR)/src/share/native/sun/nio/ch/sctp \ -I$(JDK_TOPDIR)/src/share/native/sun/nio/ch/sctp \
-I$(JDK_TOPDIR)/src/share/native/java/net \ -I$(JDK_TOPDIR)/src/share/native/java/net \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/ch \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net,\ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/java/net, \
CFLAGS_linux:=$(SCTP_WERROR),\ CFLAGS_linux := $(SCTP_WERROR), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsctp/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsctp/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_linux:=-lpthread $(LIBDL) -ljava -ljvm,\ LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \
LDFLAGS_SUFFIX_posix:=-lnio -lnet,\ LDFLAGS_SUFFIX_posix := -lnio -lnet, \
LDFLAGS_SUFFIX_solaris:=-lsocket -ljava -ljvm -lc,\ LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_macosx:=-ljava -ljvm,\ LDFLAGS_SUFFIX_macosx := -ljava -ljvm, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsctp,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsctp, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBSCTP) BUILD_LIBRARIES += $(BUILD_LIBSCTP)
$(BUILD_LIBSCTP) : $(BUILD_LIBNIO) $(BUILD_LIBSCTP): $(BUILD_LIBNIO)
endif endif
endif endif
########################################################################################## ##########################################################################################
BUILD_LIBJLI_SRC_DIRS:=$(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin
LIBJLI_CFLAGS:=$(CFLAGS_JDKLIB) $(foreach dir,$(BUILD_LIBJLI_SRC_DIRS),-I$(dir)) LIBJLI_CFLAGS := $(CFLAGS_JDKLIB) $(foreach dir, $(BUILD_LIBJLI_SRC_DIRS), -I$(dir))
BUILD_LIBJLI_FILES:=\ BUILD_LIBJLI_FILES := \
java.c \ java.c \
splashscreen_stubs.c \ splashscreen_stubs.c \
parse_manifest.c \ parse_manifest.c \
...@@ -2043,12 +2045,12 @@ BUILD_LIBJLI_FILES:=\ ...@@ -2043,12 +2045,12 @@ BUILD_LIBJLI_FILES:=\
jli_util.c jli_util.c
ifeq ($(JVM_VARIANT_ZERO), true) ifeq ($(JVM_VARIANT_ZERO), true)
ERGO_FAMILY:=zero ERGO_FAMILY := zero
else else
ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86) ifeq ($(OPENJDK_TARGET_CPU_ARCH), x86)
ERGO_FAMILY:=i586 ERGO_FAMILY := i586
else else
ERGO_FAMILY:=$(OPENJDK_TARGET_CPU_ARCH) ERGO_FAMILY := $(OPENJDK_TARGET_CPU_ARCH)
endif endif
endif endif
...@@ -2057,15 +2059,15 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) ...@@ -2057,15 +2059,15 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/bin BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/bin
BUILD_LIBJLI_FILES += java_md_common.c java_md_macosx.c BUILD_LIBJLI_FILES += java_md_common.c java_md_macosx.c
BUILD_LIBJLI_java_md_macosx.c_CFLAGS:=-x objective-c BUILD_LIBJLI_java_md_macosx.c_CFLAGS := -x objective-c
BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS:=-x objective-c BUILD_LIBJLI_STATIC_java_md_macosx.c_CFLAGS := -x objective-c
endif endif
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
BUILD_LIBJLI_FILES += java_md.c \ BUILD_LIBJLI_FILES += java_md.c \
cmdtoargs.c cmdtoargs.c
# Staticically link with c runtime on windows. # Staticically link with c runtime on windows.
LIBJLI_CFLAGS:=$(filter-out -MD,$(LIBJLI_CFLAGS)) LIBJLI_CFLAGS := $(filter-out -MD, $(LIBJLI_CFLAGS))
else ifneq ($(OPENJDK_TARGET_OS), macosx) else ifneq ($(OPENJDK_TARGET_OS), macosx)
BUILD_LIBJLI_FILES += java_md_common.c BUILD_LIBJLI_FILES += java_md_common.c
...@@ -2075,7 +2077,7 @@ else ifneq ($(OPENJDK_TARGET_OS), macosx) ...@@ -2075,7 +2077,7 @@ else ifneq ($(OPENJDK_TARGET_OS), macosx)
# if the architecture specific ergo file exists then # if the architecture specific ergo file exists then
# use it, else use the generic definitions from ergo.c # use it, else use the generic definitions from ergo.c
ifneq ($(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(ERGO_ARCH_FILE)),) ifneq ($(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(ERGO_ARCH_FILE)), )
BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE) BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE)
else # !ERGO_ARCH_FILE else # !ERGO_ARCH_FILE
LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
...@@ -2089,7 +2091,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx) ...@@ -2089,7 +2091,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" LIBJLI_CFLAGS += -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
endif endif
ifneq ($(USE_EXTERNAL_LIBZ),true) ifneq ($(USE_EXTERNAL_LIBZ), true)
BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5 BUILD_LIBJLI_SRC_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS) LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
BUILD_LIBJLI_FILES += \ BUILD_LIBJLI_FILES += \
...@@ -2102,29 +2104,29 @@ ifneq ($(USE_EXTERNAL_LIBZ),true) ...@@ -2102,29 +2104,29 @@ ifneq ($(USE_EXTERNAL_LIBZ),true)
endif endif
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
LIBJLI_OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE) LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)
else else
LIBJLI_OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE)/jli LIBJLI_OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE)/jli
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
LIBRARY:=jli,\ LIBRARY := jli, \
OUTPUT_DIR:=$(LIBJLI_OUTPUT_DIR),\ OUTPUT_DIR := $(LIBJLI_OUTPUT_DIR), \
SRC:=$(BUILD_LIBJLI_SRC_DIRS),\ SRC := $(BUILD_LIBJLI_SRC_DIRS), \
INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\ INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=HIGH, \ OPTIMIZATION := HIGH, \
CFLAGS:=$(LIBJLI_CFLAGS),\ CFLAGS := $(LIBJLI_CFLAGS), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjli/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjli/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_linux:=$(call SET_SHARED_LIBRARY_ORIGIN,/..),\ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
LDFLAGS_solaris:=$(call SET_SHARED_LIBRARY_ORIGIN,/..),\ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
LDFLAGS_macosx:=-framework Cocoa -framework Security -framework ApplicationServices,\ LDFLAGS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
LDFLAGS_SUFFIX_solaris:=$(LIBZ) $(LIBDL) -lc,\ LDFLAGS_SUFFIX_solaris := $(LIBZ) $(LIBDL) -lc, \
LDFLAGS_SUFFIX_linux:=$(LIBZ) $(LIBDL) -lc -lpthread,\ LDFLAGS_SUFFIX_linux := $(LIBZ) $(LIBDL) -lc -lpthread, \
LDFLAGS_SUFFIX_macosx:=$(LIBZ),\ LDFLAGS_SUFFIX_macosx := $(LIBZ), \
LDFLAGS_SUFFIX_windows:=\ LDFLAGS_SUFFIX_windows := \
-export:JLI_Launch \ -export:JLI_Launch \
-export:JLI_ManifestIterate \ -export:JLI_ManifestIterate \
-export:JLI_SetTraceLauncher \ -export:JLI_SetTraceLauncher \
...@@ -2138,14 +2140,14 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI,\ ...@@ -2138,14 +2140,14 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI,\
-export:JLI_GetStdArgs \ -export:JLI_GetStdArgs \
advapi32.lib \ advapi32.lib \
comctl32.lib \ comctl32.lib \
user32.lib,\ user32.lib, \
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=jli.dll" \ -D "JDK_FNAME=jli.dll" \
-D "JDK_INTERNAL_NAME=jli" \ -D "JDK_INTERNAL_NAME=jli" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBJLI) BUILD_LIBRARIES += $(BUILD_LIBJLI)
...@@ -2153,69 +2155,69 @@ BUILD_LIBRARIES += $(BUILD_LIBJLI) ...@@ -2153,69 +2155,69 @@ BUILD_LIBRARIES += $(BUILD_LIBJLI)
# with the shared library, so the static library is given a different name. No harm # with the shared library, so the static library is given a different name. No harm
# in doing it for all platform to reduce complexity. # in doing it for all platform to reduce complexity.
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
STATIC_LIBRARY:=jli_static,\ STATIC_LIBRARY := jli_static, \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs,\ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
SRC:=$(BUILD_LIBJLI_SRC_DIRS),\ SRC := $(BUILD_LIBJLI_SRC_DIRS), \
INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\ INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=HIGH, \ OPTIMIZATION := HIGH, \
CFLAGS:=$(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS),\ CFLAGS := $(STATIC_LIBRARY_FLAGS) $(LIBJLI_CFLAGS), \
ARFLAGS:=$(ARFLAGS),\ ARFLAGS := $(ARFLAGS), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli_static,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC) BUILD_LIBRARIES += $(BUILD_LIBJLI_STATIC)
else ifeq ($(OPENJDK_TARGET_OS),macosx) else ifeq ($(OPENJDK_TARGET_OS), macosx)
# #
# On macosx they do partial (incremental) linking of libjli_static.a # On macosx they do partial (incremental) linking of libjli_static.a
# code it here...rather than add support to NativeCompilation # code it here...rather than add support to NativeCompilation
# as this is first time I see it # as this is first time I see it
$(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI_STATIC, \
LIBRARY:=jli_static, \ LIBRARY := jli_static, \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs,\ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs, \
SRC:=$(BUILD_LIBJLI_SRC_DIRS),\ SRC := $(BUILD_LIBJLI_SRC_DIRS), \
INCLUDE_FILES:=$(BUILD_LIBJLI_FILES),\ INCLUDE_FILES := $(BUILD_LIBJLI_FILES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=HIGH, \ OPTIMIZATION := HIGH, \
CFLAGS:=$(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS),\ CFLAGS := $(CFLAGS_JDKLIB) $(LIBJLI_CFLAGS), \
LDFLAGS:=-nostdlib -r,\ LDFLAGS := -nostdlib -r, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjli_static,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjli_static, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(JDK_OUTPUTDIR)/objs/libjli_static.a : $(BUILD_LIBJLI_STATIC) $(JDK_OUTPUTDIR)/objs/libjli_static.a: $(BUILD_LIBJLI_STATIC)
$(call install-file) $(call install-file)
BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a BUILD_LIBRARIES += $(JDK_OUTPUTDIR)/objs/libjli_static.a
endif endif
########################################################################################## ##########################################################################################
ifndef OPENJDK ifndef OPENJDK
ifeq ($(ENABLE_JFR), true) ifeq ($(ENABLE_JFR), true)
$(eval $(call SetupNativeCompilation,BUILD_LIBJFR,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJFR, \
LIBRARY:=jfr,\ LIBRARY := jfr, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/closed/share/native/oracle/jfr,\ SRC := $(JDK_TOPDIR)/src/closed/share/native/oracle/jfr, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/closed/share/javavm/export, \ -I$(JDK_TOPDIR)/src/closed/share/javavm/export, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjfr/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjfr/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
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=jfr.dll" \ -D "JDK_FNAME=jfr.dll" \
-D "JDK_INTERNAL_NAME=jfr" \ -D "JDK_INTERNAL_NAME=jfr" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjfr,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjfr, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBJFR) BUILD_LIBRARIES += $(BUILD_LIBJFR)
endif endif
endif endif
...@@ -2224,109 +2226,109 @@ endif ...@@ -2224,109 +2226,109 @@ endif
ifndef OPENJDK ifndef OPENJDK
BUILD_LIBKCMS_EXCLUDE_FILES:= BUILD_LIBKCMS_EXCLUDE_FILES :=
ifeq ($(OPENJDK_TARGET_OS),windows) ifeq ($(OPENJDK_TARGET_OS), windows)
BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c BUILD_LIBKCMS_EXCLUDE_FILES += ukcpmgr.c unixmem.c
else else
BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c BUILD_LIBKCMS_EXCLUDE_FILES += cmmdll.c registry.c spxffile.c sysinfo.c winmem.c wkcpmgr.c
endif endif
BUILD_LIBKCMS_FLAGS:=$(CFLAGS_JDKLIB) BUILD_LIBKCMS_FLAGS := $(CFLAGS_JDKLIB)
ifeq ($(OPENJDK_TARGET_OS),solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
# This particular library uses a feature called PIC_CODE_SMALL (on solaris) # This particular library uses a feature called PIC_CODE_SMALL (on solaris)
# implement it like this...since it's only used here # implement it like this...since it's only used here
BUILD_LIBKCMS_FLAGS:=$(patsubst -KPIC,-Kpic,$(BUILD_LIBKCMS_FLAGS)) BUILD_LIBKCMS_FLAGS := $(patsubst -KPIC, -Kpic, $(BUILD_LIBKCMS_FLAGS))
else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc) else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
BUILD_LIBKCMS_FLAGS:=$(patsubst -fPIC,-fpic,$(BUILD_LIBKCMS_FLAGS)) BUILD_LIBKCMS_FLAGS := $(patsubst -fPIC, -fpic, $(BUILD_LIBKCMS_FLAGS))
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBKCMS,\ $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \
LIBRARY:=kcms,\ LIBRARY := kcms, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms,\ SRC := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms, \
LANG:=C,\ LANG := C, \
EXCLUDE_FILES:=$(BUILD_LIBKCMS_EXCLUDE_FILES),\ EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(BUILD_LIBKCMS_FLAGS) \ CFLAGS := $(BUILD_LIBKCMS_FLAGS) \
-DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST,\ -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \
CFLAGS_linux:=-Wno-missing-field-initializers,\ CFLAGS_linux := -Wno-missing-field-initializers, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libkcms/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libkcms/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_linux:=-lc -lpthread,\ LDFLAGS_SUFFIX_linux := -lc -lpthread, \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
LDFLAGS_SUFFIX_windows:=$(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \ LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
LDFLAGS_SUFFIX_posix:=-lm -ljava -ljvm,\ LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc,\ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc,\ VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/share/native/sun/java2d/cmm/kcms/cmm.rc, \
RC_FLAGS:=$(RC_FLAGS)\ RC_FLAGS := $(RC_FLAGS) \
-D "JDK_FNAME=kcms.dll" \ -D "JDK_FNAME=kcms.dll" \
-D "JDK_INTERNAL_NAME=kcms" \ -D "JDK_INTERNAL_NAME=kcms" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libkcms,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBKCMS) : $(BUILD_LIBJAVA) $(BUILD_LIBKCMS): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBKCMS) BUILD_LIBRARIES += $(BUILD_LIBKCMS)
endif endif
########################################################################################## ##########################################################################################
ifndef OPENJDK ifndef OPENJDK
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
ifneq ($(OPENJDK_TARGET_CPU), x86_64) ifneq ($(OPENJDK_TARGET_CPU), x86_64)
ifeq ($(shell if test "$(OS_VERSION_MAJOR)" -eq 5 -a "$(OS_VERSION_MINOR)" -le 10; then $(ECHO) ok; fi), ok) ifeq ($(shell if test "$(OS_VERSION_MAJOR)" -eq 5 -a "$(OS_VERSION_MINOR)" -le 10; then $(ECHO) ok; fi), ok)
SUNWJDGA_MAPFILE:= SUNWJDGA_MAPFILE :=
ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc) ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
SUNWJDGA_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjdga/mapfile-vers SUNWJDGA_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjdga/mapfile-vers
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \
LIBRARY:=sunwjdga,\ LIBRARY := sunwjdga, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/solaris/native/sun/jdga, \ SRC := $(JDK_TOPDIR)/src/solaris/native/sun/jdga, \
LANG:=C, \ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-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$(OPENWIN_HOME)/include, \ -I$(OPENWIN_HOME)/include, \
MAPFILE:=$(SUNWJDGA_MAPFILE), \ MAPFILE := $(SUNWJDGA_MAPFILE), \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=-L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -ldga -lX11 $(LIBDL) -lc, \ LDFLAGS_SUFFIX := -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -ldga -lX11 $(LIBDL) -lc, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunwjdga,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA) BUILD_LIBRARIES += $(BUILD_LIBSUNWJDGA)
endif endif
endif endif
endif endif
endif endif
########################################################################################## ##########################################################################################
ifeq ($(BUILD_HEADLESS), true) ifeq ($(BUILD_HEADLESS), true)
ifneq ($(OPENJDK_TARGET_OS), windows) ifneq ($(OPENJDK_TARGET_OS), windows)
LIBAWT_HEADLESS_DIRS:=$(JDK_TOPDIR)/src/share/native/sun/font \ LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/share/native/sun/font \
$(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \ $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
$(JDK_TOPDIR)/src/solaris/native/sun/font \ $(JDK_TOPDIR)/src/solaris/native/sun/font \
$(JDK_TOPDIR)/src/solaris/native/sun/awt \ $(JDK_TOPDIR)/src/solaris/native/sun/awt \
$(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \ $(JDK_TOPDIR)/src/solaris/native/sun/java2d/opengl \
$(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11 $(JDK_TOPDIR)/src/solaris/native/sun/java2d/x11
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBAWT_HEADLESS_DIRS+=$(JDK_TOPDIR)/src/macosx/native/sun/font LIBAWT_HEADLESS_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/font
endif endif
LIBAWT_HEADLESS_CFLAGS:=-DHEADLESS=true \ LIBAWT_HEADLESS_CFLAGS := -DHEADLESS=true \
-DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \ -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" \
$(CUPS_CFLAGS) \ $(CUPS_CFLAGS) \
$(X_CFLAGS) \ $(X_CFLAGS) \
...@@ -2338,15 +2340,15 @@ LIBAWT_HEADLESS_CFLAGS:=-DHEADLESS=true \ ...@@ -2338,15 +2340,15 @@ LIBAWT_HEADLESS_CFLAGS:=-DHEADLESS=true \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \ -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
$(foreach dir,$(LIBAWT_HEADLESS_DIRS),-I$(dir)) $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBAWT_HEADLESS_CFLAGS+=\ LIBAWT_HEADLESS_CFLAGS += \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
endif endif
LIBAWT_HEADLESS_FILES:=\ LIBAWT_HEADLESS_FILES := \
awt_Font.c \ awt_Font.c \
HeadlessToolkit.c \ HeadlessToolkit.c \
fontpath.c \ fontpath.c \
...@@ -2374,150 +2376,150 @@ LIBAWT_HEADLESS_FILES:=\ ...@@ -2374,150 +2376,150 @@ LIBAWT_HEADLESS_FILES:=\
AccelGlyphCache.c \ AccelGlyphCache.c \
CUPSfuncs.c CUPSfuncs.c
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBAWT_HEADLESS_FILES+=\ LIBAWT_HEADLESS_FILES += \
AWTFont.m \ AWTFont.m \
AWTStrike.m \ AWTStrike.m \
CCharToGlyphMapper.m \ CCharToGlyphMapper.m \
CGGlyphImages.m \ CGGlyphImages.m \
CGGlyphOutlines.m \ CGGlyphOutlines.m \
CoreTextSupport.m CoreTextSupport.m
endif endif
LIBAWT_HEADLESS_REORDER:= LIBAWT_HEADLESS_REORDER :=
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
ifneq ($(OPENJDK_TARGET_CPU), x86_64) ifneq ($(OPENJDK_TARGET_CPU), x86_64)
LIBAWT_HEADLESS_REORDER:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU) LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
endif
endif endif
endif
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS,\ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_HEADLESS, \
LIBRARY:=awt_headless,\ LIBRARY := awt_headless, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBAWT_HEADLESS_DIRS),\ SRC := $(LIBAWT_HEADLESS_DIRS), \
INCLUDE_FILES:=$(LIBAWT_HEADLESS_FILES),\ INCLUDE_FILES := $(LIBAWT_HEADLESS_FILES), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS),\ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_HEADLESS_CFLAGS), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/mapfile-vers,\ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libawt_headless/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_linux:=$(call SET_SHARED_LIBRARY_ORIGIN,/..),\ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
LDFLAGS_solaris:=$(call SET_SHARED_LIBRARY_ORIGIN,/..) \ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/..) \
-R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \ -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
-R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR),\ -R$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR), \
LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN).,\ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN)., \
REORDER:=$(LIBAWT_HEADLESS_REORDER), \ REORDER := $(LIBAWT_HEADLESS_REORDER), \
LDFLAGS_SUFFIX_linux:=-ljvm -lawt -lm $(LIBDL) -ljava,\ LDFLAGS_SUFFIX_linux := -ljvm -lawt -lm $(LIBDL) -ljava, \
LDFLAGS_SUFFIX_solaris:=$(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc,\ LDFLAGS_SUFFIX_solaris := $(LIBDL) -ljvm -lawt -lm -ljava $(LIBCXX) -lc, \
LDFLAGS_SUFFIX_macosx:=-ljvm $(LIBCXX) -lawt $(LIBDL) -ljava \ LDFLAGS_SUFFIX_macosx := -ljvm $(LIBCXX) -lawt $(LIBDL) -ljava \
-framework Accelerate \ -framework Accelerate \
-framework ApplicationServices \ -framework ApplicationServices \
-framework Cocoa \ -framework Cocoa \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
-framework JavaRuntimeSupport,\ -framework JavaRuntimeSupport, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_headless,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_headless, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBAWT_HEADLESS) : $(BUILD_LIBAWT) $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT)
BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS) BUILD_LIBRARIES += $(BUILD_LIBAWT_HEADLESS)
endif endif
endif endif
########################################################################################## ##########################################################################################
ifndef BUILD_HEADLESS_ONLY ifndef BUILD_HEADLESS_ONLY
LIBSPLASHSCREEN_DIRS:=\ LIBSPLASHSCREEN_DIRS := \
$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \
$(JDK_TOPDIR)/src/share/native/sun/awt/libpng \ $(JDK_TOPDIR)/src/share/native/sun/awt/libpng \
$(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen
ifeq ($(USE_EXTERNAL_LIBGIF),true) ifeq ($(USE_EXTERNAL_LIBGIF), true)
GIFLIB_LDFLAGS := -lgif GIFLIB_LDFLAGS := -lgif
else else
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/sun/awt/giflib
GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib GIFLIB_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/giflib
endif endif
ifneq ($(OPENJDK_TARGET_OS), macosx) ifneq ($(OPENJDK_TARGET_OS), macosx)
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen
else else
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen
endif endif
LIBSPLASHSCREEN_CFLAGS:=-DSPLASHSCREEN -DPNG_NO_MMX_CODE \ LIBSPLASHSCREEN_CFLAGS := -DSPLASHSCREEN -DPNG_NO_MMX_CODE \
$(foreach dir,$(LIBSPLASHSCREEN_DIRS),-I$(dir)) $(foreach dir, $(LIBSPLASHSCREEN_DIRS), -I$(dir))
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBSPLASHSCREEN_CFLAGS:=-I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \ LIBSPLASHSCREEN_CFLAGS := -I$(JDK_TOPDIR)/src/macosx/native/sun/awt/splashscreen \
$(LIBSPLASHSCREEN_CFLAGS) \ $(LIBSPLASHSCREEN_CFLAGS) \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks -F/System/Library/Frameworks/JavaVM.framework/Frameworks
LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp
LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS:=-x objective-c -O0 LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS:=-x objective-c -O0 LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS:=-x objective-c -O0 LIBSPLASHSCREEN_splashscreen_gif.c_CFLAGS := -x objective-c -O0
LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS:=-x objective-c -O0 LIBSPLASHSCREEN_splashscreen_impl.c_CFLAGS := -x objective-c -O0
LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS:=-x objective-c -O0 LIBSPLASHSCREEN_splashscreen_jpeg.c_CFLAGS := -x objective-c -O0
LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS:=-x objective-c -O0 LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS:=-O0 LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
else ifneq ($(OPENJDK_TARGET_OS), windows) else ifneq ($(OPENJDK_TARGET_OS), windows)
LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
else else
LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32 LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
endif endif
LIBSPLASHSCREEN_LDFLAGS_SUFFIX:= LIBSPLASHSCREEN_LDFLAGS_SUFFIX :=
ifneq ($(USE_EXTERNAL_LIBZ),true) ifneq ($(USE_EXTERNAL_LIBZ), true)
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5 LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS) LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
endif endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(LIBM) -lpthread -liconv -losxapp \
-framework ApplicationServices \ -framework ApplicationServices \
-framework Foundation \ -framework Foundation \
-framework Cocoa \ -framework Cocoa \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation -framework JavaNativeFoundation
else ifneq ($(OPENJDK_TARGET_OS), windows) else ifneq ($(OPENJDK_TARGET_OS), windows)
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
else # OPENJDK_TARGET_OS else # OPENJDK_TARGET_OS
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
endif # OPENJDK_TARGET_OS endif # OPENJDK_TARGET_OS
$(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN,\ $(eval $(call SetupNativeCompilation,LIBSPLASHSCREEN, \
LIBRARY:=splashscreen,\ LIBRARY := splashscreen, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBSPLASHSCREEN_DIRS),\ SRC := $(LIBSPLASHSCREEN_DIRS), \
EXCLUDE_FILES:=imageioJPEG.c jpegdecoder.c pngtest.c,\ EXCLUDE_FILES := imageioJPEG.c jpegdecoder.c pngtest.c, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(GIFLIB_CFLAGS),\ CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) $(GIFLIB_CFLAGS), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsplashscreen/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=$(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS),\ LDFLAGS_SUFFIX := $(LIBSPLASHSCREEN_LDFLAGS_SUFFIX) $(LIBZ) $(GIFLIB_LDFLAGS), \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
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=splashscreen.dll" \ -D "JDK_FNAME=splashscreen.dll" \
-D "JDK_INTERNAL_NAME=splashscreen" \ -D "JDK_INTERNAL_NAME=splashscreen" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsplashscreen,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsplashscreen, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(LIBSPLASHSCREEN) BUILD_LIBRARIES += $(LIBSPLASHSCREEN)
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
$(LIBSPLASHSCREEN) : $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX) $(LIBSPLASHSCREEN): $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)osxapp$(SHARED_LIBRARY_SUFFIX)
endif endif
endif endif
...@@ -2525,132 +2527,132 @@ endif ...@@ -2525,132 +2527,132 @@ endif
ifndef OPENJDK ifndef OPENJDK
LIBDCPR_SRC_DIRS:=\ LIBDCPR_SRC_DIRS := \
$(JDK_TOPDIR)/src/closed/share/native/sun/dc/doe \ $(JDK_TOPDIR)/src/closed/share/native/sun/dc/doe \
$(JDK_TOPDIR)/src/closed/share/native/sun/dc/path \ $(JDK_TOPDIR)/src/closed/share/native/sun/dc/path \
$(JDK_TOPDIR)/src/closed/share/native/sun/dc/pr \ $(JDK_TOPDIR)/src/closed/share/native/sun/dc/pr \
$(JDK_TOPDIR)/src/closed/share/native/sun/dc/util $(JDK_TOPDIR)/src/closed/share/native/sun/dc/util
LIBDCPR_CFLAGS:=$(foreach dir,$(LIBDCPR_SRC_DIRS),-I$(dir)) \ LIBDCPR_CFLAGS := $(foreach dir, $(LIBDCPR_SRC_DIRS), -I$(dir)) \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe
$(eval $(call SetupNativeCompilation,BUILD_LIBDCPR,\ $(eval $(call SetupNativeCompilation,BUILD_LIBDCPR, \
LIBRARY:=dcpr,\ LIBRARY := dcpr, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBDCPR_SRC_DIRS),\ SRC := $(LIBDCPR_SRC_DIRS), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(LIBDCPR_CFLAGS), \ $(LIBDCPR_CFLAGS), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libdcpr/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libdcpr/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=$(LIBM) $(LDFLAGS_JDKLIB_SUFFIX),\ LDFLAGS_SUFFIX := $(LIBM) $(LDFLAGS_JDKLIB_SUFFIX), \
LDFLAGS_SUFFIX_posix:=-lm,\ LDFLAGS_SUFFIX_posix := -lm, \
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=dcpr.dll" \ -D "JDK_FNAME=dcpr.dll" \
-D "JDK_INTERNAL_NAME=dcpr" \ -D "JDK_INTERNAL_NAME=dcpr" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libdcpr,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdcpr, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBDCPR) : $(BUILD_LIBJAVA) $(BUILD_LIBDCPR): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBDCPR) BUILD_LIBRARIES += $(BUILD_LIBDCPR)
endif endif
########################################################################################## ##########################################################################################
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \
LIBRARY:=j2pcsc,\ LIBRARY := j2pcsc, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio,\ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio, \
LANG:=C,\ LANG := C, \
CFLAGS_posix:=-D__sun_jdk,\ CFLAGS_posix := -D__sun_jdk, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \ -I$(JDK_TOPDIR)/src/share/native/sun/security/smartcardio \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio\ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio/MUSCLE,\ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/smartcardio/MUSCLE, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2pcsc/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pcsc/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_posix:=$(LIBDL), \ LDFLAGS_SUFFIX_posix := $(LIBDL), \
LDFLAGS_SUFFIX_windows:=winscard.lib,\ LDFLAGS_SUFFIX_windows := winscard.lib, \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
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=j2pcsc.dll" \ -D "JDK_FNAME=j2pcsc.dll" \
-D "JDK_INTERNAL_NAME=j2pcsc" \ -D "JDK_INTERNAL_NAME=j2pcsc" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2pcsc,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pcsc, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC) BUILD_LIBRARIES += $(BUILD_LIBJ2PCSC)
########################################################################################## ##########################################################################################
ifneq ($(OPENJDK_TARGET_OS), windows) ifneq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS, \
LIBRARY:=j2gss,\ LIBRARY := j2gss, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper,\ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \ -I$(JDK_TOPDIR)/src/share/native/sun/security/jgss/wrapper \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper,\ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/jgss/wrapper, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2gss/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=$(LIBDL),\ LDFLAGS_SUFFIX := $(LIBDL), \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2gss,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2gss, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBJ2GSS) BUILD_LIBRARIES += $(BUILD_LIBJ2GSS)
endif endif
########################################################################################## ##########################################################################################
ifneq ($(BUILD_CRYPTO),no) ifneq ($(BUILD_CRYPTO), no)
BUILD_LIBKRB5_NAME:= BUILD_LIBKRB5_NAME :=
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
BUILD_LIBKRB5_NAME:=w2k_lsa_auth BUILD_LIBKRB5_NAME := w2k_lsa_auth
BUILD_LIBKRB5_SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5 BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5
BUILD_LIBKRB5_LIBS:=advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \ BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \ gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
else ifeq ($(OPENJDK_TARGET_OS), macosx) else ifeq ($(OPENJDK_TARGET_OS), macosx)
BUILD_LIBKRB5_NAME:=osxkrb5 BUILD_LIBKRB5_NAME := osxkrb5
BUILD_LIBKRB5_SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/krb5 BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/share/native/sun/security/krb5
BUILD_LIBKRB5_LIBS:=-framework Kerberos BUILD_LIBKRB5_LIBS := -framework Kerberos
endif endif
ifneq ($(BUILD_LIBKRB5_NAME),) ifneq ($(BUILD_LIBKRB5_NAME), )
$(eval $(call SetupNativeCompilation,BUILD_LIBKRB5,\ $(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \
LIBRARY:=$(BUILD_LIBKRB5_NAME),\ LIBRARY := $(BUILD_LIBKRB5_NAME), \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(BUILD_LIBKRB5_SRC),\ SRC := $(BUILD_LIBKRB5_SRC), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/native/sun/security/krb5 \ -I$(JDK_TOPDIR)/src/share/native/sun/security/krb5 \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5 ,\ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/krb5, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=$(BUILD_LIBKRB5_LIBS) ,\ LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
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=$(BUILD_LIBKRB5_NAME).dll" \ -D "JDK_FNAME=$(BUILD_LIBKRB5_NAME).dll" \
-D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \ -D "JDK_INTERNAL_NAME=$(BUILD_LIBKRB5_NAME)" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libkrb5,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkrb5, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBKRB5) BUILD_LIBRARIES += $(BUILD_LIBKRB5)
endif endif
...@@ -2660,120 +2662,120 @@ endif ...@@ -2660,120 +2662,120 @@ endif
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
$(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI,\ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI, \
LIBRARY:=sunmscapi,\ LIBRARY := sunmscapi, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi,\ SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
LANG:=C++,\ LANG := C++, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi ,\ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/mscapi, \
LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=Crypt32.Lib advapi32.lib,\ LDFLAGS_SUFFIX := Crypt32.Lib advapi32.lib, \
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=sunmscapi.dll" \ -D "JDK_FNAME=sunmscapi.dll" \
-D "JDK_INTERNAL_NAME=sunmscapi" \ -D "JDK_INTERNAL_NAME=sunmscapi" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunmscapi,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunmscapi, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBSUNMSCAPI) BUILD_LIBRARIES += $(BUILD_LIBSUNMSCAPI)
endif endif
########################################################################################## ##########################################################################################
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \
LIBRARY:=j2pkcs11,\ LIBRARY := j2pkcs11, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \ $(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper,\ $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \ -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11 \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11 \
-I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \ -I$(JDK_TOPDIR)/src/share/native/sun/security/pkcs11/wrapper \
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper,\ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/security/pkcs11/wrapper, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2pkcs11/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2pkcs11/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) \ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_posix:=$(LIBDL),\ LDFLAGS_SUFFIX_posix := $(LIBDL), \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
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=j2pkcs11.dll" \ -D "JDK_FNAME=j2pkcs11.dll" \
-D "JDK_INTERNAL_NAME=j2pkcs11" \ -D "JDK_INTERNAL_NAME=j2pkcs11" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2pkcs11,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2pkcs11, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11) BUILD_LIBRARIES += $(BUILD_LIBJ2PKCS11)
########################################################################################## ##########################################################################################
ifeq ($(ENABLE_INTREE_EC),yes) ifeq ($(ENABLE_INTREE_EC), yes)
BUILD_LIBSUNEC_FLAGS:= -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \ BUILD_LIBSUNEC_FLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/security/ec \
-I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl -I$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl
# #
# On sol-sparc...all libraries are compiled with -xregs=no%appl # On sol-sparc...all libraries are compiled with -xregs=no%appl
# (set in CFLAGS_REQUIRED_sparc) # (set in CFLAGS_REQUIRED_sparc)
# #
# except!!! libsunec.so # except!!! libsunec.so
# #
ECC_JNI_SOLSPARC_FILTER:= ECC_JNI_SOLSPARC_FILTER :=
ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc) ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
ECC_JNI_SOLSPARC_FILTER:=-xregs=no%appl ECC_JNI_SOLSPARC_FILTER := -xregs=no%appl
endif endif
$(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC,\ $(eval $(call SetupNativeCompilation,BUILD_LIBSUNEC, \
LIBRARY:=sunec,\ LIBRARY := sunec, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/share/native/sun/security/ec \ SRC := $(JDK_TOPDIR)/src/share/native/sun/security/ec \
$(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \ $(JDK_TOPDIR)/src/share/native/sun/security/ec/impl, \
LANG:=C++, \ LANG := C++, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB))\ CFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CFLAGS_JDKLIB)) \
$(BUILD_LIBSUNEC_FLAGS) \ $(BUILD_LIBSUNEC_FLAGS) \
-DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B,\ -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B, \
CXXFLAGS:=$(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \ CXXFLAGS := $(filter-out $(ECC_JNI_SOLSPARC_FILTER), $(CXXFLAGS_JDKLIB)) \
$(BUILD_LIBSUNEC_FLAGS),\ $(BUILD_LIBSUNEC_FLAGS), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libsunec/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libsunec/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK),\ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_ORIGIN),\ LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=$(LIBCXX),\ LDFLAGS_SUFFIX := $(LIBCXX), \
LDFLAGS_SUFFIX_linux:=-lc ,\ LDFLAGS_SUFFIX_linux := -lc, \
LDFLAGS_SUFFIX_solaris:=-lc ,\ LDFLAGS_SUFFIX_solaris := -lc, \
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=sunec.dll" \ -D "JDK_FNAME=sunec.dll" \
-D "JDK_INTERNAL_NAME=sunec" \ -D "JDK_INTERNAL_NAME=sunec" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libsunec,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunec, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBSUNEC) BUILD_LIBRARIES += $(BUILD_LIBSUNEC)
endif endif
########################################################################################## ##########################################################################################
LIBJSOUND_SRC_DIRS:=\ LIBJSOUND_SRC_DIRS := \
$(JDK_TOPDIR)/src/share/native/com/sun/media/sound \ $(JDK_TOPDIR)/src/share/native/com/sun/media/sound \
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/media/sound $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/com/sun/media/sound
LIBJSOUND_SRC_FILES:=Utilities.c Platform.c LIBJSOUND_SRC_FILES := Utilities.c Platform.c
LIBJSOUND_LANG:=C LIBJSOUND_LANG := C
LIBJSOUND_CFLAGS:=$(foreach dir,$(LIBJSOUND_SRC_DIRS),-I$(dir)) LIBJSOUND_CFLAGS := $(foreach dir, $(LIBJSOUND_SRC_DIRS), -I$(dir))
EXTRA_SOUND_JNI_LIBS:= EXTRA_SOUND_JNI_LIBS :=
LIBJSOUND_MIDIFILES:=\ LIBJSOUND_MIDIFILES := \
MidiInDevice.c \ MidiInDevice.c \
MidiInDeviceProvider.c \ MidiInDeviceProvider.c \
MidiOutDevice.c \ MidiOutDevice.c \
...@@ -2781,12 +2783,12 @@ LIBJSOUND_MIDIFILES:=\ ...@@ -2781,12 +2783,12 @@ LIBJSOUND_MIDIFILES:=\
PlatformMidi.c PlatformMidi.c
# files needed for ports # files needed for ports
LIBJSOUND_PORTFILES:=\ LIBJSOUND_PORTFILES := \
PortMixerProvider.c \ PortMixerProvider.c \
PortMixer.c PortMixer.c
# files needed for direct audio # files needed for direct audio
LIBJSOUND_DAUDIOFILES:=\ LIBJSOUND_DAUDIOFILES := \
DirectAudioDeviceProvider.c \ DirectAudioDeviceProvider.c \
DirectAudioDevice.c DirectAudioDevice.c
...@@ -2811,7 +2813,7 @@ ifeq ($(OPENJDK_TARGET_OS), linux) ...@@ -2811,7 +2813,7 @@ ifeq ($(OPENJDK_TARGET_OS), linux)
endif # OPENJDK_TARGET_OS linux endif # OPENJDK_TARGET_OS linux
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBJSOUND_LANG:=C++ LIBJSOUND_LANG := C++
LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \ LIBJSOUND_CFLAGS += -DX_PLATFORM=X_MACOSX \
-DUSE_PORTS=TRUE \ -DUSE_PORTS=TRUE \
-DUSE_DAUDIO=TRUE \ -DUSE_DAUDIO=TRUE \
...@@ -2874,46 +2876,46 @@ endif ...@@ -2874,46 +2876,46 @@ endif
LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"' LIBJSOUND_CFLAGS += -DEXTRA_SOUND_JNI_LIBS='"$(EXTRA_SOUND_JNI_LIBS)"'
$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
LIBRARY:=jsound,\ LIBRARY := jsound, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBJSOUND_SRC_DIRS),\ SRC := $(LIBJSOUND_SRC_DIRS), \
INCLUDE_FILES:=$(LIBJSOUND_SRC_FILES),\ INCLUDE_FILES := $(LIBJSOUND_SRC_FILES), \
LANG:=$(LIBJSOUND_LANG),\ LANG := $(LIBJSOUND_LANG), \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(LIBJSOUND_CFLAGS), \ $(LIBJSOUND_CFLAGS), \
CXXFLAGS:=$(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjsound/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsound/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB)\ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_macosx:=-framework CoreAudio -framework CoreFoundation \ LDFLAGS_macosx := -framework CoreAudio -framework CoreFoundation \
-framework CoreServices -framework AudioUnit $(LIBCXX) \ -framework CoreServices -framework AudioUnit $(LIBCXX) \
-framework CoreMIDI -framework AudioToolbox,\ -framework CoreMIDI -framework AudioToolbox, \
LDFLAGS_windows:=$(WIN_JAVA_LIB) advapi32.lib winmm.lib,\ LDFLAGS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \
LDFLAGS_SUFFIX_posix:=-ljava -ljvm,\ LDFLAGS_SUFFIX_posix := -ljava -ljvm, \
LDFLAGS_SUFFIX_solaris:=-lc ,\ LDFLAGS_SUFFIX_solaris := -lc, \
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=jsound.dll" \ -D "JDK_FNAME=jsound.dll" \
-D "JDK_INTERNAL_NAME=jsound" \ -D "JDK_INTERNAL_NAME=jsound" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsound,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsound, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBJSOUND) : $(BUILD_LIBJAVA) $(BUILD_LIBJSOUND): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBJSOUND) BUILD_LIBRARIES += $(BUILD_LIBJSOUND)
########################################################################################## ##########################################################################################
ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)),) ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), )
$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA, \
LIBRARY:=jsoundalsa,\ LIBRARY := jsoundalsa, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBJSOUND_SRC_DIRS),\ SRC := $(LIBJSOUND_SRC_DIRS), \
INCLUDE_FILES:=Utilities.c $(LIBJSOUND_MIDIFILES) $(LIBJSOUND_PORTFILES) \ INCLUDE_FILES := Utilities.c $(LIBJSOUND_MIDIFILES) $(LIBJSOUND_PORTFILES) \
$(LIBJSOUND_DAUDIOFILES) \ $(LIBJSOUND_DAUDIOFILES) \
PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \
PLATFORM_API_LinuxOS_ALSA_PCM.c \ PLATFORM_API_LinuxOS_ALSA_PCM.c \
...@@ -2921,114 +2923,114 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA,\ ...@@ -2921,114 +2923,114 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDALSA,\
PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ PLATFORM_API_LinuxOS_ALSA_MidiIn.c \
PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ PLATFORM_API_LinuxOS_ALSA_MidiOut.c \
PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
PLATFORM_API_LinuxOS_ALSA_Ports.c,\ PLATFORM_API_LinuxOS_ALSA_Ports.c, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) $(ALSA_CFLAGS) \ CFLAGS := $(CFLAGS_JDKLIB) $(ALSA_CFLAGS) \
$(LIBJSOUND_CFLAGS) \ $(LIBJSOUND_CFLAGS) \
-DUSE_DAUDIO=TRUE \ -DUSE_DAUDIO=TRUE \
-DUSE_PORTS=TRUE \ -DUSE_PORTS=TRUE \
-DUSE_PLATFORM_MIDI_OUT=TRUE \ -DUSE_PLATFORM_MIDI_OUT=TRUE \
-DUSE_PLATFORM_MIDI_IN=TRUE, \ -DUSE_PLATFORM_MIDI_IN=TRUE, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libjsoundalsa/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB)\ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=$(ALSA_LIBS) -ljava -ljvm,\ LDFLAGS_SUFFIX := $(ALSA_LIBS) -ljava -ljvm, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsoundalsa,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundalsa, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBJSOUNDALSA) : $(BUILD_LIBJAVA) $(BUILD_LIBJSOUNDALSA): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBJSOUNDALSA) BUILD_LIBRARIES += $(BUILD_LIBJSOUNDALSA)
endif endif
########################################################################################## ##########################################################################################
ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)),) ifneq ($(filter jsoundds, $(EXTRA_SOUND_JNI_LIBS)), )
$(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDDS,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUNDDS, \
LIBRARY:=jsoundds,\ LIBRARY := jsoundds, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBJSOUND_SRC_DIRS),\ SRC := $(LIBJSOUND_SRC_DIRS), \
INCLUDE_FILES:=Utilities.c $(LIBJSOUND_DAUDIOFILES) \ INCLUDE_FILES := Utilities.c $(LIBJSOUND_DAUDIOFILES) \
PLATFORM_API_WinOS_DirectSound.cpp, \ PLATFORM_API_WinOS_DirectSound.cpp, \
LANG:=C++,\ LANG := C++, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(LIBJSOUND_CFLAGS) \ $(LIBJSOUND_CFLAGS) \
-DUSE_DAUDIO=TRUE, \ -DUSE_DAUDIO=TRUE, \
LDFLAGS:=$(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_ORIGIN),\ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib,\ LDFLAGS_SUFFIX := $(LDFLAGS_JDKLIB_SUFFIX) dsound.lib winmm.lib user32.lib ole32.lib, \
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=jsoundds.dll" \ -D "JDK_FNAME=jsoundds.dll" \
-D "JDK_INTERNAL_NAME=jsoundds" \ -D "JDK_INTERNAL_NAME=jsoundds" \
-D "JDK_FTYPE=0x2L",\ -D "JDK_FTYPE=0x2L", \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjsoundds,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjsoundds, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBJSOUNDDS) : $(BUILD_LIBJAVA) $(BUILD_LIBJSOUNDDS): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBJSOUNDDS) BUILD_LIBRARIES += $(BUILD_LIBJSOUNDDS)
endif endif
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
ifndef OPENJDK ifndef OPENJDK
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2UCRYPTO,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2UCRYPTO, \
LIBRARY:=j2ucrypto,\ LIBRARY := j2ucrypto, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto,\ SRC := $(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto ,\ -I$(JDK_TOPDIR)/src/closed/solaris/native/com/oracle/security/ucrypto, \
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libj2ucrypto/mapfile-vers, \ MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libj2ucrypto/mapfile-vers, \
LDFLAGS:=$(LDFLAGS_JDKLIB),\ LDFLAGS := $(LDFLAGS_JDKLIB), \
LDFLAGS_SUFFIX:=$(LIBDL),\ LDFLAGS_SUFFIX := $(LIBDL), \
LDFLAGS_SUFFIX_solaris:=-lc,\ LDFLAGS_SUFFIX_solaris := -lc, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libj2ucrypto,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libj2ucrypto, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBJ2UCRYPTO) : $(BUILD_LIBJAVA) $(BUILD_LIBJ2UCRYPTO): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBJ2UCRYPTO) BUILD_LIBRARIES += $(BUILD_LIBJ2UCRYPTO)
endif endif
endif endif
########################################################################################## ##########################################################################################
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
$(eval $(call SetupNativeCompilation,BUILD_LIBAPPLESCRIPTENGINE,\ $(eval $(call SetupNativeCompilation,BUILD_LIBAPPLESCRIPTENGINE, \
LIBRARY:=AppleScriptEngine,\ LIBRARY := AppleScriptEngine, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/macosx/native/apple/applescript,\ SRC := $(JDK_TOPDIR)/src/macosx/native/apple/applescript, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/macosx/native/apple/applescript \ -I$(JDK_TOPDIR)/src/macosx/native/apple/applescript \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
LDFLAGS:=$(LDFLAGS_JDKLIB)\ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=-framework Cocoa \ LDFLAGS_SUFFIX := -framework Cocoa \
-framework Carbon \ -framework Carbon \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
$(LDFLAGS_JDKLIB_SUFFIX),\ $(LDFLAGS_JDKLIB_SUFFIX), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libAppleScriptEngine,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libAppleScriptEngine, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(BUILD_LIBAPPLESCRIPTENGINE) : $(BUILD_LIBJAVA) $(BUILD_LIBAPPLESCRIPTENGINE): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBAPPLESCRIPTENGINE) BUILD_LIBRARIES += $(BUILD_LIBAPPLESCRIPTENGINE)
endif endif
...@@ -3036,20 +3038,20 @@ endif ...@@ -3036,20 +3038,20 @@ endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
$(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP,\ $(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP, \
LIBRARY:=osxapp,\ LIBRARY := osxapp, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/macosx/native/sun/osxapp,\ SRC := $(JDK_TOPDIR)/src/macosx/native/sun/osxapp, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
-I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp \ -I$(JDK_OUTPUTDIR)/gensrc/sun/osxapp \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks,\ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
LDFLAGS:=$(LDFLAGS_JDKLIB)\ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_macosx:=\ LDFLAGS_SUFFIX_macosx := \
-framework Accelerate \ -framework Accelerate \
-framework ApplicationServices \ -framework ApplicationServices \
-framework AudioToolbox \ -framework AudioToolbox \
...@@ -3063,10 +3065,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP,\ ...@@ -3063,10 +3065,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP,\
-framework OpenGL \ -framework OpenGL \
-framework IOSurface \ -framework IOSurface \
-framework QuartzCore, \ -framework QuartzCore, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosxapp,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxapp, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBOSXAPP) BUILD_LIBRARIES += $(BUILD_LIBOSXAPP)
endif endif
...@@ -3074,27 +3076,27 @@ endif ...@@ -3074,27 +3076,27 @@ endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBOSX_DIRS:=\ LIBOSX_DIRS := \
$(JDK_TOPDIR)/src/macosx/native/com/apple/concurrent \ $(JDK_TOPDIR)/src/macosx/native/com/apple/concurrent \
$(JDK_TOPDIR)/src/macosx/native/java/util \ $(JDK_TOPDIR)/src/macosx/native/java/util \
$(JDK_TOPDIR)/src/macosx/native/com/apple/eio \ $(JDK_TOPDIR)/src/macosx/native/com/apple/eio \
$(JDK_TOPDIR)/src/macosx/native/apple/security \ $(JDK_TOPDIR)/src/macosx/native/apple/security \
$(JDK_TOPDIR)/src/macosx/native/apple/launcher $(JDK_TOPDIR)/src/macosx/native/apple/launcher
$(eval $(call SetupNativeCompilation,BUILD_LIBOSX,\ $(eval $(call SetupNativeCompilation,BUILD_LIBOSX, \
LIBRARY:=osx,\ LIBRARY := osx, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBOSX_DIRS),\ SRC := $(LIBOSX_DIRS), \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(foreach dir,$(LIBOSX_DIRS),-I$(dir)) \ $(foreach dir, $(LIBOSX_DIRS), -I$(dir)) \
-I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks,\ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
LDFLAGS:=$(LDFLAGS_JDKLIB)\ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_macosx:=\ LDFLAGS_SUFFIX_macosx := \
-losxapp \ -losxapp \
-framework Cocoa \ -framework Cocoa \
-framework ApplicationServices \ -framework ApplicationServices \
...@@ -3104,14 +3106,14 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBOSX,\ ...@@ -3104,14 +3106,14 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBOSX,\
-framework Security \ -framework Security \
-framework SystemConfiguration \ -framework SystemConfiguration \
$(LDFLAGS_JDKLIB_SUFFIX), \ $(LDFLAGS_JDKLIB_SUFFIX), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosx,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosx, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBOSX) BUILD_LIBRARIES += $(BUILD_LIBOSX)
$(BUILD_LIBOSX) : $(BUILD_LIBOSXAPP) $(BUILD_LIBOSX): $(BUILD_LIBOSXAPP)
$(BUILD_LIBOSX) : $(BUILD_LIBJAVA) $(BUILD_LIBOSX): $(BUILD_LIBJAVA)
endif endif
...@@ -3119,7 +3121,7 @@ endif ...@@ -3119,7 +3121,7 @@ endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBAWT_LWAWT_FILES:=\ LIBAWT_LWAWT_FILES := \
awt.m \ awt.m \
ApplicationDelegate.m \ ApplicationDelegate.m \
CFRetainedResource.m \ CFRetainedResource.m \
...@@ -3194,7 +3196,7 @@ LIBAWT_LWAWT_FILES:=\ ...@@ -3194,7 +3196,7 @@ LIBAWT_LWAWT_FILES:=\
CUPSfuncs.c CUPSfuncs.c
LIBAWT_LWAWT_DIRS:=\ LIBAWT_LWAWT_DIRS := \
$(JDK_TOPDIR)/src/macosx/native/sun/awt \ $(JDK_TOPDIR)/src/macosx/native/sun/awt \
$(JDK_TOPDIR)/src/macosx/native/sun/font \ $(JDK_TOPDIR)/src/macosx/native/sun/font \
$(JDK_TOPDIR)/src/macosx/native/sun/java2d/opengl \ $(JDK_TOPDIR)/src/macosx/native/sun/java2d/opengl \
...@@ -3202,17 +3204,17 @@ LIBAWT_LWAWT_DIRS:=\ ...@@ -3202,17 +3204,17 @@ LIBAWT_LWAWT_DIRS:=\
$(JDK_TOPDIR)/src/share/native/sun/font \ $(JDK_TOPDIR)/src/share/native/sun/font \
$(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \ $(JDK_TOPDIR)/src/share/native/sun/java2d/opengl \
$(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT,\ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
LIBRARY:=awt_lwawt,\ LIBRARY := awt_lwawt, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(LIBAWT_LWAWT_DIRS),\ SRC := $(LIBAWT_LWAWT_DIRS), \
LANG:=C,\ LANG := C, \
INCLUDE_FILES:=$(LIBAWT_LWAWT_FILES),\ INCLUDE_FILES := $(LIBAWT_LWAWT_FILES), \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
$(X_CFLAGS) \ $(X_CFLAGS) \
$(X_LIBS) \ $(X_LIBS) \
$(foreach dir,$(LIBAWT_LWAWT_DIRS),-I$(dir)) \ $(foreach dir, $(LIBAWT_LWAWT_DIRS), -I$(dir)) \
-I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
-I$(JDK_TOPDIR)/src/share/native/sun/java2d \ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
-I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \ -I$(JDK_TOPDIR)/src/solaris/native/sun/java2d \
...@@ -3222,10 +3224,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT,\ ...@@ -3222,10 +3224,10 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT,\
-I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \ -I$(JDK_TOPDIR)/src/share/native/sun/java2d/pipe \
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \ -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks,\ -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks, \
LDFLAGS:=$(LDFLAGS_JDKLIB)\ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_macosx:=-lawt -lmlib_image -losxapp -ljvm $(LIBM) \ LDFLAGS_SUFFIX_macosx := -lawt -lmlib_image -losxapp -ljvm $(LIBM) \
-framework Accelerate \ -framework Accelerate \
-framework ApplicationServices \ -framework ApplicationServices \
-framework AudioToolbox \ -framework AudioToolbox \
...@@ -3237,19 +3239,19 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT,\ ...@@ -3237,19 +3239,19 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT,\
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
-framework JavaRuntimeSupport \ -framework JavaRuntimeSupport \
-framework OpenGL \ -framework OpenGL \
-framework QuartzCore -ljava,\ -framework QuartzCore -ljava, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libawt_lwawt,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libawt_lwawt, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT) BUILD_LIBRARIES += $(BUILD_LIBAWT_LWAWT)
$(BUILD_LIBAWT_LWAWT) : $(BUILD_LIBAWT) $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBAWT)
$(BUILD_LIBAWT_LWAWT) : $(BUILD_LIBMLIB_IMAGE) $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBMLIB_IMAGE)
$(BUILD_LIBAWT_LWAWT) : $(BUILD_LIBOSXAPP) $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBOSXAPP)
$(BUILD_LIBAWT_LWAWT) : $(BUILD_LIBJAVA) $(BUILD_LIBAWT_LWAWT): $(BUILD_LIBJAVA)
endif endif
...@@ -3257,40 +3259,40 @@ endif ...@@ -3257,40 +3259,40 @@ endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
$(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI,\ $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \
LIBRARY:=osxui,\ LIBRARY := osxui, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(JDK_TOPDIR)/src/macosx/native/com/apple/laf,\ SRC := $(JDK_TOPDIR)/src/macosx/native/com/apple/laf, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \ -I$(JDK_TOPDIR)/src/macosx/native/com/apple/laf \
-I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \
-I$(JDK_TOPDIR)/src/macosx/native/sun/awt \ -I$(JDK_TOPDIR)/src/macosx/native/sun/awt \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks, \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks, \
LDFLAGS:=$(LDFLAGS_JDKLIB)\ LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN) \ $(call SET_SHARED_LIBRARY_ORIGIN) \
-Xlinker -rpath -Xlinker @loader_path,\ -Xlinker -rpath -Xlinker @loader_path, \
LDFLAGS_SUFFIX_macosx:=-lawt -losxapp -lawt_lwawt \ LDFLAGS_SUFFIX_macosx := -lawt -losxapp -lawt_lwawt \
-framework Cocoa \ -framework Cocoa \
-framework Carbon \ -framework Carbon \
-framework ApplicationServices \ -framework ApplicationServices \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
-framework JavaRuntimeSupport \ -framework JavaRuntimeSupport \
-ljava -ljvm,\ -ljava -ljvm, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libosxui,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libosxui, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
BUILD_LIBRARIES += $(BUILD_LIBOSXUI) BUILD_LIBRARIES += $(BUILD_LIBOSXUI)
$(BUILD_LIBOSXUI) : $(BUILD_LIBAWT) $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
$(BUILD_LIBOSXUI) : $(BUILD_LIBOSXAPP) $(BUILD_LIBOSXUI): $(BUILD_LIBOSXAPP)
$(BUILD_LIBOSXUI) : $(BUILD_LIBAWT_LWAWT) $(BUILD_LIBOSXUI): $(BUILD_LIBAWT_LWAWT)
#$(BUILD_LIBOSXUI) : $(BUILD_LIBJAVA) #$(BUILD_LIBOSXUI): $(BUILD_LIBJAVA)
endif endif
...@@ -3298,151 +3300,151 @@ endif ...@@ -3298,151 +3300,151 @@ endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
# Ugly hack to mimic behaviour in old build where this is built as an xcode project. # Ugly hack to mimic behaviour in old build where this is built as an xcode project.
SET_SHARED_LIBRARY_NAME=-Xlinker -install_name -Xlinker /usr/local/lib/libJObjC.dylib SET_SHARED_LIBRARY_NAME = -Xlinker -install_name -Xlinker /usr/local/lib/libJObjC.dylib
$(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC32,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC32, \
LIBRARY:=JObjC,\ LIBRARY := JObjC, \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc32,\ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc32, \
SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \ SRC := $(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \
$(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/native ,\ $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/native, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=-fpascal-strings \ CFLAGS := -fpascal-strings \
-fobjc-gc \ -fobjc-gc \
-gdwarf-2 \ -gdwarf-2 \
$(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \ $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-m32,\
LDFLAGS:=$(LDFLAGS_JDKLIB)\
-m32, \ -m32, \
LDFLAGS_SUFFIX:=-framework Foundation -framework JavaVM \ LDFLAGS := $(LDFLAGS_JDKLIB) \
-m32, \
LDFLAGS_SUFFIX := -framework Foundation -framework JavaVM \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
-lffi, \ -lffi, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc32,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc32, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC64,\ $(eval $(call SetupNativeCompilation,BUILD_LIBJOBJC64, \
LIBRARY:=JObjC,\ LIBRARY := JObjC, \
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc64,\ OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc64, \
SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \ SRC := $(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/native \
$(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/native ,\ $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/native, \
LANG:=C,\ LANG := C, \
OPTIMIZATION:=LOW, \ OPTIMIZATION := LOW, \
CFLAGS:=-fpascal-strings \ CFLAGS := -fpascal-strings \
-fobjc-gc \ -fobjc-gc \
-gdwarf-2 \ -gdwarf-2 \
$(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \ $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers_jobjc \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
, \ , \
LDFLAGS:=-fpascal-strings \ LDFLAGS := -fpascal-strings \
-fobjc-gc \ -fobjc-gc \
-gdwarf-2 \ -gdwarf-2 \
$(LDFLAGS_JDKLIB)\ $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \ $(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX:=-framework Foundation -framework JavaVM \ LDFLAGS_SUFFIX := -framework Foundation -framework JavaVM \
-F/System/Library/Frameworks/JavaVM.framework/Frameworks \ -F/System/Library/Frameworks/JavaVM.framework/Frameworks \
-framework JavaNativeFoundation \ -framework JavaNativeFoundation \
-lffi, \ -lffi, \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjobjc64,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjobjc64, \
DEBUG_SYMBOLS:=$(DEBUG_ALL_BINARIES))) DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
$(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX): $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64) $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX): $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
$(LIPO) -create -output $@ $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64) $(LIPO) -create -output $@ $(BUILD_LIBJOBJC32) $(BUILD_LIBJOBJC64)
BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX) BUILD_LIBRARIES += $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)JObjC$(SHARED_LIBRARY_SUFFIX)
endif endif
########################################################################################## ##########################################################################################
ifndef OPENJDK ifndef OPENJDK
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)
ACCESSBRIDGE_SRCDIR:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge ACCESSBRIDGE_SRCDIR := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge
define SetupAccessBridge define SetupAccessBridge
# Parameter 1 Suffix # Parameter 1 Suffix
# Parameter 2 Machine # Parameter 2 Machine
# Parameter 3 ACCESSBRIDGE_ARCH_ suffix # Parameter 3 ACCESSBRIDGE_ARCH_ suffix
$(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1,\ $(call SetupNativeCompilation,BUILD_JAWTACCESSBRIDGE$1, \
LIBRARY=JAWTAccessBridge$1,\ LIBRARY = JAWTAccessBridge$1, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(ACCESSBRIDGE_SRCDIR),\ SRC := $(ACCESSBRIDGE_SRCDIR), \
INCLUDE_FILES:=JAWTAccessBridge.cpp,\ INCLUDE_FILES := JAWTAccessBridge.cpp, \
LANG:=C++,\ LANG := C++, \
OPTIMIZATION:=LOW,\ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-DACCESSBRIDGE_ARCH_$3,\ -DACCESSBRIDGE_ARCH_$3, \
LDFLAGS:=$(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \ LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \ winspool.lib jawt.lib comdlg32.lib advapi32.lib shell32.lib \
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
-subsystem:windows -machine:$2 \ -subsystem:windows -machine:$2 \
-def:$(ACCESSBRIDGE_SRCDIR)/JAWTAccessBridge.DEF,\ -def:$(ACCESSBRIDGE_SRCDIR)/JAWTAccessBridge.DEF, \
VERSIONINFO_RESOURCE:=$(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc,\ VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
RC_FLAGS:=$(RC_FLAGS),\ RC_FLAGS := $(RC_FLAGS), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjawtaccessbridge$1, \
DEBUG_SYMBOLS:=true) DEBUG_SYMBOLS := true)
$$(BUILD_JAWTACCESSBRIDGE$1): $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX) $$(BUILD_JAWTACCESSBRIDGE$1): $(JDK_OUTPUTDIR)/lib/$(LIBRARY_PREFIX)jawt$(STATIC_LIBRARY_SUFFIX)
$(call SetupNativeCompilation,BUILD_JAVAACCESSBRIDGE$1,\ $(call SetupNativeCompilation,BUILD_JAVAACCESSBRIDGE$1, \
LIBRARY=JavaAccessBridge$1,\ LIBRARY = JavaAccessBridge$1, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(ACCESSBRIDGE_SRCDIR),\ SRC := $(ACCESSBRIDGE_SRCDIR), \
INCLUDE_FILES:=AccessBridgeATInstance.cpp AccessBridgeDebug.cpp \ INCLUDE_FILES := AccessBridgeATInstance.cpp AccessBridgeDebug.cpp \
AccessBridgeJavaEntryPoints.cpp \ AccessBridgeJavaEntryPoints.cpp \
AccessBridgeMessages.cpp JavaAccessBridge.cpp,\ AccessBridgeMessages.cpp JavaAccessBridge.cpp, \
LANG:=C++,\ LANG := C++, \
OPTIMIZATION:=LOW,\ OPTIMIZATION := LOW, \
CFLAGS:=$(CFLAGS_JDKLIB) \ CFLAGS := $(CFLAGS_JDKLIB) \
-DACCESSBRIDGE_ARCH_$3,\ -DACCESSBRIDGE_ARCH_$3, \
LDFLAGS:=$(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \ LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
winspool.lib comdlg32.lib advapi32.lib shell32.lib \ winspool.lib comdlg32.lib advapi32.lib shell32.lib \
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
-subsystem:windows -machine:$2 \ -subsystem:windows -machine:$2 \
-def:$(ACCESSBRIDGE_SRCDIR)/JavaAccessBridge.DEF,\ -def:$(ACCESSBRIDGE_SRCDIR)/JavaAccessBridge.DEF, \
VERSIONINFO_RESOURCE:=$(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc,\ VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
RC_FLAGS:=$(RC_FLAGS),\ RC_FLAGS := $(RC_FLAGS), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libjavaaccessbridge$1, \
DEBUG_SYMBOLS:=true) DEBUG_SYMBOLS := true)
$(call SetupNativeCompilation,BUILD_WINDOWSACCESSBRIDGE$1,\ $(call SetupNativeCompilation,BUILD_WINDOWSACCESSBRIDGE$1, \
LIBRARY=WindowsAccessBridge$1,\ LIBRARY = WindowsAccessBridge$1, \
OUTPUT_DIR:=$(INSTALL_LIBRARIES_HERE),\ OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC:=$(ACCESSBRIDGE_SRCDIR),\ SRC := $(ACCESSBRIDGE_SRCDIR), \
INCLUDE_FILES:=AccessBridgeJavaVMInstance.cpp AccessBridgeMessageQueue.cpp \ INCLUDE_FILES := AccessBridgeJavaVMInstance.cpp AccessBridgeMessageQueue.cpp \
AccessBridgeMessages.cpp AccessBridgeWindowsEntryPoints.cpp \ AccessBridgeMessages.cpp AccessBridgeWindowsEntryPoints.cpp \
WinAccessBridge.cpp AccessBridgeDebug.cpp \ WinAccessBridge.cpp AccessBridgeDebug.cpp \
AccessBridgeEventHandler.cpp,\ AccessBridgeEventHandler.cpp, \
LANG:=C++,\ LANG := C++, \
OPTIMIZATION:=LOW,\ OPTIMIZATION := LOW, \
CFLAGS:=$(filter-out -MD,$(CFLAGS_JDKLIB)) -MT \ CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \
-DACCESSBRIDGE_ARCH_$3,\ -DACCESSBRIDGE_ARCH_$3, \
LDFLAGS:=$(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \ LDFLAGS := $(LDFLAGS_JDKLIB) kernel32.lib user32.lib gdi32.lib \
winspool.lib comdlg32.lib advapi32.lib shell32.lib \ winspool.lib comdlg32.lib advapi32.lib shell32.lib \
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \ ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib \
-subsystem:windows -machine:$2 \ -subsystem:windows -machine:$2 \
-def:$(ACCESSBRIDGE_SRCDIR)/WinAccessBridge.DEF,\ -def:$(ACCESSBRIDGE_SRCDIR)/WinAccessBridge.DEF, \
VERSIONINFO_RESOURCE:=$(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc,\ VERSIONINFO_RESOURCE := $(ACCESSBRIDGE_SRCDIR)/AccessBridgeStatusWindow.rc, \
RC_FLAGS:=$(RC_FLAGS),\ RC_FLAGS := $(RC_FLAGS), \
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1,\ OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libwindowsaccessbridge$1, \
DEBUG_SYMBOLS:=true) DEBUG_SYMBOLS := true)
BUILD_LIBRARIES += $$(BUILD_JAWTACCESSBRIDGE$1) $$(BUILD_JAVAACCESSBRIDGE$1) \ BUILD_LIBRARIES += $$(BUILD_JAWTACCESSBRIDGE$1) $$(BUILD_JAVAACCESSBRIDGE$1) \
$$(BUILD_WINDOWSACCESSBRIDGE$1) $$(BUILD_WINDOWSACCESSBRIDGE$1)
endef endef
ifeq ($(OPENJDK_TARGET_CPU_BITS),32) ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
$(eval $(call SetupAccessBridge,-32,I386,32)) $(eval $(call SetupAccessBridge,-32,I386,32))
$(eval $(call SetupAccessBridge,,I386,LEGACY)) $(eval $(call SetupAccessBridge,,I386,LEGACY))
else else
$(eval $(call SetupAccessBridge,-64,X64,64)) $(eval $(call SetupAccessBridge,-64,X64,64))
endif endif
endif endif
endif endif
......
makefiles/CopyFiles.gmk
浏览文件 @ e864d64d
...@@ -36,7 +36,7 @@ endif ...@@ -36,7 +36,7 @@ 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 \
...@@ -56,7 +56,7 @@ COPY_FILES = $(H_TARGET_FILES) ...@@ -56,7 +56,7 @@ 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 \
...@@ -71,7 +71,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) ...@@ -71,7 +71,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
$(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,9 +145,9 @@ COPY_FILES += $(CURSORS_DEST_DIR)/cursors.properties ...@@ -145,9 +145,9 @@ 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))
...@@ -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
...@@ -204,8 +204,8 @@ else ...@@ -204,8 +204,8 @@ 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,9 +215,9 @@ COPY_FILES += $(ICCPROFILE_TARGET_FILES) ...@@ -215,9 +215,9 @@ 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).
...@@ -254,7 +254,7 @@ endif ...@@ -254,7 +254,7 @@ 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)
...@@ -266,9 +266,9 @@ endif ...@@ -266,9 +266,9 @@ 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
...@@ -284,7 +284,7 @@ else ...@@ -284,7 +284,7 @@ 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
...@@ -323,7 +323,6 @@ else ...@@ -323,7 +323,6 @@ 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">>$(@)
...@@ -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,9 +438,9 @@ COPY_FILES += $(BLACKLISTED_CERTS_DST) ...@@ -439,9 +438,9 @@ 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 \
...@@ -451,86 +450,86 @@ SHARED_FONTS_FILES := \ ...@@ -451,86 +450,86 @@ SHARED_FONTS_FILES := \
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
...@@ -142,8 +142,8 @@ endif ...@@ -142,8 +142,8 @@ endif
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)
...@@ -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
...@@ -243,8 +243,8 @@ JAVAX_SOUND_SRC_FILES := \ ...@@ -243,8 +243,8 @@ JAVAX_SOUND_SRC_FILES := \
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/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,35 +40,35 @@ include Profiles.gmk ...@@ -40,35 +40,35 @@ 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))
########################################################################################## ##########################################################################################
...@@ -77,16 +77,16 @@ LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in ...@@ -77,16 +77,16 @@ LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in
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))
########################################################################################## ##########################################################################################
# #
...@@ -217,8 +217,8 @@ RT_JAR_EXCLUDES += \ ...@@ -217,8 +217,8 @@ RT_JAR_EXCLUDES += \
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
...@@ -247,7 +247,7 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude: $(MAKEFILE) $(PROFILE_MAKEF ...@@ -247,7 +247,7 @@ $(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
...@@ -267,12 +267,12 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib$ ...@@ -267,12 +267,12 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib$
$(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,7 +317,7 @@ CLASSES_TO_DEBEAN = \ ...@@ -317,7 +317,7 @@ 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
...@@ -332,7 +332,7 @@ endif ...@@ -332,7 +332,7 @@ 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)
...@@ -343,7 +343,7 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the ...@@ -343,7 +343,7 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the
@$(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); \
...@@ -363,7 +363,7 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFIL ...@@ -363,7 +363,7 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFIL
########################################################################################## ##########################################################################################
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 \
...@@ -373,46 +373,46 @@ ifneq ($(OPENJDK_TARGET_OS), windows) ...@@ -373,46 +373,46 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
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
...@@ -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,27 +496,27 @@ JARS += $(SUNEC_JAR_UNSIGNED) ...@@ -496,27 +496,27 @@ 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)
...@@ -526,11 +526,11 @@ endif ...@@ -526,11 +526,11 @@ 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,13 +539,13 @@ endif ...@@ -539,13 +539,13 @@ 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)
...@@ -555,11 +555,11 @@ endif ...@@ -555,11 +555,11 @@ 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,7 +568,7 @@ endif ...@@ -568,7 +568,7 @@ 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
...@@ -579,15 +579,15 @@ ifneq ($(BUILD_CRYPTO),no) ...@@ -579,15 +579,15 @@ ifneq ($(BUILD_CRYPTO),no)
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))
...@@ -608,7 +608,7 @@ endif ...@@ -608,7 +608,7 @@ 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
...@@ -626,13 +626,13 @@ ifneq ($(BUILD_CRYPTO),no) ...@@ -626,13 +626,13 @@ ifneq ($(BUILD_CRYPTO),no)
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))
...@@ -650,80 +650,80 @@ endif ...@@ -650,80 +650,80 @@ 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))
########################################################################################## ##########################################################################################
...@@ -781,22 +781,22 @@ TOOLS_JAR_INCLUDES := \ ...@@ -781,22 +781,22 @@ TOOLS_JAR_INCLUDES := \
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))
########################################################################################## ##########################################################################################
...@@ -841,12 +841,12 @@ $(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar ...@@ -841,12 +841,12 @@ $(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))
########################################################################################## ##########################################################################################
...@@ -898,8 +898,8 @@ endif ...@@ -898,8 +898,8 @@ endif
# 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/%
...@@ -911,53 +911,53 @@ $(IMAGES_OUTPUTDIR)/src/launcher/%: $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DI ...@@ -911,53 +911,53 @@ $(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
########################################################################################## ##########################################################################################
...@@ -966,21 +966,21 @@ endif ...@@ -966,21 +966,21 @@ 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,9 +993,9 @@ $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar ...@@ -993,9 +993,9 @@ $(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 \
...@@ -1008,10 +1008,10 @@ $(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP,\ ...@@ -1008,10 +1008,10 @@ $(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP,\
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,28 +1019,28 @@ JARS += $(IMAGES_OUTPUTDIR)/sec-bin.zip ...@@ -1019,28 +1019,28 @@ 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
...@@ -69,46 +69,46 @@ GENCLASSES := ...@@ -69,46 +69,46 @@ 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,7 +31,7 @@ include Setup.gmk ...@@ -31,7 +31,7 @@ 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 \
...@@ -92,7 +92,7 @@ endef ...@@ -92,7 +92,7 @@ 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) \
...@@ -138,56 +138,56 @@ WINDOWS_JDKJRE_BIN_FILES := \ ...@@ -138,56 +138,56 @@ WINDOWS_JDKJRE_BIN_FILES := \
$(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)
...@@ -218,7 +218,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx) ...@@ -218,7 +218,7 @@ ifneq ($(OPENJDK_TARGET_OS), macosx)
$(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 \
...@@ -245,52 +245,52 @@ endif ...@@ -245,52 +245,52 @@ 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
...@@ -323,7 +323,7 @@ $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index: $(JDKJRE_LIB_TARGETS) ...@@ -323,7 +323,7 @@ $(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 \
...@@ -337,8 +337,10 @@ ifneq ($(OPENJDK_TARGET_OS),windows) ...@@ -337,8 +337,10 @@ ifneq ($(OPENJDK_TARGET_OS),windows)
unpack200.1 unpack200.1
ifndef OPENJDK ifndef OPENJDK
ifneq ($(OPENJDK_TARGET_OS), solaris)
JRE_MAN_PAGES += javaws.1 JRE_MAN_PAGES += javaws.1
endif endif
endif
JDK_MAN_PAGES = \ JDK_MAN_PAGES = \
$(JRE_MAN_PAGES) \ $(JRE_MAN_PAGES) \
...@@ -379,16 +381,16 @@ ifneq ($(OPENJDK_TARGET_OS),windows) ...@@ -379,16 +381,16 @@ ifneq ($(OPENJDK_TARGET_OS),windows)
MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/linux/doc MAN_SRC_DIR := $(MAN_SRC_BASEDIR)/linux/doc
MAN1_SUBDIR:=man MAN1_SUBDIR := man
endif endif
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/solaris/doc MAN_SRC_DIR := $(MAN_SRC_BASEDIR)/solaris/doc
MAN1_SUBDIR:=sun/man/man1 MAN1_SUBDIR := sun/man/man1
endif endif
ifeq ($(OPENJDK_TARGET_OS), macosx) ifeq ($(OPENJDK_TARGET_OS), macosx)
MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/bsd/doc MAN_SRC_DIR := $(MAN_SRC_BASEDIR)/bsd/doc
MAN1_SUBDIR:=man MAN1_SUBDIR := man
JDK_MAN_PAGES := $(filter-out jcmd.1, $(JDK_MAN_PAGES)) JDK_MAN_PAGES := $(filter-out jcmd.1, $(JDK_MAN_PAGES))
JDK_MAN_PAGES := $(filter-out jvisualvm.1, $(JDK_MAN_PAGES)) JDK_MAN_PAGES := $(filter-out jvisualvm.1, $(JDK_MAN_PAGES))
endif endif
...@@ -421,19 +423,19 @@ ifneq ($(OPENJDK_TARGET_OS),windows) ...@@ -421,19 +423,19 @@ ifneq ($(OPENJDK_TARGET_OS),windows)
$(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/%
...@@ -472,34 +474,34 @@ ifneq ($(OPENJDK_TARGET_OS),windows) ...@@ -472,34 +474,34 @@ ifneq ($(OPENJDK_TARGET_OS),windows)
endif endif
ifeq ($(OPENJDK_TARGET_OS), linux) ifeq ($(OPENJDK_TARGET_OS), linux)
JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \ 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)) \ $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
$(JRE_IMAGE_DIR)/man/ja $(JRE_IMAGE_DIR)/man/ja
JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \ 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)) \ $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
$(JDK_IMAGE_DIR)/man/ja $(JDK_IMAGE_DIR)/man/ja
endif endif
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
JRE_MAN_PAGE_LIST := $(addprefix $(JRE_IMAGE_DIR)/man/man1/,$(JRE_MAN_PAGES)) \ 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/man1/, $(JRE_MAN_PAGES)) \
$(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/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)) $(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_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/man1/, $(JDK_MAN_PAGES)) \
$(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/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)) $(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_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)) \ $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
$(JRE_IMAGE_DIR)/man/ja $(JRE_IMAGE_DIR)/man/ja
JDK_MAN_PAGE_LIST := $(addprefix $(JDK_IMAGE_DIR)/man/man1/,$(JDK_MAN_PAGES)) \ 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)) \ $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
$(JDK_IMAGE_DIR)/man/ja $(JDK_IMAGE_DIR)/man/ja
endif endif
...@@ -521,14 +523,14 @@ $(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/% ...@@ -521,14 +523,14 @@ $(JDK_IMAGE_DIR)/demo/%: $(JDK_OUTPUTDIR)/demo/%
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)/%,%,$$@)'
...@@ -536,13 +538,13 @@ define CreateOverlayDemoRule ...@@ -536,13 +538,13 @@ define CreateOverlayDemoRule
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)))
################################################################################ ################################################################################
...@@ -559,13 +561,15 @@ ifndef OPENJDK ...@@ -559,13 +561,15 @@ ifndef OPENJDK
$(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
...@@ -574,7 +578,7 @@ endif ...@@ -574,7 +578,7 @@ 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)))
################################################################################ ################################################################################
...@@ -597,9 +601,9 @@ else ...@@ -597,9 +601,9 @@ else
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,7 +634,7 @@ JDK_OVERLAY_INFO_FILE := $(JDK_OVERLAY_IMAGE_DIR)/release ...@@ -630,7 +634,7 @@ 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
...@@ -652,9 +656,9 @@ ALL_SOURCE_TIPS = $(shell \ ...@@ -652,9 +656,9 @@ ALL_SOURCE_TIPS = $(shell \
$(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,54 +679,54 @@ $(JDK_IMAGE_DIR)/src.zip: $(IMAGES_OUTPUTDIR)/src.zip ...@@ -675,54 +679,54 @@ $(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 endif
# Filter out sjavac # Filter out sjavac
EXEC_LIST_BIN:=$(filter-out %sjavac$(EXE_SUFFIX),$(EXEC_LIST_BIN)) EXEC_LIST_BIN := $(filter-out %sjavac$(EXE_SUFFIX), $(EXEC_LIST_BIN))
# Filter out the overlay specific bin files # Filter out the overlay specific bin files
EXEC_LIST:=$(filter-out $(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) 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 # 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,\ JRE_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, $(IMAGES_OUTPUTDIR)/_strip_jre$(PROFILE)/%.stripped, \
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\ $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)), \
$(EXEC_LIST))) $(EXEC_LIST)))
JDKJRE_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \ JDKJRE_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
$(IMAGES_OUTPUTDIR)/_strip_jdk/jre/%.stripped, \ $(IMAGES_OUTPUTDIR)/_strip_jdk/jre/%.stripped, \
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST))) $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST)))
JDK_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \ JDK_BIN_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
$(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped, \ $(IMAGES_OUTPUTDIR)/_strip_jdk/%.stripped, \
$(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST))) $(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST)))
# Do the same for overlay image # Do the same for overlay image
JRE_OVERLAY_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%,$(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped,\ JRE_OVERLAY_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, $(IMAGES_OUTPUTDIR)/_strip_jre_overlay/%.stripped, \
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)),\ $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES) $(JDKJRE_LIB_FILES)), \
$(EXEC_LIST_OVERLAY))) $(EXEC_LIST_OVERLAY)))
JDKJRE_OVERLAY_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \ JDKJRE_OVERLAY_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
$(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/jre/%.stripped, \ $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/jre/%.stripped, \
$(filter-out $(addprefix %,$(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST_OVERLAY))) $(filter-out $(addprefix %, $(NOT_JRE_BIN_FILES) $(NOT_JRE_LIB_FILES)), $(EXEC_LIST_OVERLAY)))
JDK_OVERLAY_BIN_STRIP_LIST:=$(patsubst $(JDK_OUTPUTDIR)/%, \ JDK_OVERLAY_BIN_STRIP_LIST := $(patsubst $(JDK_OUTPUTDIR)/%, \
$(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped, \ $(IMAGES_OUTPUTDIR)/_strip_jdk_overlay/%.stripped, \
$(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST_OVERLAY))) $(filter-out $(JDK_OUTPUTDIR)/lib/%, $(EXEC_LIST_OVERLAY)))
define mcs-file define mcs-file
$(if $(POST_MCS_CMD),$(POST_MCS_CMD) $<) $(if $(POST_MCS_CMD), $(POST_MCS_CMD) $<)
endef endef
define strip-file define strip-file
...@@ -778,21 +782,21 @@ jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \ ...@@ -778,21 +782,21 @@ jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_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,12 +40,12 @@ IMPORT_BINARIES := CORBA ...@@ -40,12 +40,12 @@ 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
####### #######
...@@ -55,10 +55,10 @@ endif ...@@ -55,10 +55,10 @@ endif
# 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,9 +92,9 @@ endef ...@@ -92,9 +92,9 @@ 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)
...@@ -104,7 +104,7 @@ define CopyDir ...@@ -104,7 +104,7 @@ 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,7 +114,7 @@ endef ...@@ -114,7 +114,7 @@ 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)))
...@@ -125,35 +125,35 @@ JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU ...@@ -125,35 +125,35 @@ JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU
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 endif
ifeq ($(JVM_VARIANT_CLIENT), true) ifeq ($(JVM_VARIANT_CLIENT), true)
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
ifneq (,$(JSIG_DEBUGINFO)) ifneq (, $(JSIG_DEBUGINFO))
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
endif endif
endif endif
ifeq ($(JVM_VARIANT_MINIMAL1), true) ifeq ($(JVM_VARIANT_MINIMAL1), true)
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX) IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
ifneq (,$(JSIG_DEBUGINFO)) ifneq (, $(JSIG_DEBUGINFO))
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I)) IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
endif 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
...@@ -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
...@@ -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
...@@ -61,4 +61,3 @@ profile_version_number = $(patsubst $(JDK_OUTPUTDIR)/gen_profile_%/$(VERSION_JAV ...@@ -61,4 +61,3 @@ profile_version_number = $(patsubst $(JDK_OUTPUTDIR)/gen_profile_%/$(VERSION_JAV
# 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
...@@ -91,21 +91,21 @@ ALL_JARS := $(FULL_JRE_JARS) \ ...@@ -91,21 +91,21 @@ ALL_JARS := $(FULL_JRE_JARS) \
$(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
...@@ -116,7 +116,7 @@ else ifeq ($(PROFILE), profile_2) ...@@ -116,7 +116,7 @@ else ifeq ($(PROFILE), profile_2)
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)
...@@ -128,7 +128,7 @@ endif ...@@ -128,7 +128,7 @@ 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
...@@ -272,8 +272,8 @@ include profile-rtjar-includes.txt ...@@ -272,8 +272,8 @@ 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 += \
...@@ -321,9 +321,8 @@ endif ...@@ -321,9 +321,8 @@ 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
...@@ -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,129 +24,128 @@ ...@@ -24,129 +24,128 @@
# #
# 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
...@@ -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
...@@ -50,14 +50,14 @@ BREAK_ITERATOR_CLASSES = $(BREAK_ITERATOR_DIR)/classes ...@@ -50,14 +50,14 @@ 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
......
makefiles/GendataFontConfig.gmk → makefiles/gendata/GendataFontConfig.gmk
浏览文件 @ e864d64d
...@@ -68,11 +68,11 @@ endif ...@@ -68,11 +68,11 @@ 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/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
...@@ -32,7 +32,7 @@ GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio ...@@ -32,7 +32,7 @@ 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) $@
...@@ -40,7 +40,7 @@ $(GENSRC_BUFFER_DST)/_the.buffer.dir : ...@@ -40,7 +40,7 @@ $(GENSRC_BUFFER_DST)/_the.buffer.dir :
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
...@@ -129,7 +129,7 @@ define typesAndBits ...@@ -129,7 +129,7 @@ define typesAndBits
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
...@@ -139,7 +139,7 @@ define typesAndBits ...@@ -139,7 +139,7 @@ define typesAndBits
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
...@@ -213,7 +213,7 @@ define SetupGenBuffer ...@@ -213,7 +213,7 @@ define SetupGenBuffer
$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
...@@ -221,7 +221,7 @@ define SetupGenBuffer ...@@ -221,7 +221,7 @@ define SetupGenBuffer
$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)
...@@ -230,7 +230,7 @@ define SetupGenBuffer ...@@ -230,7 +230,7 @@ define SetupGenBuffer
$(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) \
...@@ -257,8 +257,8 @@ $$($1_DST) : $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.buffer.dir ...@@ -257,8 +257,8 @@ $$($1_DST) : $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.buffer.dir
-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
...@@ -269,112 +269,112 @@ ifeq ($$($1_BIN),1) ...@@ -269,112 +269,112 @@ ifeq ($$($1_BIN),1)
$$($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/GensrcCharacterData.gmk → makefiles/gensrc/GensrcCharacterData.gmk
浏览文件 @ e864d64d
...@@ -27,13 +27,13 @@ ...@@ -27,13 +27,13 @@
# 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 \
...@@ -47,18 +47,18 @@ define SetupCharacterData ...@@ -47,18 +47,18 @@ define SetupCharacterData
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,7 +34,7 @@ GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Cod ...@@ -34,7 +34,7 @@ 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 \
...@@ -69,7 +69,7 @@ GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java ...@@ -69,7 +69,7 @@ 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 \
...@@ -104,4 +104,4 @@ GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java ...@@ -104,4 +104,4 @@ 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,10 +91,9 @@ GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs ...@@ -91,10 +91,9 @@ 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" \
...@@ -102,4 +101,4 @@ $(GENSRC_DST)/StandardCharsets.java : $(JDK_TOPDIR)/src/share/classes/sun/nio/cs ...@@ -102,4 +101,4 @@ $(GENSRC_DST)/StandardCharsets.java : $(JDK_TOPDIR)/src/share/classes/sun/nio/cs
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
...@@ -35,7 +35,7 @@ GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels ...@@ -35,7 +35,7 @@ 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,7 +43,7 @@ $(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir : ...@@ -43,7 +43,7 @@ $(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)/$*
...@@ -52,4 +52,4 @@ $(GENSRC_EXCEPTIONS_DST)/_the.% : $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \ ...@@ -52,4 +52,4 @@ $(GENSRC_EXCEPTIONS_DST)/_the.% : $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
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
...@@ -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) $@
...@@ -80,7 +80,7 @@ define SetupGensrcAWTIcon ...@@ -80,7 +80,7 @@ define SetupGensrcAWTIcon
$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,14 +100,14 @@ $$($1_TARGET64) : $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir ...@@ -100,14 +100,14 @@ $$($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
...@@ -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,21 +36,21 @@ JOBJC_DST := $(JDK_OUTPUTDIR)/gensrc_jobjc/src ...@@ -36,21 +36,21 @@ 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
...@@ -58,26 +58,26 @@ BRIDGESUPPORT := $(addprefix $(JOBJC_TMP)/bridge/,$(addsuffix Full.bridgesupport ...@@ -58,26 +58,26 @@ BRIDGESUPPORT := $(addprefix $(JOBJC_TMP)/bridge/,$(addsuffix Full.bridgesupport
# 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)
...@@ -86,7 +86,7 @@ $(JOBJC_TMP)/bridge/AppKitFull.bridgesupport : \ ...@@ -86,7 +86,7 @@ $(JOBJC_TMP)/bridge/AppKitFull.bridgesupport : \
# 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
...@@ -97,14 +97,14 @@ $(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER) ...@@ -97,14 +97,14 @@ $(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER)
# 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,7 +28,7 @@ ...@@ -28,7 +28,7 @@
# 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 \
...@@ -37,40 +37,40 @@ LOCALE_FILES:=$(shell $(FIND) $(JDK_TOPDIR)/src/share/classes \ ...@@ -37,40 +37,40 @@ LOCALE_FILES:=$(shell $(FIND) $(JDK_TOPDIR)/src/share/classes \
-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,8 +91,8 @@ $(eval $(call CaptureLocale,CurrencyNames)) ...@@ -91,8 +91,8 @@ $(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
...@@ -101,7 +101,7 @@ $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java: \ ...@@ -101,7 +101,7 @@ $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java: \
$(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,7 +110,7 @@ GENSRC_CRBC_CMD := $(JDK_TOPDIR)/makefiles/scripts/localelist.sh ...@@ -110,7 +110,7 @@ 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)" $< $@
......
makefiles/GensrcMisc.gmk → makefiles/gensrc/GensrcMisc.gmk
浏览文件 @ e864d64d
...@@ -62,15 +62,15 @@ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java ...@@ -62,15 +62,15 @@ 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)
...@@ -90,98 +90,98 @@ GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/gensrc/genSocketOptionRegistry ...@@ -90,98 +90,98 @@ 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,7 +194,7 @@ endif ...@@ -194,7 +194,7 @@ 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
...@@ -234,8 +234,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows) ...@@ -234,8 +234,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
$(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)
...@@ -365,18 +365,18 @@ $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $ ...@@ -365,18 +365,18 @@ $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $
# 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
...@@ -83,7 +83,7 @@ $(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \ ...@@ -83,7 +83,7 @@ $(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \
-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) $@
......
makefiles/GensrcX11Wrappers.gmk → makefiles/gensrc/GensrcX11Wrappers.gmk
浏览文件 @ e864d64d
...@@ -58,7 +58,7 @@ else ...@@ -58,7 +58,7 @@ else
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.
...@@ -69,30 +69,30 @@ $(GENSRC_X11WRAPPERS_TMP)/sizes.%: $(GENSRC_SIZER_DIR)/sizes.% ...@@ -69,30 +69,30 @@ $(GENSRC_X11WRAPPERS_TMP)/sizes.%: $(GENSRC_SIZER_DIR)/sizes.%
# 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) \
...@@ -110,7 +110,7 @@ ifneq ($(COMPILE_TYPE),cross) ...@@ -110,7 +110,7 @@ ifneq ($(COMPILE_TYPE),cross)
# 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.$*
...@@ -119,4 +119,3 @@ ifneq ($(COMPILE_TYPE),cross) ...@@ -119,4 +119,3 @@ ifneq ($(COMPILE_TYPE),cross)
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
...@@ -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,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# 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 && \
...@@ -43,4 +43,3 @@ jprt_build_debug: debug images ...@@ -43,4 +43,3 @@ jprt_build_debug: debug images
# 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
...@@ -306,4 +306,3 @@ jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets} ...@@ -306,4 +306,3 @@ 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
...@@ -282,4 +282,3 @@ SUNWprivate_1.1 { ...@@ -282,4 +282,3 @@ SUNWprivate_1.1 {
local: local:
*; *;
}; };
makefiles/mapfiles/libawt/mapfile-vers
浏览文件 @ e864d64d
...@@ -195,4 +195,3 @@ SUNWprivate_1.1 { ...@@ -195,4 +195,3 @@ SUNWprivate_1.1 {
local: local:
*; *;
}; };
makefiles/mapfiles/libawt/mapfile-vers-linux
浏览文件 @ e864d64d
...@@ -314,4 +314,3 @@ SUNWprivate_1.1 { ...@@ -314,4 +314,3 @@ SUNWprivate_1.1 {
local: local:
*; *;
}; };
makefiles/mapfiles/libawt_headless/mapfile-vers
浏览文件 @ e864d64d
...@@ -106,4 +106,3 @@ SUNWprivate_1.1 { ...@@ -106,4 +106,3 @@ SUNWprivate_1.1 {
local: local:
*; *;
}; };
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
...@@ -254,5 +254,3 @@ FULL_JRE_INCLUDE_METAINF_SERVICES := \ ...@@ -254,5 +254,3 @@ FULL_JRE_INCLUDE_METAINF_SERVICES := \
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/genExceptions.sh
浏览文件 @ e864d64d
...@@ -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
...@@ -104,6 +104,3 @@ done ...@@ -104,6 +104,3 @@ done
$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
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.
先完成此消息的编辑！
想要评论请 注册 或