8001931: The new build system whitespace cleanup
Reviewed-by: tbell, simonis, erikj
This commit is contained in:
Magnus Ihse Bursie
parent
7aa221ebc3
commit
c0c561895a
@ -47,13 +47,13 @@ include ProfileNames.gmk
|
||||
|
||||
import: import-only
|
||||
import-only:
|
||||
# Import (corba jaxp jaxws langtools hotspot)
|
||||
# Import (corba jaxp jaxws langtools hotspot)
|
||||
+$(MAKE) -f Import.gmk
|
||||
|
||||
gensrc: import gensrc-only
|
||||
gensrc-only:
|
||||
+$(MAKE) -f GenerateJavaSources.gmk
|
||||
# Ok, now gensrc is fully populated.
|
||||
# Ok, now gensrc is fully populated.
|
||||
|
||||
gendata: gensrc gendata-only
|
||||
gendata-only:
|
||||
@ -62,8 +62,8 @@ gendata-only:
|
||||
classes: gendata classes-only
|
||||
classes-only:
|
||||
+$(MAKE) -f CompileJavaClasses.gmk
|
||||
# The classes are now built and
|
||||
# any javah files have now been generated.
|
||||
# The classes are now built and
|
||||
# any javah files have now been generated.
|
||||
|
||||
libs: classes libs-only
|
||||
libs-only:
|
||||
@ -71,23 +71,23 @@ libs-only:
|
||||
|
||||
launchers: libs launchers-only
|
||||
launchers-only:
|
||||
# Finally compile the launchers.
|
||||
# Finally compile the launchers.
|
||||
+$(MAKE) -f CompileLaunchers.gmk
|
||||
|
||||
genclasses: launchers genclasses-only
|
||||
genclasses-only:
|
||||
# Generate classes that have other sources. Needs
|
||||
# to execute launchers.
|
||||
# Generate classes that have other sources. Needs
|
||||
# to execute launchers.
|
||||
+$(MAKE) -f GenerateClasses.gmk
|
||||
|
||||
jdk: genclasses
|
||||
# Now we have a complete jdk, which you can run.
|
||||
# It is not yet wrapped up as an installed image.
|
||||
# Now we have a complete jdk, which you can run.
|
||||
# It is not yet wrapped up as an installed image.
|
||||
|
||||
demos:
|
||||
# The demos are compiled against this jdk.
|
||||
# The demos are compiled against this jdk.
|
||||
+$(MAKE) -f CompileDemos.gmk
|
||||
# Now copy the sample sources into the jdk.
|
||||
# Now copy the sample sources into the jdk.
|
||||
+$(MAKE) -f CopySamples.gmk
|
||||
|
||||
# Create the final jdk and jre images, to be wrapped up
|
||||
@ -96,9 +96,9 @@ demos:
|
||||
images:
|
||||
+$(MAKE) PROFILE="" -f CreateJars.gmk
|
||||
+$(MAKE) PROFILE="" -f Images.gmk
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
+$(MAKE) -f Bundles.gmk
|
||||
endif
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
+$(MAKE) -f Bundles.gmk
|
||||
endif
|
||||
|
||||
overlay-images:
|
||||
+$(MAKE) -f CompileLaunchers.gmk OVERLAY_IMAGES=true
|
||||
@ -114,8 +114,8 @@ profiles: $(ALL_PROFILES)
|
||||
sign-jars:
|
||||
+$(MAKE) -f SignJars.gmk
|
||||
|
||||
BINARIES:=$(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
|
||||
INSTALLDIR:=openjdk-$(RELEASE)
|
||||
BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
|
||||
INSTALLDIR := openjdk-$(RELEASE)
|
||||
|
||||
# Install the jdk image, in a very crude way. Not taking into
|
||||
# account, how to install properly on macosx or windows etc.
|
||||
@ -126,8 +126,8 @@ install:
|
||||
$(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/*
|
||||
$(CP) -rp $(JDK_IMAGE_DIR)/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
|
||||
$(MKDIR) -p $(INSTALL_PREFIX)/bin
|
||||
$(RM) $(addprefix $(INSTALL_PREFIX)/bin/,$(BINARIES))
|
||||
$(foreach b,$(BINARIES),$(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true
|
||||
$(RM) $(addprefix $(INSTALL_PREFIX)/bin/, $(BINARIES))
|
||||
$(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
|
||||
all: jdk
|
||||
|
||||
@ -31,108 +31,108 @@ default: bundles
|
||||
# Only macosx has bundles defined.
|
||||
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
|
||||
# these values in open and closed. Should probably be fixed.
|
||||
ifndef OPENJDK
|
||||
# All these OPENJDK checks are needed since there is no coherency between
|
||||
# these values in open and closed. Should probably be fixed.
|
||||
ifndef OPENJDK
|
||||
BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(JDK_MINOR_VERSION)u$(JDK_UPDATE_VERSION)
|
||||
else
|
||||
else
|
||||
BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE)
|
||||
endif
|
||||
BUNDLE_ID_JRE := $(BUNDLE_ID).jre
|
||||
BUNDLE_ID_JDK := $(BUNDLE_ID).jdk
|
||||
endif
|
||||
BUNDLE_ID_JRE := $(BUNDLE_ID).jre
|
||||
BUNDLE_ID_JDK := $(BUNDLE_ID).jdk
|
||||
|
||||
BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_MINOR_VERSION)
|
||||
BUNDLE_NAME_JRE := $(BUNDLE_NAME)
|
||||
BUNDLE_NAME_JDK := $(BUNDLE_NAME)
|
||||
BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_MINOR_VERSION)
|
||||
BUNDLE_NAME_JRE := $(BUNDLE_NAME)
|
||||
BUNDLE_NAME_JDK := $(BUNDLE_NAME)
|
||||
|
||||
ifndef OPENJDK
|
||||
ifndef OPENJDK
|
||||
BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_VERSION)
|
||||
else
|
||||
else
|
||||
BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) ($(JDK_VERSION))
|
||||
endif
|
||||
BUNDLE_INFO_JRE := $(BUNDLE_INFO)
|
||||
BUNDLE_INFO_JDK := $(BUNDLE_INFO)
|
||||
endif
|
||||
BUNDLE_INFO_JRE := $(BUNDLE_INFO)
|
||||
BUNDLE_INFO_JDK := $(BUNDLE_INFO)
|
||||
|
||||
BUNDLE_PLATFORM_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION)
|
||||
BUNDLE_VERSION := $(JDK_VERSION)
|
||||
ifeq ($(COMPANY_NAME),N/A)
|
||||
BUNDLE_PLATFORM_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION)
|
||||
BUNDLE_VERSION := $(JDK_VERSION)
|
||||
ifeq ($(COMPANY_NAME), N/A)
|
||||
BUNDLE_VENDOR := UNDEFINED
|
||||
else
|
||||
else
|
||||
BUNDLE_VENDOR := $(COMPANY_NAME)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
JDK_FILE_LIST := $(shell $(FIND) $(JDK_IMAGE_DIR))
|
||||
JRE_FILE_LIST := $(shell $(FIND) $(JRE_IMAGE_DIR))
|
||||
JDK_FILE_LIST := $(shell $(FIND) $(JDK_IMAGE_DIR))
|
||||
JRE_FILE_LIST := $(shell $(FIND) $(JRE_IMAGE_DIR))
|
||||
|
||||
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))
|
||||
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))
|
||||
|
||||
# The old builds implementation of this did not preserve symlinks so
|
||||
# make sure they are followed and the contents copied instead.
|
||||
# To fix this, remove -L
|
||||
# Copy empty directories (jre/lib/applet).
|
||||
$(JDK_BUNDLE_DIR)/Home/%: $(JDK_IMAGE_DIR)/%
|
||||
# The old builds implementation of this did not preserve symlinks so
|
||||
# make sure they are followed and the contents copied instead.
|
||||
# To fix this, remove -L
|
||||
# Copy empty directories (jre/lib/applet).
|
||||
$(JDK_BUNDLE_DIR)/Home/%: $(JDK_IMAGE_DIR)/%
|
||||
$(ECHO) Copying $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(MKDIR) -p $(@D)
|
||||
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)/%,%,$@)
|
||||
$(MKDIR) -p $(@D)
|
||||
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)/%,%,$@)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(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)/%,%,$@)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(LN) -s ../Home/lib/jli/libjli.dylib $@
|
||||
|
||||
$(JDK_BUNDLE_DIR)/Info.plist: $(SPEC)
|
||||
$(JDK_BUNDLE_DIR)/Info.plist: $(SPEC)
|
||||
$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" \
|
||||
-e "s/@@NAME@@/$(BUNDLE_NAME_JDK)/g" \
|
||||
-e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" \
|
||||
-e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \
|
||||
-e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \
|
||||
-e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \
|
||||
< $(MACOSX_SRC)/bundle/JDK-Info.plist > $@
|
||||
$(SED) -e "s/@@ID@@/$(BUNDLE_ID_JDK)/g" \
|
||||
-e "s/@@NAME@@/$(BUNDLE_NAME_JDK)/g" \
|
||||
-e "s/@@INFO@@/$(BUNDLE_INFO_JDK)/g" \
|
||||
-e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \
|
||||
-e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \
|
||||
-e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \
|
||||
< $(MACOSX_SRC)/bundle/JDK-Info.plist > $@
|
||||
|
||||
$(JRE_BUNDLE_DIR)/Info.plist: $(SPEC)
|
||||
$(JRE_BUNDLE_DIR)/Info.plist: $(SPEC)
|
||||
$(ECHO) Creating $(patsubst $(OUTPUT_ROOT)/%,%,$@)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(SED) -e "s/@@ID@@/$(BUNDLE_ID_JRE)/g" \
|
||||
-e "s/@@NAME@@/$(BUNDLE_NAME_JRE)/g" \
|
||||
-e "s/@@INFO@@/$(BUNDLE_INFO_JRE)/g" \
|
||||
-e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \
|
||||
-e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \
|
||||
-e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \
|
||||
< $(MACOSX_SRC)/bundle/JRE-Info.plist > $@
|
||||
$(SED) -e "s/@@ID@@/$(BUNDLE_ID_JRE)/g" \
|
||||
-e "s/@@NAME@@/$(BUNDLE_NAME_JRE)/g" \
|
||||
-e "s/@@INFO@@/$(BUNDLE_INFO_JRE)/g" \
|
||||
-e "s/@@PLATFORM_VERSION@@/$(BUNDLE_PLATFORM_VERSION)/g" \
|
||||
-e "s/@@VERSION@@/$(BUNDLE_VERSION)/g" \
|
||||
-e "s/@@VENDOR@@/$(BUNDLE_VENDOR)/g" \
|
||||
< $(MACOSX_SRC)/bundle/JRE-Info.plist > $@
|
||||
|
||||
jdk-bundle: $(JDK_TARGET_LIST) $(JDK_BUNDLE_DIR)/MacOS/libjli.dylib \
|
||||
$(JDK_BUNDLE_DIR)/Info.plist
|
||||
jdk-bundle: $(JDK_TARGET_LIST) $(JDK_BUNDLE_DIR)/MacOS/libjli.dylib \
|
||||
$(JDK_BUNDLE_DIR)/Info.plist
|
||||
$(SETFILE) -a B $(dir $(JDK_BUNDLE_DIR))
|
||||
|
||||
jre-bundle: $(JRE_TARGET_LIST) $(JRE_BUNDLE_DIR)/MacOS/libjli.dylib \
|
||||
$(JRE_BUNDLE_DIR)/Info.plist
|
||||
jre-bundle: $(JRE_TARGET_LIST) $(JRE_BUNDLE_DIR)/MacOS/libjli.dylib \
|
||||
$(JRE_BUNDLE_DIR)/Info.plist
|
||||
$(SETFILE) -a B $(dir $(JRE_BUNDLE_DIR))
|
||||
|
||||
else # Not macosx
|
||||
|
||||
bundles:
|
||||
bundles:
|
||||
$(ECHO) "No bundles defined for $(OPENJDK_TARGET_OS)"
|
||||
|
||||
endif # macosx
|
||||
|
||||
@ -35,10 +35,10 @@ include NativeCompilation.gmk
|
||||
include Setup.gmk
|
||||
|
||||
# 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.
|
||||
BUILD_DEMOS=
|
||||
BUILD_DEMOS =
|
||||
|
||||
# The demo structure and contents should really be cleaned up.
|
||||
# Now every other demo has its own quirks where to put the
|
||||
@ -47,13 +47,13 @@ BUILD_DEMOS=
|
||||
##################################################################################################
|
||||
|
||||
define SetupAppletDemo
|
||||
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_APPLET_$1,\
|
||||
SETUP:=GENERATE_USINGJDKBYTECODE,\
|
||||
SRC:=$(JDK_TOPDIR)/src/$3share/demo/applets/$1,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/demo/applets/$1,\
|
||||
COPY:=.html .java .xyz .obj .au .gif,\
|
||||
DISABLE_SJAVAC:=$2))
|
||||
BUILD_DEMOS += $$(BUILD_DEMO_APPLET_$1)
|
||||
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_APPLET_$1, \
|
||||
SETUP := GENERATE_USINGJDKBYTECODE, \
|
||||
SRC := $(JDK_TOPDIR)/src/$3share/demo/applets/$1, \
|
||||
BIN := $(JDK_OUTPUTDIR)/demo/applets/$1, \
|
||||
COPY := .html .java .xyz .obj .au .gif, \
|
||||
DISABLE_SJAVAC := $2))
|
||||
BUILD_DEMOS += $$(BUILD_DEMO_APPLET_$1)
|
||||
endef
|
||||
|
||||
$(eval $(call SetupAppletDemo,ArcTest))
|
||||
@ -71,91 +71,91 @@ $(eval $(call SetupAppletDemo,SortDemo))
|
||||
$(eval $(call SetupAppletDemo,SpreadSheet))
|
||||
|
||||
ifndef OPENJDK
|
||||
$(eval $(call SetupAppletDemo,Animator,,closed/))
|
||||
$(eval $(call SetupAppletDemo,GraphLayout,true,closed/))
|
||||
$(eval $(call SetupAppletDemo,JumpingBox,,closed/))
|
||||
$(eval $(call SetupAppletDemo,TicTacToe,,closed/))
|
||||
$(eval $(call SetupAppletDemo,Animator,,closed/))
|
||||
$(eval $(call SetupAppletDemo,GraphLayout,true,closed/))
|
||||
$(eval $(call SetupAppletDemo,JumpingBox,,closed/))
|
||||
$(eval $(call SetupAppletDemo,TicTacToe,,closed/))
|
||||
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
|
||||
# Param 1 = Name of the demo
|
||||
# Param 2 = Subdirectory of the demo below the demo directory.
|
||||
# Param 3 = Additional javac flags.
|
||||
# Param 4 = The main class for the jar.
|
||||
# Param 5 = Additional source directory.
|
||||
# Param 6 = Extra dir below $(JDK_TOPDIR)/src (closed)
|
||||
# Param 7 = List of files to copy
|
||||
# Param 8 = Base name of jar file. Defaults to $1
|
||||
# Param 9 = Exclude list
|
||||
# Param 10 = Extra copy patterns
|
||||
# Param 11 = Extra manifest attribute
|
||||
# Param 12 = Suffix for compiler setup name
|
||||
# Param 1 = Name of the demo
|
||||
# Param 2 = Subdirectory of the demo below the demo directory.
|
||||
# Param 3 = Additional javac flags.
|
||||
# Param 4 = The main class for the jar.
|
||||
# Param 5 = Additional source directory.
|
||||
# Param 6 = Extra dir below $(JDK_TOPDIR)/src (closed)
|
||||
# Param 7 = List of files to copy
|
||||
# Param 8 = Base name of jar file. Defaults to $1
|
||||
# Param 9 = Exclude list
|
||||
# Param 10 = Extra copy patterns
|
||||
# Param 11 = Extra manifest attribute
|
||||
# Param 12 = Suffix for compiler setup name
|
||||
|
||||
# In some demos the source is found in a subdir called src.
|
||||
$1_MAIN_SRC:=$$(wildcard $(JDK_TOPDIR)/src/$6share/demo/$2/$1/src)
|
||||
ifeq ($$($1_MAIN_SRC),)
|
||||
$1_MAIN_SRC:=$(JDK_TOPDIR)/src/$6share/demo/$2/$1
|
||||
endif
|
||||
# In some demos the source is found in a subdir called src.
|
||||
$1_MAIN_SRC := $$(wildcard $(JDK_TOPDIR)/src/$6share/demo/$2/$1/src)
|
||||
ifeq ($$($1_MAIN_SRC), )
|
||||
$1_MAIN_SRC := $(JDK_TOPDIR)/src/$6share/demo/$2/$1
|
||||
endif
|
||||
|
||||
ifneq ($8,)
|
||||
$1_JARFILE := $8.jar
|
||||
else
|
||||
$1_JARFILE := $1.jar
|
||||
endif
|
||||
ifneq ($8, )
|
||||
$1_JARFILE := $8.jar
|
||||
else
|
||||
$1_JARFILE := $1.jar
|
||||
endif
|
||||
|
||||
ifeq ($(findstring $1,Laffy SwingSet3),)
|
||||
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_$1,\
|
||||
SETUP:=GENERATE_USINGJDKBYTECODE,\
|
||||
ADD_JAVAC_FLAGS:=$3,\
|
||||
SRC:=$$($1_MAIN_SRC) $5,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/democlasses/$2/$1,\
|
||||
COPY:=$(PATTERNS_TO_COPY) $(10),\
|
||||
JAR:=$(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE),\
|
||||
JARMAIN:=$4,\
|
||||
MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf,\
|
||||
EXTRA_MANIFEST_ATTR:=$(11),\
|
||||
SRCZIP:=$(JDK_OUTPUTDIR)/demo/$2/$1/src.zip,\
|
||||
EXCLUDE_FILES:=$9,\
|
||||
DISABLE_SJAVAC:=$(12)))
|
||||
ifeq ($(findstring $1,Laffy SwingSet3), )
|
||||
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_$1, \
|
||||
SETUP := GENERATE_USINGJDKBYTECODE, \
|
||||
ADD_JAVAC_FLAGS := $3, \
|
||||
SRC := $$($1_MAIN_SRC) $5, \
|
||||
BIN := $(JDK_OUTPUTDIR)/democlasses/$2/$1, \
|
||||
COPY := $(PATTERNS_TO_COPY) $(10), \
|
||||
JAR := $(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE), \
|
||||
JARMAIN := $4, \
|
||||
MANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf, \
|
||||
EXTRA_MANIFEST_ATTR := $(11), \
|
||||
SRCZIP := $(JDK_OUTPUTDIR)/demo/$2/$1/src.zip, \
|
||||
EXCLUDE_FILES := $9, \
|
||||
DISABLE_SJAVAC := $(12)))
|
||||
|
||||
BUILD_DEMOS += $$(BUILD_DEMO_$1) \
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE) \
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/src.zip
|
||||
endif
|
||||
BUILD_DEMOS += $$(BUILD_DEMO_$1) \
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/$$($1_JARFILE) \
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/src.zip
|
||||
endif
|
||||
|
||||
# Copy files.
|
||||
$1_COPY_TARGETS := $$(patsubst $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%,\
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/%,\
|
||||
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/$6share/demo/$2/$1/,$7)))
|
||||
ifneq ($7,)
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/% : $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%
|
||||
$$(call install-file)
|
||||
$(CHMOD) -f ug+w $$@
|
||||
# Copy files.
|
||||
$1_COPY_TARGETS := $$(patsubst $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%, \
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/%, \
|
||||
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/$6share/demo/$2/$1/, $7)))
|
||||
ifneq ($7, )
|
||||
$(JDK_OUTPUTDIR)/demo/$2/$1/%: $(JDK_TOPDIR)/src/$6share/demo/$2/$1/%
|
||||
$$(call install-file)
|
||||
$(CHMOD) -f ug+w $$@
|
||||
|
||||
BUILD_DEMOS += $$($1_COPY_TARGETS)
|
||||
endif
|
||||
BUILD_DEMOS += $$($1_COPY_TARGETS)
|
||||
endif
|
||||
|
||||
endef
|
||||
|
||||
$(eval $(call SetupDemo,CodePointIM,jfc,,CodePointIM,,,*.html))
|
||||
$(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services : \
|
||||
$(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar \
|
||||
$(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor
|
||||
$(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.services: \
|
||||
$(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar \
|
||||
$(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor
|
||||
(cd $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM && \
|
||||
$(MKDIR) -p _the.tmp/META-INF/services && \
|
||||
$(CP) $(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor _the.tmp/META-INF/services && \
|
||||
cd _the.tmp && \
|
||||
$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar META-INF/services/java.awt.im.spi.InputMethodDescriptor && \
|
||||
cd META-INF/services && \
|
||||
$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar java.awt.im.spi.InputMethodDescriptor)
|
||||
$(MKDIR) -p _the.tmp/META-INF/services && \
|
||||
$(CP) $(JDK_TOPDIR)/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor _the.tmp/META-INF/services && \
|
||||
cd _the.tmp && \
|
||||
$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar META-INF/services/java.awt.im.spi.InputMethodDescriptor && \
|
||||
cd META-INF/services && \
|
||||
$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar java.awt.im.spi.InputMethodDescriptor)
|
||||
$(RM) -r $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.tmp
|
||||
$(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,WireFrame,applets,,ThreeD,,,example*.html ThreeD.java))
|
||||
@ -175,193 +175,194 @@ $(eval $(call SetupDemo,VerboseGC,management,,VerboseGC,,,README*))
|
||||
$(eval $(call SetupDemo,zipfs,nio,,,,,README* *.java,,,,Main-Class: \n))
|
||||
|
||||
ifndef OPENJDK
|
||||
$(eval $(call SetupDemo,Laffy,jfc,,,,closed/,*))
|
||||
$(eval $(call SetupDemo,SwingSet3,jfc,,,,closed/,*))
|
||||
$(eval $(call SetupDemo,Laffy,jfc,,,,closed/,*))
|
||||
$(eval $(call SetupDemo,SwingSet3,jfc,,,,closed/,*))
|
||||
|
||||
$(eval $(call SetupDemo,Java2D,jfc,,java2d.Java2Demo,,closed/,*.html README*,Java2Demo))
|
||||
$(eval $(call SetupDemo,Stylepad,jfc,,Stylepad,\
|
||||
$(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,\
|
||||
SplashScreen-Image: resources/images/splash.png,true))
|
||||
$(eval $(call SetupDemo,Java2D,jfc,,java2d.Java2Demo,,closed/,*.html README*,Java2Demo))
|
||||
$(eval $(call SetupDemo,Stylepad,jfc,,Stylepad, \
|
||||
$(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, \
|
||||
SplashScreen-Image: resources/images/splash.png,true))
|
||||
|
||||
BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%,\
|
||||
$(JDK_OUTPUTDIR)/demo/nbproject/%,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/closed/share/demo/nbproject))
|
||||
$(JDK_OUTPUTDIR)/demo/nbproject/% : $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%
|
||||
$(call install-file)
|
||||
$(CHMOD) -f ug+w $@
|
||||
BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%, \
|
||||
$(JDK_OUTPUTDIR)/demo/nbproject/%, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/closed/share/demo/nbproject))
|
||||
|
||||
$(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%
|
||||
$(call install-file)
|
||||
$(CHMOD) -f ug+w $@
|
||||
endif
|
||||
|
||||
##################################################################################################
|
||||
|
||||
# In the old makefiles, j2dbench was not compiled.
|
||||
#$(eval $(call SetupDemo,J2DBench,java2d,/src,,j2dbench/J2DBench))
|
||||
# In the old makefiles, j2dbench was not compiled.
|
||||
#$(eval $(call SetupDemo,J2DBench, java2d, /src, , j2dbench/J2DBench))
|
||||
|
||||
# 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
|
||||
# makefiles. So we always exclude the README.txt and sample.makefile.txt
|
||||
# from the extra sources.
|
||||
# shared files are just the *.c and *.h files, not the README or sample
|
||||
# makefiles. So we always exclude the README.txt and sample.makefile.txt
|
||||
# from the extra sources.
|
||||
define SetupJVMTIDemo
|
||||
# Param 1 = Name of the demo
|
||||
# Param 2 = add these directories to the includes, default is agent_util
|
||||
# Param 3 = extra CFLAGS
|
||||
# Param 4 = C or C++ (defaults to C)
|
||||
# Param 5 = libs for posix
|
||||
# Param 6 = libs for windows
|
||||
# Param 7 = libs for solaris
|
||||
BUILD_DEMO_JVMTI_$1_EXTRA_SRC:= \
|
||||
$$(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/$1) \
|
||||
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/,$2))
|
||||
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)/sample.makefile.txt)
|
||||
BUILD_DEMO_JVMTI_$1_EXTRA_INC:=$$(addprefix -I,$$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC))
|
||||
BUILD_DEMO_JVMTI_$1_LANG:=C
|
||||
ifneq (,$4)
|
||||
BUILD_DEMO_JVMTI_$1_LANG:=$4
|
||||
endif
|
||||
ifeq (C++,$4)
|
||||
$1_EXTRA_CXX:=$(LDFLAGS_CXX_JDK) $(LIBCXX)
|
||||
endif
|
||||
# Param 1 = Name of the demo
|
||||
# Param 2 = add these directories to the includes, default is agent_util
|
||||
# Param 3 = extra CFLAGS
|
||||
# Param 4 = C or C++ (defaults to C)
|
||||
# Param 5 = libs for posix
|
||||
# Param 6 = libs for windows
|
||||
# Param 7 = libs for solaris
|
||||
BUILD_DEMO_JVMTI_$1_EXTRA_SRC := \
|
||||
$$(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/demo/jvmti/$1) \
|
||||
$$(wildcard $$(addprefix $(JDK_TOPDIR)/src/share/demo/jvmti/, $2))
|
||||
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)/sample.makefile.txt)
|
||||
BUILD_DEMO_JVMTI_$1_EXTRA_INC := $$(addprefix -I, $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC))
|
||||
BUILD_DEMO_JVMTI_$1_LANG := C
|
||||
ifneq (, $4)
|
||||
BUILD_DEMO_JVMTI_$1_LANG := $4
|
||||
endif
|
||||
ifeq (C++, $4)
|
||||
$1_EXTRA_CXX := $(LDFLAGS_CXX_JDK) $(LIBCXX)
|
||||
endif
|
||||
|
||||
$1_CXXFLAGS:=$(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \
|
||||
$$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \
|
||||
$(CXXFLAGS_DEBUG_SYMBOLS)
|
||||
ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH),waiters-sparc)
|
||||
$1_FILTER:=-xregs=no%appl
|
||||
$1_CXXFLAGS:=$$(filter-out $$($1_FILTER),$$($1_CXXFLAGS))
|
||||
endif
|
||||
$1_CXXFLAGS := $(CXXFLAGS_JDKLIB) -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 \
|
||||
$$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3 \
|
||||
$(CXXFLAGS_DEBUG_SYMBOLS)
|
||||
ifeq ($1-$(OPENJDK_TARGET_CPU_ARCH), waiters-sparc)
|
||||
$1_FILTER := -xregs=no%appl
|
||||
$1_CXXFLAGS := $$(filter-out $$($1_FILTER), $$($1_CXXFLAGS))
|
||||
endif
|
||||
|
||||
# Workaround for CFLAGS_JDKLIB containing ',' on solaris. If this is added as 'CFLAGS' to the
|
||||
# eval call below, the comma gets expanded too early.
|
||||
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
|
||||
# Workaround for CFLAGS_JDKLIB containing ',' on solaris. If this is added as 'CFLAGS' to the
|
||||
# eval call below, the comma gets expanded too early.
|
||||
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
|
||||
|
||||
# Remove the -incremental:no setting to get .ilk-files like in the old build.
|
||||
$$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1,\
|
||||
SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC),\
|
||||
LANG:=$$(BUILD_DEMO_JVMTI_$1_LANG),\
|
||||
OPTIMIZATION:=LOW,\
|
||||
CXXFLAGS:=$$($1_CXXFLAGS),\
|
||||
LDFLAGS:=$(filter-out -incremental:no -opt:ref,$(LDFLAGS_JDKLIB)),\
|
||||
LDFLAGS_macosx:=$(call SET_EXECUTABLE_ORIGIN),\
|
||||
LDFLAGS_SUFFIX:=$$($1_EXTRA_CXX),\
|
||||
LDFLAGS_SUFFIX_posix:=$5,\
|
||||
LDFLAGS_SUFFIX_windows:=$6,\
|
||||
LDFLAGS_SUFFIX_solaris:=$7 -lc,\
|
||||
LDFLAGS_SUFFIX_linux:=$8,\
|
||||
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
|
||||
RC_FLAGS:=$$(RC_FLAGS) \
|
||||
-D "JDK_FNAME=$1.dll" \
|
||||
-D "JDK_INTERNAL_NAME=$1" \
|
||||
-D "JDK_FTYPE=0x2L",\
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/demoobjs/jvmti/$1,\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib,\
|
||||
LIBRARY:=$1))
|
||||
# Remove the -incremental:no setting to get .ilk-files like in the old build.
|
||||
$$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
|
||||
SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
|
||||
LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
|
||||
OPTIMIZATION := LOW, \
|
||||
CXXFLAGS := $$($1_CXXFLAGS), \
|
||||
LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
|
||||
LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
|
||||
LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
|
||||
LDFLAGS_SUFFIX_posix := $5, \
|
||||
LDFLAGS_SUFFIX_windows := $6, \
|
||||
LDFLAGS_SUFFIX_solaris := $7 -lc, \
|
||||
LDFLAGS_SUFFIX_linux := $8, \
|
||||
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
|
||||
RC_FLAGS := $$(RC_FLAGS) \
|
||||
-D "JDK_FNAME=$1.dll" \
|
||||
-D "JDK_INTERNAL_NAME=$1" \
|
||||
-D "JDK_FTYPE=0x2L", \
|
||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1, \
|
||||
OUTPUT_DIR := $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib, \
|
||||
LIBRARY := $1))
|
||||
|
||||
$$(eval $$(call SetupZipArchive,BUILD_DEMO_JVMTI_SRC_$1,\
|
||||
SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC),\
|
||||
EXCLUDE_FILES:=$$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE), \
|
||||
ZIP:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip))
|
||||
$$(eval $$(call SetupZipArchive,BUILD_DEMO_JVMTI_SRC_$1, \
|
||||
SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
|
||||
EXCLUDE_FILES := $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE), \
|
||||
ZIP := $(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip))
|
||||
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt : $(JDK_TOPDIR)/src/share/demo/jvmti/$1/README.txt
|
||||
$$(call install-file)
|
||||
$(CHMOD) -f ug+w $$@
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt: $(JDK_TOPDIR)/src/share/demo/jvmti/$1/README.txt
|
||||
$$(call install-file)
|
||||
$(CHMOD) -f ug+w $$@
|
||||
|
||||
ifneq (,$$(wildcard $(JDK_TOPDIR)/src/share/demo/jvmti/$1/*.java))
|
||||
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_JVMTI_$1_JAVA,\
|
||||
SETUP:=GENERATE_USINGJDKBYTECODE,\
|
||||
SRC:=$(JDK_TOPDIR)/src/share/demo/jvmti/$1,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/democlasses/jvmti/$1,\
|
||||
COPY:=$(PATTERNS_TO_COPY),\
|
||||
JAR:=$(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar,\
|
||||
EXTRA_MANIFEST_ATTR:=Main-Class: \n,\
|
||||
MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf))
|
||||
ifneq (, $$(wildcard $(JDK_TOPDIR)/src/share/demo/jvmti/$1/*.java))
|
||||
$$(eval $$(call SetupJavaCompilation,BUILD_DEMO_JVMTI_$1_JAVA, \
|
||||
SETUP := GENERATE_USINGJDKBYTECODE, \
|
||||
SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1, \
|
||||
BIN := $(JDK_OUTPUTDIR)/democlasses/jvmti/$1, \
|
||||
COPY := $(PATTERNS_TO_COPY), \
|
||||
JAR := $(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar, \
|
||||
EXTRA_MANIFEST_ATTR := Main-Class: \n, \
|
||||
MANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf))
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar
|
||||
endif
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/$1.jar
|
||||
endif
|
||||
|
||||
BUILD_DEMOS += $$(BUILD_DEMO_JVMTI_$1) \
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip \
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt
|
||||
BUILD_DEMOS += $$(BUILD_DEMO_JVMTI_$1) \
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/src.zip \
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/README.txt
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
# These files normally end up in OBJECT_DIR but for demos they
|
||||
# are supposed to be included in the distro.
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib: $$(BUILD_DEMO_JVMTI_$1)
|
||||
$(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.lib $$@
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
# These files normally end up in OBJECT_DIR but for demos they
|
||||
# are supposed to be included in the distro.
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib: $$(BUILD_DEMO_JVMTI_$1)
|
||||
$(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.lib $$@
|
||||
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp: $$(BUILD_DEMO_JVMTI_$1)
|
||||
$(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.exp $$@
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp: $$(BUILD_DEMO_JVMTI_$1)
|
||||
$(CP) $(JDK_OUTPUTDIR)/demoobjs/jvmti/$1/$1.exp $$@
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib \
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp
|
||||
endif
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.lib \
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/$1/lib/$1.exp
|
||||
endif
|
||||
endef
|
||||
|
||||
$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util))
|
||||
$(eval $(call SetupJVMTIDemo,gctest, agent_util))
|
||||
$(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo))
|
||||
$(eval $(call SetupJVMTIDemo,heapViewer, agent_util))
|
||||
$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo,\
|
||||
-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))
|
||||
$(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util))
|
||||
$(eval $(call SetupJVMTIDemo,gctest, agent_util))
|
||||
$(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo))
|
||||
$(eval $(call SetupJVMTIDemo,heapViewer, agent_util))
|
||||
$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \
|
||||
-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))
|
||||
|
||||
$(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
|
||||
$(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
|
||||
$(eval $(call SetupJVMTIDemo,waiters, agent_util,,C++))
|
||||
$(eval $(call SetupJVMTIDemo,versionCheck, agent_util))
|
||||
$(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
|
||||
$(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
|
||||
$(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++))
|
||||
$(eval $(call SetupJVMTIDemo,versionCheck, agent_util))
|
||||
|
||||
##################################################################################################
|
||||
|
||||
# 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.
|
||||
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.
|
||||
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)
|
||||
(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)
|
||||
$(RM) $(@D)/_the.sources
|
||||
$(call ListPathsSafely,JPDA_FILES,\n, >> $(@D)/_the.sources)
|
||||
$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
|
||||
-e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $(JDK_TOPDIR)/make/tools/manifest.mf > $(@D)/_the.manifest
|
||||
$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
|
||||
-e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $(JDK_TOPDIR)/make/tools/manifest.mf > $(@D)/_the.manifest
|
||||
$(ECHO) "Main-Class: " >> $(@D)/_the.manifest
|
||||
(cd $(JDK_TOPDIR)/src/share/classes && $(JAR) cfm $@ $(@D)/_the.manifest @$(@D)/_the.sources)
|
||||
(cd $(JDK_TOPDIR)/src/share/classes && $(JAR) cfm $@ $(@D)/_the.manifest @$(@D)/_the.sources)
|
||||
(cd $(JDK_TOPDIR)/src/share/classes/com/sun/tools/example && $(JAR) uf $@ README)
|
||||
|
||||
$(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)
|
||||
$(CHMOD) -f ug+w $@
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jpda/src.zip $(JDK_OUTPUTDIR)/demo/jpda/examples.jar \
|
||||
$(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README
|
||||
$(JDK_OUTPUTDIR)/demo/jpda/com/sun/tools/example/README
|
||||
|
||||
##################################################################################################
|
||||
|
||||
$(JDK_OUTPUTDIR)/demo/management/index.html : $(JDK_TOPDIR)/src/share/demo/management/index.html
|
||||
$(JDK_OUTPUTDIR)/demo/management/index.html: $(JDK_TOPDIR)/src/share/demo/management/index.html
|
||||
$(call install-file)
|
||||
$(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)
|
||||
$(CHMOD) -f ug+w $@
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/management/index.html \
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/index.html
|
||||
$(JDK_OUTPUTDIR)/demo/jvmti/index.html
|
||||
|
||||
##################################################################################################
|
||||
|
||||
# The netbeans project files are copied into the demo directory.
|
||||
BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%,\
|
||||
$(JDK_OUTPUTDIR)/demo/nbproject/%,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/demo/nbproject))
|
||||
BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/share/demo/nbproject/%, \
|
||||
$(JDK_OUTPUTDIR)/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)
|
||||
$(CHMOD) -f ug+w $@
|
||||
|
||||
@ -376,64 +377,64 @@ BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/README
|
||||
|
||||
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)
|
||||
$(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)
|
||||
$(CHMOD) -f ug+w $@
|
||||
|
||||
$(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar : \
|
||||
$(JDK_OUTPUTDIR)/democlasses/jni/Poller/README.txt $(JDK_OUTPUTDIR)/democlasses/jni/Poller/Poller.c
|
||||
$(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar: \
|
||||
$(JDK_OUTPUTDIR)/democlasses/jni/Poller/README.txt $(JDK_OUTPUTDIR)/democlasses/jni/Poller/Poller.c
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_DEMO_POLLER_JAR,\
|
||||
SETUP:=GENERATE_USINGJDKBYTECODE, \
|
||||
SRC:=$(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \
|
||||
BIN:=$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
|
||||
HEADERS:=$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
|
||||
JAR:=$(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar, \
|
||||
MANIFEST:=$(JDK_TOPDIR)/make/tools/manifest.mf, \
|
||||
SRCZIP:=$(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip, \
|
||||
COPY:=README.txt Poller.c, \
|
||||
JARMAIN:=Client))
|
||||
$(eval $(call SetupJavaCompilation,BUILD_DEMO_POLLER_JAR, \
|
||||
SETUP := GENERATE_USINGJDKBYTECODE, \
|
||||
SRC := $(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \
|
||||
BIN := $(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
|
||||
HEADERS := $(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
|
||||
JAR := $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar, \
|
||||
MANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf, \
|
||||
SRCZIP := $(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip, \
|
||||
COPY := README.txt Poller.c, \
|
||||
JARMAIN := Client))
|
||||
|
||||
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar $(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip \
|
||||
$(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/jni/Poller/Poller.jar $(JDK_OUTPUTDIR)/demo/jni/Poller/src.zip \
|
||||
$(JDK_OUTPUTDIR)/demo/jni/Poller/README.txt
|
||||
|
||||
$(eval $(call SetupNativeCompilation,BUILD_LIBPOLLER,\
|
||||
SRC:=$(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \
|
||||
LANG:=C,\
|
||||
OPTIMIZATION:=LOW,\
|
||||
CFLAGS:=$(CFLAGS_JDKLIB) $(SHARED_LIBRARY_FLAGS) \
|
||||
-I$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
|
||||
LDFLAGS:=$(LDFLAGS_JDKLIB), \
|
||||
LDFLAGS_SUFFIX_solaris:=-lc,\
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/demoobjs/jni/Poller,\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/demoobjs, \
|
||||
LIBRARY:=Poller))
|
||||
$(eval $(call SetupNativeCompilation,BUILD_LIBPOLLER, \
|
||||
SRC := $(JDK_TOPDIR)/src/solaris/demo/jni/Poller, \
|
||||
LANG := C, \
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(CFLAGS_JDKLIB) $(SHARED_LIBRARY_FLAGS) \
|
||||
-I$(JDK_OUTPUTDIR)/democlasses/jni/Poller, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB), \
|
||||
LDFLAGS_SUFFIX_solaris := -lc, \
|
||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/demoobjs/jni/Poller, \
|
||||
OUTPUT_DIR := $(JDK_OUTPUTDIR)/demoobjs, \
|
||||
LIBRARY := Poller))
|
||||
|
||||
#
|
||||
# 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
|
||||
#
|
||||
# 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)/demo/jni/Poller/lib/$(LIBRARY_PREFIX)Poller$(SHARED_LIBRARY_SUFFIX) : \
|
||||
$(JDK_OUTPUTDIR)/demoobjs/$(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)
|
||||
$(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
|
||||
|
||||
##################################################################################################
|
||||
|
||||
ifndef OPENJDK
|
||||
DB_DEMO_ZIPFILE := $(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip)
|
||||
DB_DEMO_ZIPFILE := $(wildcard $(JDK_TOPDIR)/src/closed/share/db/*.zip)
|
||||
|
||||
$(JDK_OUTPUTDIR)/demo/_the.db.unzipped: $(DB_DEMO_ZIPFILE)
|
||||
$(JDK_OUTPUTDIR)/demo/_the.db.unzipped: $(DB_DEMO_ZIPFILE)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) -r $(JDK_OUTPUTDIR)/demo/db $(JDK_OUTPUTDIR)/demo/demo
|
||||
$(CD) $(JDK_OUTPUTDIR)/demo && $(UNZIP) -q -o $<
|
||||
@ -441,14 +442,14 @@ ifndef OPENJDK
|
||||
$(CD) $(JDK_OUTPUTDIR)/demo && $(RM) -r db-derby-*-bin
|
||||
$(TOUCH) $@
|
||||
|
||||
# Copy this after the unzip above to avoid race with directory creation and mv command.
|
||||
$(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html: \
|
||||
$(JDK_TOPDIR)/src/closed/share/db/README-JDK-DEMOS.html \
|
||||
| $(JDK_OUTPUTDIR)/demo/_the.db.unzipped
|
||||
# Copy this after the unzip above to avoid race with directory creation and mv command.
|
||||
$(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html: \
|
||||
$(JDK_TOPDIR)/src/closed/share/db/README-JDK-DEMOS.html \
|
||||
| $(JDK_OUTPUTDIR)/demo/_the.db.unzipped
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CAT) $< | $(SED) "s/XXXX/$(shell cat $(JDK_TOPDIR)/src/closed/share/db/COPYRIGHTYEAR)/" > $@
|
||||
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/_the.db.unzipped $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html
|
||||
BUILD_DEMOS += $(JDK_OUTPUTDIR)/demo/_the.db.unzipped $(JDK_OUTPUTDIR)/demo/db/README-JDK-DEMOS.html
|
||||
endif
|
||||
|
||||
##################################################################################################
|
||||
|
||||
@ -38,244 +38,244 @@ EXCLUDES :=
|
||||
|
||||
##########################################################################################
|
||||
|
||||
EXCLUDES += com/sun/pept \
|
||||
com/sun/tools/example/trace\
|
||||
com/sun/tools/example/debug/bdi\
|
||||
com/sun/tools/example/debug/event\
|
||||
com/sun/tools/example/debug/gui
|
||||
EXCLUDES += com/sun/pept \
|
||||
com/sun/tools/example/trace \
|
||||
com/sun/tools/example/debug/bdi \
|
||||
com/sun/tools/example/debug/event \
|
||||
com/sun/tools/example/debug/gui
|
||||
|
||||
ifdef OPENJDK
|
||||
EXCLUDES+= sun/dc \
|
||||
com/sun/jmx/snmp \
|
||||
sun/management/snmp \
|
||||
com/sun/script
|
||||
EXCLUDES += sun/dc \
|
||||
com/sun/jmx/snmp \
|
||||
sun/management/snmp \
|
||||
com/sun/script
|
||||
endif
|
||||
|
||||
ifndef OPENJDK
|
||||
# There exists two versions of this file...
|
||||
EXFILES := $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java
|
||||
# There exists two versions of this file...
|
||||
EXFILES := $(JDK_TOPDIR)/src/share/classes/javax/crypto/JarVerifier.java
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
# This gets built on unix platforms implicitly in the old build even though
|
||||
# it's excluded in the closed build.
|
||||
EXCLUDES+=sun/java2d/pisces
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
# This gets built on unix platforms implicitly in the old build even though
|
||||
# it's excluded in the closed build.
|
||||
EXCLUDES += sun/java2d/pisces
|
||||
|
||||
# AccessBridge is compiled separately below.
|
||||
EXFILES += AccessBridge.java \
|
||||
AccessBridgeLoader.java \
|
||||
com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java
|
||||
# This seems to never be built
|
||||
EXCLUDES += com/sun/java/accessibility/extensions
|
||||
endif
|
||||
# AccessBridge is compiled separately below.
|
||||
EXFILES += AccessBridge.java \
|
||||
AccessBridgeLoader.java \
|
||||
com/sun/java/accessibility/util/java/awt/ChoiceTranslator.java
|
||||
# This seems to never be built
|
||||
EXCLUDES += com/sun/java/accessibility/extensions
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS),solaris)
|
||||
# Exclude Solaris nio and two security related files in src/share/classes
|
||||
EXFILES += SolarisAclFileAttributeView.java \
|
||||
SolarisFileStore.java \
|
||||
SolarisFileSystem.java \
|
||||
SolarisFileSystemProvider.java \
|
||||
SolarisNativeDispatcher.java \
|
||||
SolarisUserDefinedFileAttributeView.java \
|
||||
SolarisWatchService.java \
|
||||
SolarisAclFileAttributeView.java \
|
||||
SolarisLoginModule.java \
|
||||
SolarisSystem.java \
|
||||
sun/nio/ch/DevPollArrayWrapper.java \
|
||||
sun/nio/ch/DevPollSelectorImpl.java \
|
||||
sun/nio/ch/DevPollSelectorProvider.java \
|
||||
sun/nio/ch/EventPortSelectorImpl.java \
|
||||
sun/nio/ch/EventPortSelectorProvider.java \
|
||||
sun/nio/ch/EventPortWrapper.java \
|
||||
sun/nio/ch/SolarisAsynchronousChannelProvider.java \
|
||||
sun/nio/ch/SolarisEventPort.java \
|
||||
sun/tools/attach/SolarisAttachProvider.java \
|
||||
sun/tools/attach/SolarisVirtualMachine.java
|
||||
ifneq ($(OPENJDK_TARGET_OS), solaris)
|
||||
# Exclude Solaris nio and two security related files in src/share/classes
|
||||
EXFILES += SolarisAclFileAttributeView.java \
|
||||
SolarisFileStore.java \
|
||||
SolarisFileSystem.java \
|
||||
SolarisFileSystemProvider.java \
|
||||
SolarisNativeDispatcher.java \
|
||||
SolarisUserDefinedFileAttributeView.java \
|
||||
SolarisWatchService.java \
|
||||
SolarisAclFileAttributeView.java \
|
||||
SolarisLoginModule.java \
|
||||
SolarisSystem.java \
|
||||
sun/nio/ch/DevPollArrayWrapper.java \
|
||||
sun/nio/ch/DevPollSelectorImpl.java \
|
||||
sun/nio/ch/DevPollSelectorProvider.java \
|
||||
sun/nio/ch/EventPortSelectorImpl.java \
|
||||
sun/nio/ch/EventPortSelectorProvider.java \
|
||||
sun/nio/ch/EventPortWrapper.java \
|
||||
sun/nio/ch/SolarisAsynchronousChannelProvider.java \
|
||||
sun/nio/ch/SolarisEventPort.java \
|
||||
sun/tools/attach/SolarisAttachProvider.java \
|
||||
sun/tools/attach/SolarisVirtualMachine.java
|
||||
|
||||
EXCLUDES += com/oracle/security
|
||||
EXCLUDES += com/oracle/security
|
||||
endif
|
||||
|
||||
# In the old build, this isn't excluded on macosx, even though it probably
|
||||
# should be.
|
||||
ifneq ($(OPENJDK_TARGET_OS),macosx)
|
||||
EXFILES+=WrapperGenerator.java
|
||||
ifneq ($(OPENJDK_TARGET_OS), macosx)
|
||||
EXFILES += WrapperGenerator.java
|
||||
endif
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS),windows)
|
||||
# Exclude Window security related files in src/share/classes
|
||||
EXFILES+=NTLoginModule.java \
|
||||
NTSystem.java
|
||||
ifneq ($(OPENJDK_TARGET_OS), windows)
|
||||
# Exclude Window security related files in src/share/classes
|
||||
EXFILES += NTLoginModule.java \
|
||||
NTSystem.java
|
||||
else
|
||||
EXFILES+=UnixLoginModule.java \
|
||||
UnixSystem.java
|
||||
EXFILES += UnixLoginModule.java \
|
||||
UnixSystem.java
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
# Don't build GTK L&F on Windows
|
||||
EXCLUDES+=com/sun/java/swing/plaf/gtk
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
# Don't build GTK L&F on Windows
|
||||
EXCLUDES += com/sun/java/swing/plaf/gtk
|
||||
endif
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS),linux)
|
||||
EXFILES+=sun/tools/attach/LinuxAttachProvider.java \
|
||||
sun/tools/attach/LinuxVirtualMachine.java \
|
||||
sun/nio/ch/EPoll.java \
|
||||
sun/nio/ch/EPollArrayWrapper.java \
|
||||
sun/nio/ch/EPollPort.java \
|
||||
sun/nio/ch/EPollSelectorImpl.java \
|
||||
sun/nio/ch/EPollSelectorProvider.java \
|
||||
sun/nio/ch/LinuxAsynchronousChannelProvider.java \
|
||||
sun/nio/fs/LinuxDosFileAttributeView.java \
|
||||
sun/nio/fs/LinuxFileStore.java \
|
||||
sun/nio/fs/LinuxFileSystem.java \
|
||||
sun/nio/fs/LinuxFileSystemProvider.java \
|
||||
sun/nio/fs/MagicFileTypeDetector.java \
|
||||
sun/nio/fs/LinuxNativeDispatcher.java \
|
||||
sun/nio/fs/LinuxUserDefinedFileAttributeView.java \
|
||||
sun/nio/fs/LinuxWatchService.java
|
||||
ifneq ($(OPENJDK_TARGET_OS), linux)
|
||||
EXFILES += sun/tools/attach/LinuxAttachProvider.java \
|
||||
sun/tools/attach/LinuxVirtualMachine.java \
|
||||
sun/nio/ch/EPoll.java \
|
||||
sun/nio/ch/EPollArrayWrapper.java \
|
||||
sun/nio/ch/EPollPort.java \
|
||||
sun/nio/ch/EPollSelectorImpl.java \
|
||||
sun/nio/ch/EPollSelectorProvider.java \
|
||||
sun/nio/ch/LinuxAsynchronousChannelProvider.java \
|
||||
sun/nio/fs/LinuxDosFileAttributeView.java \
|
||||
sun/nio/fs/LinuxFileStore.java \
|
||||
sun/nio/fs/LinuxFileSystem.java \
|
||||
sun/nio/fs/LinuxFileSystemProvider.java \
|
||||
sun/nio/fs/MagicFileTypeDetector.java \
|
||||
sun/nio/fs/LinuxNativeDispatcher.java \
|
||||
sun/nio/fs/LinuxUserDefinedFileAttributeView.java \
|
||||
sun/nio/fs/LinuxWatchService.java
|
||||
endif
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS),macosx)
|
||||
EXFILES+=sun/nio/ch/BsdAsynchronousChannelProvider.java \
|
||||
sun/nio/ch/KQueue.java \
|
||||
sun/nio/ch/KQueuePort.java \
|
||||
sun/nio/fs/BsdFileStore.java \
|
||||
sun/nio/fs/BsdFileSystem.java \
|
||||
sun/nio/fs/BsdFileSystemProvider.java \
|
||||
sun/nio/fs/BsdNativeDispatcher.java \
|
||||
sun/nio/fs/MacOSXFileSystemProvider.java \
|
||||
sun/nio/fs/MacOSXFileSystem.java \
|
||||
sun/nio/fs/MacOSXNativeDispatcher.java \
|
||||
sun/tools/attach/BsdAttachProvider.java \
|
||||
sun/tools/attach/BsdVirtualMachine.java
|
||||
ifneq ($(OPENJDK_TARGET_OS), macosx)
|
||||
EXFILES += sun/nio/ch/BsdAsynchronousChannelProvider.java \
|
||||
sun/nio/ch/KQueue.java \
|
||||
sun/nio/ch/KQueuePort.java \
|
||||
sun/nio/fs/BsdFileStore.java \
|
||||
sun/nio/fs/BsdFileSystem.java \
|
||||
sun/nio/fs/BsdFileSystemProvider.java \
|
||||
sun/nio/fs/BsdNativeDispatcher.java \
|
||||
sun/nio/fs/MacOSXFileSystemProvider.java \
|
||||
sun/nio/fs/MacOSXFileSystem.java \
|
||||
sun/nio/fs/MacOSXNativeDispatcher.java \
|
||||
sun/tools/attach/BsdAttachProvider.java \
|
||||
sun/tools/attach/BsdVirtualMachine.java
|
||||
endif
|
||||
|
||||
# Exclude BreakIterator classes that are just used in compile process to generate
|
||||
# data files and shouldn't go in the product
|
||||
EXFILES+=sun/text/resources/BreakIteratorRules.java \
|
||||
sun/text/resources/BreakIteratorRules_th.java
|
||||
EXFILES += sun/text/resources/BreakIteratorRules.java \
|
||||
sun/text/resources/BreakIteratorRules_th.java
|
||||
|
||||
# TODO: Add BUILD_HEADLESS_ONLY to configure?
|
||||
ifdef BUILD_HEADLESS_ONLY
|
||||
EXCLUDES+=sun/applet
|
||||
EXCLUDES += sun/applet
|
||||
endif
|
||||
|
||||
ifdef OPENJDK
|
||||
EXCLUDES+=sun/java2d/cmm/kcms
|
||||
EXCLUDES += sun/java2d/cmm/kcms
|
||||
endif
|
||||
|
||||
# Used on windows and macosx
|
||||
ifeq (,$(filter $(OPENJDK_TARGET_OS), windows macosx))
|
||||
EXFILES+=sun/awt/AWTCharset.java
|
||||
ifeq (, $(filter $(OPENJDK_TARGET_OS), windows macosx))
|
||||
EXFILES += sun/awt/AWTCharset.java
|
||||
endif
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS), macosx)
|
||||
EXFILES+=sun/awt/X11/ScreenFormat.java \
|
||||
sun/awt/X11/XArc.java \
|
||||
sun/awt/X11/XChar2b.java \
|
||||
sun/awt/X11/XCharStruct.java \
|
||||
sun/awt/X11/XClassHint.java \
|
||||
sun/awt/X11/XComposeStatus.java \
|
||||
sun/awt/X11/XExtCodes.java \
|
||||
sun/awt/X11/XFontProp.java \
|
||||
sun/awt/X11/XFontSetExtents.java \
|
||||
sun/awt/X11/XFontStruct.java \
|
||||
sun/awt/X11/XGCValues.java \
|
||||
sun/awt/X11/XHostAddress.java \
|
||||
sun/awt/X11/XIMCallback.java \
|
||||
sun/awt/X11/XIMHotKeyTrigger.java \
|
||||
sun/awt/X11/XIMHotKeyTriggers.java \
|
||||
sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
|
||||
sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
|
||||
sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
|
||||
sun/awt/X11/XIMStatusDrawCallbackStruct.java \
|
||||
sun/awt/X11/XIMStringConversionCallbackStruct.java \
|
||||
sun/awt/X11/XIMStringConversionText.java \
|
||||
sun/awt/X11/XIMStyles.java \
|
||||
sun/awt/X11/XIMText.java \
|
||||
sun/awt/X11/XIMValuesList.java \
|
||||
sun/awt/X11/XImage.java \
|
||||
sun/awt/X11/XKeyboardControl.java \
|
||||
sun/awt/X11/XKeyboardState.java \
|
||||
sun/awt/X11/XOMCharSetList.java \
|
||||
sun/awt/X11/XOMFontInfo.java \
|
||||
sun/awt/X11/XOMOrientation.java \
|
||||
sun/awt/X11/XPoint.java \
|
||||
sun/awt/X11/XRectangle.java \
|
||||
sun/awt/X11/XSegment.java \
|
||||
sun/awt/X11/XStandardColormap.java \
|
||||
sun/awt/X11/XTextItem.java \
|
||||
sun/awt/X11/XTextItem16.java \
|
||||
sun/awt/X11/XTextProperty.java \
|
||||
sun/awt/X11/XTimeCoord.java \
|
||||
sun/awt/X11/XWindowChanges.java \
|
||||
sun/awt/X11/XdbeSwapInfo.java \
|
||||
sun/awt/X11/XmbTextItem.java \
|
||||
sun/awt/X11/XwcTextItem.java
|
||||
EXFILES += sun/awt/X11/ScreenFormat.java \
|
||||
sun/awt/X11/XArc.java \
|
||||
sun/awt/X11/XChar2b.java \
|
||||
sun/awt/X11/XCharStruct.java \
|
||||
sun/awt/X11/XClassHint.java \
|
||||
sun/awt/X11/XComposeStatus.java \
|
||||
sun/awt/X11/XExtCodes.java \
|
||||
sun/awt/X11/XFontProp.java \
|
||||
sun/awt/X11/XFontSetExtents.java \
|
||||
sun/awt/X11/XFontStruct.java \
|
||||
sun/awt/X11/XGCValues.java \
|
||||
sun/awt/X11/XHostAddress.java \
|
||||
sun/awt/X11/XIMCallback.java \
|
||||
sun/awt/X11/XIMHotKeyTrigger.java \
|
||||
sun/awt/X11/XIMHotKeyTriggers.java \
|
||||
sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
|
||||
sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
|
||||
sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
|
||||
sun/awt/X11/XIMStatusDrawCallbackStruct.java \
|
||||
sun/awt/X11/XIMStringConversionCallbackStruct.java \
|
||||
sun/awt/X11/XIMStringConversionText.java \
|
||||
sun/awt/X11/XIMStyles.java \
|
||||
sun/awt/X11/XIMText.java \
|
||||
sun/awt/X11/XIMValuesList.java \
|
||||
sun/awt/X11/XImage.java \
|
||||
sun/awt/X11/XKeyboardControl.java \
|
||||
sun/awt/X11/XKeyboardState.java \
|
||||
sun/awt/X11/XOMCharSetList.java \
|
||||
sun/awt/X11/XOMFontInfo.java \
|
||||
sun/awt/X11/XOMOrientation.java \
|
||||
sun/awt/X11/XPoint.java \
|
||||
sun/awt/X11/XRectangle.java \
|
||||
sun/awt/X11/XSegment.java \
|
||||
sun/awt/X11/XStandardColormap.java \
|
||||
sun/awt/X11/XTextItem.java \
|
||||
sun/awt/X11/XTextItem16.java \
|
||||
sun/awt/X11/XTextProperty.java \
|
||||
sun/awt/X11/XTimeCoord.java \
|
||||
sun/awt/X11/XWindowChanges.java \
|
||||
sun/awt/X11/XdbeSwapInfo.java \
|
||||
sun/awt/X11/XmbTextItem.java \
|
||||
sun/awt/X11/XwcTextItem.java
|
||||
endif
|
||||
|
||||
# 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))
|
||||
#
|
||||
# only solaris and macosx
|
||||
#
|
||||
EXFILES+=sun/nio/fs/PollingWatchService.java
|
||||
ifeq (, $(filter $(OPENJDK_TARGET_OS), solaris macosx))
|
||||
#
|
||||
# only solaris and macosx
|
||||
#
|
||||
EXFILES += sun/nio/fs/PollingWatchService.java
|
||||
endif
|
||||
|
||||
# TODO: Fix when converting NIO
|
||||
# Exclude *-linux-arm.java and *-linux-ppc.java from closed.
|
||||
EXFILES+=-linux-arm.java \
|
||||
-linux-ppc.java
|
||||
EXFILES += -linux-arm.java \
|
||||
-linux-ppc.java
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
EXFILES+=sun/nio/ch/AbstractPollSelectorImpl.java \
|
||||
sun/nio/ch/PollSelectorProvider.java \
|
||||
sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
|
||||
EXFILES += sun/nio/ch/AbstractPollSelectorImpl.java \
|
||||
sun/nio/ch/PollSelectorProvider.java \
|
||||
sun/nio/ch/SimpleAsynchronousFileChannelImpl.java
|
||||
endif
|
||||
|
||||
# These files do not appear in the build result of the old build. This
|
||||
# is because they are generated sources, but the AUTO_JAVA_FILES won't
|
||||
# pick them up since they aren't generated when the source dirs are
|
||||
# pick them up since they aren't generated when the source dirs are
|
||||
# searched and they aren't referenced by any other classes so they won't
|
||||
# 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.
|
||||
EXFILES+=javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
|
||||
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
|
||||
javax/swing/plaf/nimbus/ScrollBarPainter.java \
|
||||
javax/swing/plaf/nimbus/SliderPainter.java \
|
||||
javax/swing/plaf/nimbus/SpinnerPainter.java \
|
||||
javax/swing/plaf/nimbus/SplitPanePainter.java \
|
||||
javax/swing/plaf/nimbus/TabbedPanePainter.java
|
||||
EXFILES += javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
|
||||
javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
|
||||
javax/swing/plaf/nimbus/ScrollBarPainter.java \
|
||||
javax/swing/plaf/nimbus/SliderPainter.java \
|
||||
javax/swing/plaf/nimbus/SpinnerPainter.java \
|
||||
javax/swing/plaf/nimbus/SplitPanePainter.java \
|
||||
javax/swing/plaf/nimbus/TabbedPanePainter.java
|
||||
|
||||
# Acquire a list of files that should be copied straight over to the classes.
|
||||
include CopyIntoClasses.gmk
|
||||
# Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA
|
||||
|
||||
ifndef OPENJDK
|
||||
CLOSED_SRC_DIRS:=$(JDK_TOPDIR)/src/closed/share/classes \
|
||||
$(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
|
||||
CLOSED_SRC_DIRS := $(JDK_TOPDIR)/src/closed/share/classes \
|
||||
$(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
|
||||
endif
|
||||
|
||||
MACOSX_SRC_DIRS :=
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes
|
||||
|
||||
# this files are duplicated in MACOSX_SRC_DIRS
|
||||
EXFILES+= $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java
|
||||
# this files are duplicated in MACOSX_SRC_DIRS
|
||||
EXFILES += $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java
|
||||
|
||||
# JObjC.jar contains 1.5 byte-code...so skip it here :-(
|
||||
# MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/jobjc/src
|
||||
# EXCLUDES+= tests/java/com/apple/jobjc
|
||||
# JObjC.jar contains 1.5 byte-code...so skip it here :-(
|
||||
# MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/jobjc/src
|
||||
# EXCLUDES += tests/java/com/apple/jobjc
|
||||
|
||||
EXCLUDES+= com/apple/jobjc
|
||||
EXCLUDES += com/apple/jobjc
|
||||
endif
|
||||
|
||||
# The exception handling of swing beaninfo
|
||||
@ -288,34 +288,34 @@ $(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
|
||||
# be recompiled. If multiple paths are separated by comma, convert that into a
|
||||
# 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,\
|
||||
SETUP:=GENERATE_JDKBYTECODE,\
|
||||
SRC:=$(JDK_TOPDIR)/src/share/classes \
|
||||
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
|
||||
$(MACOSX_SRC_DIRS) \
|
||||
$(JDK_OUTPUTDIR)/gensrc \
|
||||
$(JDK_OUTPUTDIR)/gensrc_no_srczip \
|
||||
$(CLOSED_SRC_DIRS),\
|
||||
INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
|
||||
EXCLUDES:=$(EXCLUDES),\
|
||||
EXCLUDE_FILES:=$(EXFILES),\
|
||||
BIN:=$(JDK_OUTPUTDIR)/classes,\
|
||||
COPY:=$(COPY_PATTERNS),\
|
||||
COPY_FILES:=$(COPY_FILES),\
|
||||
HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers))
|
||||
$(eval $(call SetupJavaCompilation,BUILD_JDK, \
|
||||
SETUP := GENERATE_JDKBYTECODE, \
|
||||
SRC := $(JDK_TOPDIR)/src/share/classes \
|
||||
$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
|
||||
$(MACOSX_SRC_DIRS) \
|
||||
$(JDK_OUTPUTDIR)/gensrc \
|
||||
$(JDK_OUTPUTDIR)/gensrc_no_srczip \
|
||||
$(CLOSED_SRC_DIRS), \
|
||||
INCLUDES := $(JDK_USER_DEFINED_FILTER), \
|
||||
EXCLUDES := $(EXCLUDES), \
|
||||
EXCLUDE_FILES := $(EXFILES), \
|
||||
BIN := $(JDK_OUTPUTDIR)/classes, \
|
||||
COPY := $(COPY_PATTERNS), \
|
||||
COPY_FILES := $(COPY_FILES), \
|
||||
HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers))
|
||||
|
||||
##########################################################################################
|
||||
|
||||
ifndef OPENJDK
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_ALTCLASSES,\
|
||||
SETUP:=GENERATE_JDKBYTECODE,\
|
||||
SRC:=$(JDK_TOPDIR)/src/closed/share/altclasses, \
|
||||
BIN:=$(JDK_OUTPUTDIR)/altclasses_classes))
|
||||
$(eval $(call SetupJavaCompilation,BUILD_ALTCLASSES, \
|
||||
SETUP := GENERATE_JDKBYTECODE, \
|
||||
SRC := $(JDK_TOPDIR)/src/closed/share/altclasses, \
|
||||
BIN := $(JDK_OUTPUTDIR)/altclasses_classes))
|
||||
|
||||
$(BUILD_ALTCLASSES): $(BUILD_JDK)
|
||||
$(BUILD_ALTCLASSES): $(BUILD_JDK)
|
||||
|
||||
endif
|
||||
|
||||
@ -327,85 +327,85 @@ $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin:
|
||||
|
||||
##########################################################################################
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
#
|
||||
# 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 :-(
|
||||
#
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_15BYTECODE,\
|
||||
JAVAC:=$(JAVAC),\
|
||||
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_JVM:=$(SJAVAC_SERVER_JAVA)))
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
#
|
||||
# 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 :-(
|
||||
#
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_15BYTECODE, \
|
||||
JAVAC := $(JAVAC), \
|
||||
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_JVM := $(SJAVAC_SERVER_JAVA)))
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_JOBJC,\
|
||||
SETUP:=GENERATE_15BYTECODE,\
|
||||
DISABLE_SJAVAC:=true,\
|
||||
SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
|
||||
$(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
|
||||
$(JDK_OUTPUTDIR)/gensrc_jobjc/src, \
|
||||
INCLUDES := com/apple/jobjc,\
|
||||
EXCLUDES := tests/java/com/apple/jobjc,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/jobjc_classes,\
|
||||
JAR:=$(JDK_OUTPUTDIR)/lib/JObjC.jar, \
|
||||
JARINDEX := true))
|
||||
$(eval $(call SetupJavaCompilation,BUILD_JOBJC, \
|
||||
SETUP := GENERATE_15BYTECODE, \
|
||||
DISABLE_SJAVAC := true, \
|
||||
SRC := $(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
|
||||
$(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
|
||||
$(JDK_OUTPUTDIR)/gensrc_jobjc/src, \
|
||||
INCLUDES := com/apple/jobjc, \
|
||||
EXCLUDES := tests/java/com/apple/jobjc, \
|
||||
BIN := $(JDK_OUTPUTDIR)/jobjc_classes, \
|
||||
JAR := $(JDK_OUTPUTDIR)/lib/JObjC.jar, \
|
||||
JARINDEX := true))
|
||||
|
||||
$(BUILD_JOBJC) : $(BUILD_JDK)
|
||||
$(BUILD_JOBJC): $(BUILD_JDK)
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_JOBJC_HEADERS,\
|
||||
SETUP:=GENERATE_JDKBYTECODE,\
|
||||
SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
|
||||
$(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
|
||||
$(JDK_OUTPUTDIR)/gensrc_jobjc/src, \
|
||||
INCLUDES := com/apple/jobjc,\
|
||||
EXCLUDES := tests/java/com/apple/jobjc,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/jobjc_classes_headers,\
|
||||
HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers_jobjc))
|
||||
$(eval $(call SetupJavaCompilation,BUILD_JOBJC_HEADERS, \
|
||||
SETUP := GENERATE_JDKBYTECODE, \
|
||||
SRC := $(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
|
||||
$(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
|
||||
$(JDK_OUTPUTDIR)/gensrc_jobjc/src, \
|
||||
INCLUDES := com/apple/jobjc, \
|
||||
EXCLUDES := tests/java/com/apple/jobjc, \
|
||||
BIN := $(JDK_OUTPUTDIR)/jobjc_classes_headers, \
|
||||
HEADERS := $(JDK_OUTPUTDIR)/gensrc_headers_jobjc))
|
||||
|
||||
$(BUILD_JOBJC_HEADERS) : $(BUILD_JDK)
|
||||
$(BUILD_JOBJC_HEADERS): $(BUILD_JDK)
|
||||
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
|
||||
ifndef OPENJDK
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
|
||||
$(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_32,\
|
||||
SETUP:=GENERATE_JDKBYTECODE,\
|
||||
JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\
|
||||
SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/32bit,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/classes_ab/32bit))
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
|
||||
$(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_32, \
|
||||
SETUP := GENERATE_JDKBYTECODE, \
|
||||
JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \
|
||||
SRC := $(JDK_OUTPUTDIR)/gensrc_ab/32bit, \
|
||||
BIN := $(JDK_OUTPUTDIR)/classes_ab/32bit))
|
||||
|
||||
$(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK)
|
||||
$(BUILD_ACCESSBRIDGE_32): $(BUILD_JDK)
|
||||
|
||||
$(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_LEGACY,\
|
||||
SETUP:=GENERATE_JDKBYTECODE,\
|
||||
JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\
|
||||
SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/legacy,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/classes_ab/legacy))
|
||||
$(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_LEGACY, \
|
||||
SETUP := GENERATE_JDKBYTECODE, \
|
||||
JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \
|
||||
SRC := $(JDK_OUTPUTDIR)/gensrc_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,\
|
||||
SETUP:=GENERATE_JDKBYTECODE,\
|
||||
JAVAC_FLAGS:=-cp $(JDK_OUTPUTDIR)/classes,\
|
||||
SRC:=$(JDK_OUTPUTDIR)/gensrc_ab/64bit,\
|
||||
BIN:=$(JDK_OUTPUTDIR)/classes_ab/64bit))
|
||||
$(eval $(call SetupJavaCompilation,BUILD_ACCESSBRIDGE_64, \
|
||||
SETUP := GENERATE_JDKBYTECODE, \
|
||||
JAVAC_FLAGS := -cp $(JDK_OUTPUTDIR)/classes, \
|
||||
SRC := $(JDK_OUTPUTDIR)/gensrc_ab/64bit, \
|
||||
BIN := $(JDK_OUTPUTDIR)/classes_ab/64bit))
|
||||
|
||||
$(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK)
|
||||
$(BUILD_ACCESSBRIDGE_64): $(BUILD_JDK)
|
||||
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
|
||||
all: $(BUILD_JDK) $(BUILD_ALTCLASSES) $(BUILD_JOBJC) $(BUILD_JOBJC_HEADERS) $(COPY_EXTRA) \
|
||||
$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
|
||||
$(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \
|
||||
$(BUILD_ACCESSBRIDGE_LEGACY)
|
||||
$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
|
||||
$(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \
|
||||
$(BUILD_ACCESSBRIDGE_LEGACY)
|
||||
|
||||
.PHONY: all
|
||||
|
||||
@ -33,27 +33,27 @@ include NativeCompilation.gmk
|
||||
include Setup.gmk
|
||||
|
||||
# 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
|
||||
include Tools.gmk
|
||||
|
||||
BUILD_LAUNCHERS=
|
||||
BUILD_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.
|
||||
ifeq ($(OVERLAY_IMAGES),true)
|
||||
ORIGIN_ROOT:=/../..
|
||||
OUTPUT_SUBDIR:=$(OPENJDK_TARGET_CPU_ISADIR)
|
||||
ifeq ($(OVERLAY_IMAGES), true)
|
||||
ORIGIN_ROOT := /../..
|
||||
OUTPUT_SUBDIR := $(OPENJDK_TARGET_CPU_ISADIR)
|
||||
else
|
||||
ORIGIN_ROOT:=/..
|
||||
ORIGIN_ROOT := /..
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN)
|
||||
ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
|
||||
else
|
||||
ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) \
|
||||
$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
|
||||
ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) \
|
||||
$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
|
||||
endif
|
||||
|
||||
#
|
||||
@ -61,158 +61,158 @@ endif
|
||||
# System.loadLibrary("jawt") first. This was the behaviour described in the
|
||||
# devloper documentation of JAWT and what worked with OpenJDK6.
|
||||
#
|
||||
ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),)
|
||||
ORIGIN_ARG+=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) \
|
||||
$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR))
|
||||
ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), )
|
||||
ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) \
|
||||
$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR))
|
||||
endif
|
||||
|
||||
define SetupLauncher
|
||||
# TODO: Fix mapfile on solaris. Won't work with ld as linker.
|
||||
# Parameter 1 is the name of the launcher (java,javac,jar...)
|
||||
# Parameter 2 is extra CFLAGS
|
||||
# Parameter 3 is extra LDFLAGS
|
||||
# Parameter 4 is extra LDFLAGS_SUFFIX_posix
|
||||
# Parameter 5 is extra LDFLAGS_SUFFIX_windows
|
||||
# Parameter 6 is optional Windows JLI library (full path)
|
||||
# Parameter 7 is optional Windows resource (RC) flags
|
||||
# Parameter 8 is optional Windows version resource file (.rc)
|
||||
# Parameter 9 is different output dir
|
||||
# Parameter 10 if set, link statically with c runtime on windows.
|
||||
# Parameter 11 if set, override plist file on macosx.
|
||||
# TODO: Fix mapfile on solaris. Won't work with ld as linker.
|
||||
# Parameter 1 is the name of the launcher (java, javac, jar...)
|
||||
# Parameter 2 is extra CFLAGS
|
||||
# Parameter 3 is extra LDFLAGS
|
||||
# Parameter 4 is extra LDFLAGS_SUFFIX_posix
|
||||
# Parameter 5 is extra LDFLAGS_SUFFIX_windows
|
||||
# Parameter 6 is optional Windows JLI library (full path)
|
||||
# Parameter 7 is optional Windows resource (RC) flags
|
||||
# Parameter 8 is optional Windows version resource file (.rc)
|
||||
# Parameter 9 is different output dir
|
||||
# Parameter 10 if set, link statically with c runtime on windows.
|
||||
# Parameter 11 if set, override plist file on macosx.
|
||||
|
||||
$1_WINDOWS_JLI_LIB:=$(JDK_OUTPUTDIR)/objs/libjli/jli.lib
|
||||
ifneq ($6,)
|
||||
$1_WINDOWS_JLI_LIB:=$6
|
||||
endif
|
||||
$1_VERSION_INFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc
|
||||
ifneq ($8,)
|
||||
$1_VERSION_INFO_RESOURCE:=$8
|
||||
$1_WINDOWS_JLI_LIB := $(JDK_OUTPUTDIR)/objs/libjli/jli.lib
|
||||
ifneq ($6, )
|
||||
$1_WINDOWS_JLI_LIB := $6
|
||||
endif
|
||||
$1_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc
|
||||
ifneq ($8, )
|
||||
$1_VERSION_INFO_RESOURCE := $8
|
||||
endif
|
||||
|
||||
$1_LDFLAGS := $3
|
||||
$1_LDFLAGS_SUFFIX :=
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
$1_PLIST_FILE := Info-cmdline.plist
|
||||
ifneq ($(11), )
|
||||
$1_PLIST_FILE := $(11)
|
||||
ifneq ($$(findstring privileged, $$($1_PLIST_FILE)), )
|
||||
$1_CODESIGN := true
|
||||
endif
|
||||
endif
|
||||
|
||||
$1_LDFLAGS := $3
|
||||
$1_LDFLAGS_SUFFIX :=
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
$1_PLIST_FILE:=Info-cmdline.plist
|
||||
ifneq ($(11),)
|
||||
$1_PLIST_FILE:=$(11)
|
||||
ifneq ($$(findstring privileged,$$($1_PLIST_FILE)),)
|
||||
$1_CODESIGN:=true
|
||||
endif
|
||||
endif
|
||||
|
||||
$1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
|
||||
-framework Cocoa -framework Security -framework ApplicationServices \
|
||||
-sectcreate __TEXT __info_plist $(JDK_TOPDIR)/src/macosx/lib/$$($1_PLIST_FILE)
|
||||
$1_LDFLAGS += -Wl,-all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
|
||||
-framework Cocoa -framework Security -framework ApplicationServices \
|
||||
-sectcreate __TEXT __info_plist $(JDK_TOPDIR)/src/macosx/lib/$$($1_PLIST_FILE)
|
||||
$1_LDFLAGS_SUFFIX += -pthread
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(USE_EXTERNAL_LIBZ), true)
|
||||
$1_LDFLAGS_SUFFIX += -lz
|
||||
endif
|
||||
ifeq ($(USE_EXTERNAL_LIBZ), true)
|
||||
$1_LDFLAGS_SUFFIX += -lz
|
||||
endif
|
||||
|
||||
$1_OUTPUT_DIR_ARG:=$9
|
||||
ifeq (,$$($1_OUTPUT_DIR_ARG))
|
||||
$1_OUTPUT_DIR_ARG:=$(JDK_OUTPUTDIR)/bin
|
||||
endif
|
||||
$1_OUTPUT_DIR_ARG := $9
|
||||
ifeq (, $$($1_OUTPUT_DIR_ARG))
|
||||
$1_OUTPUT_DIR_ARG := $(JDK_OUTPUTDIR)/bin
|
||||
endif
|
||||
|
||||
# TODO: maybe it's better to move this if-statement out of this function
|
||||
ifeq ($1,java)
|
||||
$1_OPTIMIZATION_ARG:=HIGH
|
||||
$1_LDFLAGS_solaris:=-R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR)
|
||||
else
|
||||
$1_OPTIMIZATION_ARG:=LOW
|
||||
endif
|
||||
# TODO: maybe it's better to move this if-statement out of this function
|
||||
ifeq ($1, java)
|
||||
$1_OPTIMIZATION_ARG := HIGH
|
||||
$1_LDFLAGS_solaris := -R$(OPENWIN_HOME)/lib$(OPENJDK_TARGET_CPU_ISADIR)
|
||||
else
|
||||
$1_OPTIMIZATION_ARG := LOW
|
||||
endif
|
||||
|
||||
$1_CFLAGS:=$(CFLAGS_JDKEXE)
|
||||
ifeq ($(10),true)
|
||||
$1_CFLAGS:=$(filter-out -MD,$(CFLAGS_JDKEXE))
|
||||
endif
|
||||
$1_CFLAGS := $(CFLAGS_JDKEXE)
|
||||
ifeq ($(10), true)
|
||||
$1_CFLAGS := $(filter-out -MD, $(CFLAGS_JDKEXE))
|
||||
endif
|
||||
|
||||
ifneq ($(wildcard $(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)),)
|
||||
$1_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)
|
||||
else
|
||||
$1_MAPFILE:=
|
||||
endif
|
||||
ifneq ($(wildcard $(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), )
|
||||
$1_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)
|
||||
else
|
||||
$1_MAPFILE :=
|
||||
endif
|
||||
|
||||
$(call SetupNativeCompilation,BUILD_LAUNCHER_$1,\
|
||||
SRC:=$(JDK_TOPDIR)/src/share/bin,\
|
||||
INCLUDE_FILES:=main.c,\
|
||||
LANG:=C,\
|
||||
OPTIMIZATION:=$$($1_OPTIMIZATION_ARG), \
|
||||
CFLAGS:=$$($1_CFLAGS) \
|
||||
-I$(JDK_TOPDIR)/src/share/bin \
|
||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin \
|
||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS)/bin \
|
||||
-DFULL_VERSION='"$(FULL_VERSION)"' \
|
||||
-DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
|
||||
-DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
|
||||
-DLIBARCHNAME='"$(OPENJDK_TARGET_CPU_LEGACY)"' \
|
||||
-DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
|
||||
-DPROGNAME='"$1"' $(DPACKAGEPATH) \
|
||||
$2,\
|
||||
CFLAGS_linux:=-fPIC,\
|
||||
CFLAGS_solaris:=-KPIC -DHAVE_GETHRTIME,\
|
||||
LDFLAGS:=$(LDFLAGS_JDKEXE) \
|
||||
$(ORIGIN_ARG) \
|
||||
$$($1_LDFLAGS),\
|
||||
LDFLAGS_macosx:=$(call SET_SHARED_LIBRARY_NAME,$1),\
|
||||
LDFLAGS_linux:=-lpthread \
|
||||
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)),\
|
||||
LDFLAGS_solaris:=$$($1_LDFLAGS_solaris) \
|
||||
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)),\
|
||||
MAPFILE := $$($1_MAPFILE), \
|
||||
LDFLAGS_SUFFIX:=$(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX),\
|
||||
LDFLAGS_SUFFIX_posix:=$4,\
|
||||
LDFLAGS_SUFFIX_windows:=$$($1_WINDOWS_JLI_LIB) \
|
||||
$(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_solaris:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR),\
|
||||
OUTPUT_DIR:=$$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR),\
|
||||
PROGRAM:=$1,\
|
||||
DEBUG_SYMBOLS:=true,\
|
||||
VERSIONINFO_RESOURCE:=$$($1_VERSION_INFO_RESOURCE),\
|
||||
RC_FLAGS:=$(RC_FLAGS)\
|
||||
-D "JDK_FNAME=$1$(EXE_SUFFIX)" \
|
||||
-D "JDK_INTERNAL_NAME=$1" \
|
||||
-D "JDK_FTYPE=0x1L" \
|
||||
$7,\
|
||||
MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/java.manifest,\
|
||||
CODESIGN:=$$($1_CODESIGN))
|
||||
$(call SetupNativeCompilation,BUILD_LAUNCHER_$1, \
|
||||
SRC := $(JDK_TOPDIR)/src/share/bin, \
|
||||
INCLUDE_FILES := main.c, \
|
||||
LANG := C, \
|
||||
OPTIMIZATION := $$($1_OPTIMIZATION_ARG), \
|
||||
CFLAGS := $$($1_CFLAGS) \
|
||||
-I$(JDK_TOPDIR)/src/share/bin \
|
||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin \
|
||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS)/bin \
|
||||
-DFULL_VERSION='"$(FULL_VERSION)"' \
|
||||
-DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
|
||||
-DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
|
||||
-DLIBARCHNAME='"$(OPENJDK_TARGET_CPU_LEGACY)"' \
|
||||
-DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
|
||||
-DPROGNAME='"$1"' $(DPACKAGEPATH) \
|
||||
$2, \
|
||||
CFLAGS_linux := -fPIC, \
|
||||
CFLAGS_solaris := -KPIC -DHAVE_GETHRTIME, \
|
||||
LDFLAGS := $(LDFLAGS_JDKEXE) \
|
||||
$(ORIGIN_ARG) \
|
||||
$$($1_LDFLAGS), \
|
||||
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \
|
||||
LDFLAGS_linux := -lpthread \
|
||||
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
|
||||
LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \
|
||||
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
|
||||
MAPFILE := $$($1_MAPFILE), \
|
||||
LDFLAGS_SUFFIX := $(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX), \
|
||||
LDFLAGS_SUFFIX_posix := $4, \
|
||||
LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \
|
||||
$(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_solaris := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
|
||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR), \
|
||||
OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \
|
||||
PROGRAM := $1, \
|
||||
DEBUG_SYMBOLS := true, \
|
||||
VERSIONINFO_RESOURCE := $$($1_VERSION_INFO_RESOURCE), \
|
||||
RC_FLAGS := $(RC_FLAGS) \
|
||||
-D "JDK_FNAME=$1$(EXE_SUFFIX)" \
|
||||
-D "JDK_INTERNAL_NAME=$1" \
|
||||
-D "JDK_FTYPE=0x1L" \
|
||||
$7, \
|
||||
MANIFEST := $(JDK_TOPDIR)/src/windows/resource/java.manifest, \
|
||||
CODESIGN := $$($1_CODESIGN))
|
||||
|
||||
BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
|
||||
BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
$$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjli_static.a
|
||||
endif
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
$$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjli_static.a
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
$$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjava/java.lib \
|
||||
$$($1_WINDOWS_JLI_LIB)
|
||||
endif
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
$$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjava/java.lib \
|
||||
$$($1_WINDOWS_JLI_LIB)
|
||||
endif
|
||||
endef
|
||||
|
||||
##########################################################################################
|
||||
|
||||
XLIBS:=$(X_LIBS) -lX11
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
DPACKAGEPATH:=-DPACKAGE_PATH='"$(PACKAGE_PATH)"'
|
||||
XLIBS:=
|
||||
XLIBS := $(X_LIBS) -lX11
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
DPACKAGEPATH := -DPACKAGE_PATH='"$(PACKAGE_PATH)"'
|
||||
XLIBS :=
|
||||
endif
|
||||
|
||||
ifdef OPENJDK
|
||||
JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/windows/resource/icons"
|
||||
JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/windows/resource/icons"
|
||||
else
|
||||
JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
|
||||
JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/windows/native/sun/windows"
|
||||
endif
|
||||
|
||||
# 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
|
||||
# overwritten.
|
||||
$(eval $(call SetupLauncher,java,\
|
||||
-DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib,\
|
||||
$(JDK_OUTPUTDIR)/objs/jli_static.lib,$(JAVA_RC_FLAGS),\
|
||||
$(JDK_TOPDIR)/src/windows/resource/java.rc,$(JDK_OUTPUTDIR)/objs/java_objs,true))
|
||||
$(eval $(call SetupLauncher,java, \
|
||||
-DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
|
||||
$(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
|
||||
$(JDK_TOPDIR)/src/windows/resource/java.rc, $(JDK_OUTPUTDIR)/objs/java_objs,true))
|
||||
|
||||
$(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
|
||||
$(MKDIR) -p $(@D)
|
||||
@ -221,271 +221,271 @@ $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX): $(BUILD_LAUNCHER_java)
|
||||
|
||||
BUILD_LAUNCHERS += $(JDK_OUTPUTDIR)/bin$(OUTPUT_SUBDIR)/java$(EXE_SUFFIX)
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
$(eval $(call SetupLauncher,javaw,\
|
||||
-DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib,\
|
||||
$(JDK_OUTPUTDIR)/objs/jli_static.lib,$(JAVA_RC_FLAGS),\
|
||||
$(JDK_TOPDIR)/src/windows/resource/java.rc,,true))
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
$(eval $(call SetupLauncher,javaw, \
|
||||
-DJAVAW -DEXPAND_CLASSPATH_WILDCARDS,,,user32.lib comctl32.lib, \
|
||||
$(JDK_OUTPUTDIR)/objs/jli_static.lib, $(JAVA_RC_FLAGS), \
|
||||
$(JDK_TOPDIR)/src/windows/resource/java.rc,,true))
|
||||
endif
|
||||
|
||||
|
||||
ifndef BUILD_HEADLESS_ONLY
|
||||
$(eval $(call SetupLauncher,appletviewer,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',,\
|
||||
$(XLIBS)))
|
||||
$(eval $(call SetupLauncher,appletviewer, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.applet.Main"$(COMMA) }',, \
|
||||
$(XLIBS)))
|
||||
endif
|
||||
|
||||
$(eval $(call SetupLauncher,extcheck,\
|
||||
$(eval $(call SetupLauncher,extcheck, \
|
||||
-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) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,jar,\
|
||||
$(eval $(call SetupLauncher,jar, \
|
||||
-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) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,javac,\
|
||||
$(eval $(call SetupLauncher,javac, \
|
||||
-DEXPAND_CLASSPATH_WILDCARDS \
|
||||
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javac.Main"$(COMMA) }'))
|
||||
|
||||
ifeq ($(ENABLE_SJAVAC),yes)
|
||||
$(eval $(call SetupLauncher,sjavac,\
|
||||
-DEXPAND_CLASSPATH_WILDCARDS \
|
||||
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.sjavac.Main"$(COMMA) }'))
|
||||
ifeq ($(ENABLE_SJAVAC), yes)
|
||||
$(eval $(call SetupLauncher,sjavac, \
|
||||
-DEXPAND_CLASSPATH_WILDCARDS \
|
||||
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.sjavac.Main"$(COMMA) }'))
|
||||
endif
|
||||
|
||||
$(eval $(call SetupLauncher,javadoc,\
|
||||
$(eval $(call SetupLauncher,javadoc, \
|
||||
-DEXPAND_CLASSPATH_WILDCARDS \
|
||||
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javadoc.Main"$(COMMA) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,javah,\
|
||||
$(eval $(call SetupLauncher,javah, \
|
||||
-DEXPAND_CLASSPATH_WILDCARDS \
|
||||
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javah.Main"$(COMMA) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,javap,\
|
||||
$(eval $(call SetupLauncher,javap, \
|
||||
-DEXPAND_CLASSPATH_WILDCARDS \
|
||||
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.javap.Main"$(COMMA) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,jdeps,\
|
||||
$(eval $(call SetupLauncher,jdeps, \
|
||||
-DEXPAND_CLASSPATH_WILDCARDS \
|
||||
-DNEVER_ACT_AS_SERVER_CLASS_MACHINE \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.tools.jdeps.Main"$(COMMA) }'))
|
||||
|
||||
BUILD_LAUNCHER_jconsole_CFLAGS_windows:=-DJAVAW
|
||||
BUILD_LAUNCHER_jconsole_LDFLAGS_windows:=user32.lib
|
||||
BUILD_LAUNCHER_jconsole_CFLAGS_windows := -DJAVAW
|
||||
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) }' \
|
||||
-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) }' \
|
||||
-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) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,jinfo,\
|
||||
$(eval $(call SetupLauncher,jinfo, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
|
||||
"sun.tools.jinfo.JInfo"$(COMMA) }' \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
|
||||
"sun.tools.jinfo.JInfo"$(COMMA) }' \
|
||||
-DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
|
||||
,,,,,,,,,Info-privileged.plist))
|
||||
|
||||
$(eval $(call SetupLauncher,jmap,\
|
||||
$(eval $(call SetupLauncher,jmap, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
|
||||
"sun.tools.jmap.JMap"$(COMMA) }' \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
|
||||
"sun.tools.jmap.JMap"$(COMMA) }' \
|
||||
-DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
|
||||
,,,,,,,,,Info-privileged.plist))
|
||||
|
||||
$(eval $(call SetupLauncher,jps,\
|
||||
$(eval $(call SetupLauncher,jps, \
|
||||
-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) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,jjs,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.nashorn.tools.Shell"$(COMMA) }'))
|
||||
$(eval $(call SetupLauncher,jjs, \
|
||||
-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) }' \
|
||||
-DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
|
||||
,,,,,,,,,Info-privileged.plist))
|
||||
|
||||
$(eval $(call SetupLauncher,jstack,\
|
||||
$(eval $(call SetupLauncher,jstack, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
|
||||
"sun.tools.jstack.JStack"$(COMMA) }' \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useProcDebugger"$(COMMA) \
|
||||
"-J-Dsun.jvm.hotspot.debugger.useWindbgDebugger"$(COMMA) \
|
||||
"sun.tools.jstack.JStack"$(COMMA) }' \
|
||||
-DAPP_CLASSPATH='{ "/lib/tools.jar"$(COMMA) "/lib/sa-jdi.jar"$(COMMA) "/classes" }' \
|
||||
,,,,,,,,,Info-privileged.plist))
|
||||
|
||||
$(eval $(call SetupLauncher,jstat,\
|
||||
$(eval $(call SetupLauncher,jstat, \
|
||||
-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) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,keytool,\
|
||||
$(eval $(call SetupLauncher,keytool, \
|
||||
-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) }'))
|
||||
|
||||
ifndef BUILD_HEADLESS_ONLY
|
||||
$(eval $(call SetupLauncher,policytool,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',,\
|
||||
$(XLIBS)))
|
||||
$(eval $(call SetupLauncher,policytool, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.tools.policytool.PolicyTool"$(COMMA) }',, \
|
||||
$(XLIBS)))
|
||||
endif
|
||||
|
||||
$(eval $(call SetupLauncher,rmic,\
|
||||
$(eval $(call SetupLauncher,rmic, \
|
||||
-DEXPAND_CLASSPATH_WILDCARDS \
|
||||
-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) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,serialver,\
|
||||
$(eval $(call SetupLauncher,serialver, \
|
||||
-DEXPAND_CLASSPATH_WILDCARDS \
|
||||
-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) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,wsgen,\
|
||||
$(eval $(call SetupLauncher,wsgen, \
|
||||
-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) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,orbd,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
|
||||
"-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
|
||||
"-J-Dcom.sun.CORBA.activation.Port=1049"$(COMMA) \
|
||||
"-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \
|
||||
"com.sun.corba.se.impl.activation.ORBD"$(COMMA) }'))
|
||||
$(eval $(call SetupLauncher,orbd, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
|
||||
"-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
|
||||
"-J-Dcom.sun.CORBA.activation.Port=1049"$(COMMA) \
|
||||
"-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(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) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,tnameserv,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
|
||||
"-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
|
||||
"-J-Djava.util.logging.LoggingPermission=contol"$(COMMA) \
|
||||
"-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \
|
||||
"com.sun.corba.se.impl.naming.cosnaming.TransientNameServer"$(COMMA) }'))
|
||||
$(eval $(call SetupLauncher,tnameserv, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) \
|
||||
"-J-Dcom.sun.CORBA.activation.DbDir=./orb.db"$(COMMA) \
|
||||
"-J-Djava.util.logging.LoggingPermission=contol"$(COMMA) \
|
||||
"-J-Dcom.sun.CORBA.POA.ORBServerId=1"$(COMMA) \
|
||||
"com.sun.corba.se.impl.naming.cosnaming.TransientNameServer"$(COMMA) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,pack200,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.java.util.jar.pack.Driver"$(COMMA) "--pack" }'))
|
||||
$(eval $(call SetupLauncher,pack200, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "com.sun.java.util.jar.pack.Driver"$(COMMA) "--pack" }'))
|
||||
|
||||
$(eval $(call SetupLauncher,rmid,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.server.Activation"$(COMMA) }'))
|
||||
$(eval $(call SetupLauncher,rmid, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.server.Activation"$(COMMA) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,rmiregistry,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.registry.RegistryImpl"$(COMMA) }'))
|
||||
$(eval $(call SetupLauncher,rmiregistry, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.rmi.registry.RegistryImpl"$(COMMA) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,jcmd,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jcmd.JCmd"$(COMMA) }'))
|
||||
$(eval $(call SetupLauncher,jcmd, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.tools.jcmd.JCmd"$(COMMA) }'))
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
$(eval $(call SetupLauncher,kinit,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Kinit"$(COMMA) }'))
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
$(eval $(call SetupLauncher,kinit, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Kinit"$(COMMA) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,klist,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Klist"$(COMMA) }'))
|
||||
$(eval $(call SetupLauncher,klist, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Klist"$(COMMA) }'))
|
||||
|
||||
$(eval $(call SetupLauncher,ktab,\
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Ktab"$(COMMA) }'))
|
||||
$(eval $(call SetupLauncher,ktab, \
|
||||
-DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "sun.security.krb5.internal.tools.Ktab"$(COMMA) }'))
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
# The order of the object files on the link command line affects the size of the resulting
|
||||
# binary (at least on linux) which causes the size to differ between old and new build.
|
||||
ifeq ($(USE_EXTERNAL_LIBZ), true)
|
||||
UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
|
||||
UNPACKEXE_ZIPOBJS := -lz
|
||||
UNPACKEXE_CFLAGS := -DSYSTEM_ZLIB
|
||||
UNPACKEXE_ZIPOBJS := -lz
|
||||
else
|
||||
UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
|
||||
UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX)
|
||||
UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/java/util/zip/zlib-1.2.5
|
||||
UNPACKEXE_ZIPOBJS := $(JDK_OUTPUTDIR)/objs/libzip/zcrc32$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/deflate$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/trees$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/zadler32$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/compress$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/zutil$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/inflate$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/infback$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/inftrees$(OBJ_SUFFIX) \
|
||||
$(JDK_OUTPUTDIR)/objs/libzip/inffast$(OBJ_SUFFIX)
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
|
||||
UNPACKEXE_CFLAGS += -xregs=no%appl
|
||||
UNPACKEXE_LDFLAGS_solaris += -xmemalign=4s
|
||||
UNPACKEXE_CFLAGS += -xregs=no%appl
|
||||
UNPACKEXE_LDFLAGS_solaris += -xmemalign=4s
|
||||
endif
|
||||
|
||||
UNPACKEXE_LANG:=C
|
||||
ifeq ($(OPENJDK_TARGET_OS),solaris)
|
||||
UNPACKEXE_LANG:=C++
|
||||
UNPACKEXE_LANG := C
|
||||
ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||||
UNPACKEXE_LANG := C++
|
||||
endif
|
||||
# On windows, unpack200 is linked completely differently to all other
|
||||
# executables, using the compiler with the compiler arguments.
|
||||
# It's also linked incrementally, producing a .ilk file that needs to
|
||||
# be kept away.
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
BUILD_UNPACKEXE_LDEXE:=$(CC)
|
||||
EXE_OUT_OPTION_save:=$(EXE_OUT_OPTION)
|
||||
EXE_OUT_OPTION:=-Fe
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
BUILD_UNPACKEXE_LDEXE := $(CC)
|
||||
EXE_OUT_OPTION_save := $(EXE_OUT_OPTION)
|
||||
EXE_OUT_OPTION := -Fe
|
||||
endif
|
||||
$(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE,\
|
||||
SRC:=$(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack,\
|
||||
EXCLUDE_FILES:=jni.cpp,\
|
||||
LANG:=$(UNPACKEXE_LANG),\
|
||||
OPTIMIZATION:=LOW, \
|
||||
CFLAGS:=$(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE)\
|
||||
-DFULL, \
|
||||
CFLAGS_release:=-DPRODUCT,\
|
||||
CFLAGS_linux:=-fPIC,\
|
||||
CFLAGS_solaris:=-KPIC, \
|
||||
CFLAGS_macosx:=-fPIC, \
|
||||
MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers-unpack200,\
|
||||
LDFLAGS:=$(UNPACKEXE_ZIPOBJS),\
|
||||
LDFLAGS_windows:=$(CXXFLAGS_JDKEXE),\
|
||||
LDFLAGS_posix:=$(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
|
||||
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN),\
|
||||
LDFLAGS_linux:=-lc,\
|
||||
LDFLAGS_solaris:=$(UNPACKEXE_LDFLAGS_solaris) -lc,\
|
||||
LDFLAGS_SUFFIX:=$(LIBCXX),\
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR),\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR),\
|
||||
PROGRAM:=unpack200,\
|
||||
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/windows/resource/version.rc,\
|
||||
RC_FLAGS:=$(RC_FLAGS)\
|
||||
-D "JDK_FNAME=unpack200.exe" \
|
||||
-D "JDK_INTERNAL_NAME=unpack200" \
|
||||
-D "JDK_FTYPE=0x1L",\
|
||||
DEBUG_SYMBOLS:=true,\
|
||||
MANIFEST:=$(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest))
|
||||
$(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \
|
||||
SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \
|
||||
EXCLUDE_FILES := jni.cpp, \
|
||||
LANG := $(UNPACKEXE_LANG), \
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(UNPACKEXE_CFLAGS) $(CXXFLAGS_JDKEXE) \
|
||||
-DFULL, \
|
||||
CFLAGS_release := -DPRODUCT, \
|
||||
CFLAGS_linux := -fPIC, \
|
||||
CFLAGS_solaris := -KPIC, \
|
||||
CFLAGS_macosx := -fPIC, \
|
||||
MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers-unpack200, \
|
||||
LDFLAGS := $(UNPACKEXE_ZIPOBJS), \
|
||||
LDFLAGS_windows := $(CXXFLAGS_JDKEXE), \
|
||||
LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
|
||||
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
LDFLAGS_linux := -lc, \
|
||||
LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
|
||||
LDFLAGS_SUFFIX := $(LIBCXX), \
|
||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
|
||||
OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
|
||||
PROGRAM := unpack200, \
|
||||
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
|
||||
RC_FLAGS := $(RC_FLAGS) \
|
||||
-D "JDK_FNAME=unpack200.exe" \
|
||||
-D "JDK_INTERNAL_NAME=unpack200" \
|
||||
-D "JDK_FTYPE=0x1L", \
|
||||
DEBUG_SYMBOLS := true, \
|
||||
MANIFEST := $(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest))
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
EXE_OUT_OPTION:=$(EXE_OUT_OPTION_save)
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
EXE_OUT_OPTION := $(EXE_OUT_OPTION_save)
|
||||
endif
|
||||
|
||||
ifneq ($(USE_EXTERNAL_LIBZ), true)
|
||||
|
||||
$(BUILD_UNPACKEXE) : $(UNPACKEXE_ZIPOBJS)
|
||||
$(BUILD_UNPACKEXE): $(UNPACKEXE_ZIPOBJS)
|
||||
|
||||
endif
|
||||
|
||||
@ -515,13 +515,13 @@ BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
|
||||
# jdk/make/java/Makefile
|
||||
#
|
||||
ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||||
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
|
||||
BUILD_JEXEC := 1
|
||||
endif
|
||||
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
|
||||
BUILD_JEXEC := 1
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), linux)
|
||||
BUILD_JEXEC := 1
|
||||
BUILD_JEXEC := 1
|
||||
endif # OPENJDK_TARGET_OS
|
||||
|
||||
#
|
||||
@ -529,41 +529,41 @@ endif # OPENJDK_TARGET_OS
|
||||
#
|
||||
ifeq ($(BUILD_JEXEC), 1)
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
else ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/macosx/bin
|
||||
else
|
||||
BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/solaris/bin
|
||||
endif
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
else ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/macosx/bin
|
||||
else
|
||||
BUILD_JEXEC_SRC := $(JDK_TOPDIR)/src/solaris/bin
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), linux)
|
||||
BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib
|
||||
BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/share/bin
|
||||
endif
|
||||
ifeq ($(OPENJDK_TARGET_OS), linux)
|
||||
BUILD_JEXEC_DST_DIR := $(JDK_OUTPUTDIR)/lib
|
||||
BUILD_JEXEC_INC += -I$(JDK_TOPDIR)/src/share/bin
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# Note that the two Makefile's seems to contradict each other,
|
||||
# and that src/macosx/bin/jexec.c seems unused
|
||||
# and that src/macosx/bin/jexec.c seems unused
|
||||
#
|
||||
ifneq ($(BUILD_JEXEC_SRC),)
|
||||
$(eval $(call SetupNativeCompilation,BUILD_JEXEC,\
|
||||
SRC:=$(BUILD_JEXEC_SRC),\
|
||||
INCLUDE_FILES:=jexec.c,\
|
||||
LANG:=C,\
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS:=$(CFLAGS_JDKEXE)\
|
||||
$(BUILD_JEXEC_INC), \
|
||||
CFLAGS_linux:=-fPIC,\
|
||||
CFLAGS_solaris:=-KPIC,\
|
||||
LDFLAGS:=$(LDFLAGS_JDKEXE) \
|
||||
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jexec_obj,\
|
||||
OUTPUT_DIR:=$(BUILD_JEXEC_DST_DIR),\
|
||||
DEBUG_SYMBOLS:=true,\
|
||||
PROGRAM:=jexec))
|
||||
ifneq ($(BUILD_JEXEC_SRC), )
|
||||
$(eval $(call SetupNativeCompilation,BUILD_JEXEC, \
|
||||
SRC := $(BUILD_JEXEC_SRC), \
|
||||
INCLUDE_FILES := jexec.c, \
|
||||
LANG := C, \
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(CFLAGS_JDKEXE) \
|
||||
$(BUILD_JEXEC_INC), \
|
||||
CFLAGS_linux := -fPIC, \
|
||||
CFLAGS_solaris := -KPIC, \
|
||||
LDFLAGS := $(LDFLAGS_JDKEXE) \
|
||||
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
|
||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jexec_obj, \
|
||||
OUTPUT_DIR := $(BUILD_JEXEC_DST_DIR), \
|
||||
DEBUG_SYMBOLS := true, \
|
||||
PROGRAM := jexec))
|
||||
|
||||
BUILD_LAUNCHERS += $(BUILD_JEXEC)
|
||||
BUILD_LAUNCHERS += $(BUILD_JEXEC)
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
@ -571,7 +571,7 @@ endif
|
||||
#
|
||||
# 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)
|
||||
BUILD_LAUNCHERS += $(JAVA_RMI_CGI)
|
||||
endif
|
||||
@ -588,11 +588,11 @@ endif
|
||||
# the final images bin dir. This weird behavior is mimicked here in the converted
|
||||
# makefiles for now. Should probably just be deleted.
|
||||
# http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6512052
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
$(eval $(call SetupLauncher,java-rmi,,\
|
||||
$(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/makefiles/java/main/java/mapfile-$(OPENJDK_TARGET_CPU))))
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
$(eval $(call SetupLauncher,java-rmi, , \
|
||||
$(call SET_SHARED_LIBRARY_MAPFILE,$(JDK_TOPDIR)/makefiles/java/main/java/mapfile-$(OPENJDK_TARGET_CPU))))
|
||||
else
|
||||
$(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh
|
||||
$(JAVA_RMI_CGI): $(JDK_TOPDIR)/src/solaris/bin/java-rmi.cgi.sh
|
||||
$(call install-file)
|
||||
$(CHMOD) a+x $@
|
||||
endif
|
||||
@ -605,67 +605,67 @@ BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
|
||||
LINK_JSPAWNHELPER_OBJECTS := $(JDK_OUTPUTDIR)/objs/libjava/childproc.o
|
||||
LINK_JSPAWNHELPER_FLAGS :=
|
||||
|
||||
ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris),)
|
||||
BUILD_JSPAWNHELPER := 1
|
||||
ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris), )
|
||||
BUILD_JSPAWNHELPER := 1
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib
|
||||
BUILD_JSPAWNHELPER_DST_DIR := $(JDK_OUTPUTDIR)/lib
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
|
||||
LINK_JSPAWNHELPER_FLAGS += -m64
|
||||
LINK_JSPAWNHELPER_FLAGS += -m64
|
||||
endif
|
||||
|
||||
ifeq ($(BUILD_JSPAWNHELPER), 1)
|
||||
$(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER,\
|
||||
SRC:=$(BUILD_JSPAWNHELPER_SRC),\
|
||||
INCLUDE_FILES:=jspawnhelper.c,\
|
||||
LANG:=C,\
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS:=$(CFLAGS_JDKEXE), \
|
||||
LDFLAGS:=$(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \
|
||||
LDFLAGS_SUFFIX:= $(LINK_JSPAWNHELPER_OBJECTS), \
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jspawnhelper,\
|
||||
OUTPUT_DIR:=$(BUILD_JSPAWNHELPER_DST_DIR),\
|
||||
PROGRAM:=jspawnhelper))
|
||||
$(eval $(call SetupNativeCompilation,BUILD_JSPAWNHELPER, \
|
||||
SRC := $(BUILD_JSPAWNHELPER_SRC), \
|
||||
INCLUDE_FILES := jspawnhelper.c, \
|
||||
LANG := C, \
|
||||
OPTIMIZATION := LOW, \
|
||||
CFLAGS := $(CFLAGS_JDKEXE), \
|
||||
LDFLAGS := $(LDFLAGS_JDKEXE) $(LINK_JSPAWNHELPER_FLAGS), \
|
||||
LDFLAGS_SUFFIX := $(LINK_JSPAWNHELPER_OBJECTS), \
|
||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jspawnhelper, \
|
||||
OUTPUT_DIR := $(BUILD_JSPAWNHELPER_DST_DIR), \
|
||||
PROGRAM := jspawnhelper))
|
||||
|
||||
$(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS)
|
||||
$(BUILD_JSPAWNHELPER): $(LINK_JSPAWNHELPER_OBJECTS)
|
||||
|
||||
BUILD_LAUNCHERS += $(BUILD_JSPAWNHELPER)
|
||||
BUILD_LAUNCHERS += $(BUILD_JSPAWNHELPER)
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
# jabswitch
|
||||
|
||||
ifndef OPENJDK
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
|
||||
$(eval $(call SetupNativeCompilation,BUILD_JABSWITCH,\
|
||||
SRC:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge,\
|
||||
INCLUDE_FILES:=jabswitch.cpp,\
|
||||
LANG:=C++,\
|
||||
CFLAGS:=$(filter-out -Zc:wchar_t-,$(CFLAGS_JDKEXE)) -Zc:wchar_t \
|
||||
-analyze- -Od -Gd -D_WINDOWS \
|
||||
-D_UNICODE -DUNICODE -RTC1 -EHsc,\
|
||||
LDFLAGS:=$(LDFLAGS_JDKEXE) \
|
||||
Advapi32.lib Version.lib User32.lib,\
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/jabswitch,\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/bin,\
|
||||
PROGRAM:=jabswitch,\
|
||||
DEBUG_SYMBOLS:=true,\
|
||||
VERSIONINFO_RESOURCE:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/AccessBridgeStatusWindow.rc,\
|
||||
RC_FLAGS:=$(RC_FLAGS),\
|
||||
MANIFEST:=$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/jabswitch.manifest))
|
||||
$(eval $(call SetupNativeCompilation,BUILD_JABSWITCH, \
|
||||
SRC := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge, \
|
||||
INCLUDE_FILES := jabswitch.cpp, \
|
||||
LANG := C++, \
|
||||
CFLAGS := $(filter-out -Zc:wchar_t-, $(CFLAGS_JDKEXE)) -Zc:wchar_t \
|
||||
-analyze- -Od -Gd -D_WINDOWS \
|
||||
-D_UNICODE -DUNICODE -RTC1 -EHsc, \
|
||||
LDFLAGS := $(LDFLAGS_JDKEXE) \
|
||||
Advapi32.lib Version.lib User32.lib, \
|
||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/jabswitch, \
|
||||
OUTPUT_DIR := $(JDK_OUTPUTDIR)/bin, \
|
||||
PROGRAM := jabswitch, \
|
||||
DEBUG_SYMBOLS := true, \
|
||||
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/AccessBridgeStatusWindow.rc, \
|
||||
RC_FLAGS := $(RC_FLAGS), \
|
||||
MANIFEST := $(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/jabswitch.manifest))
|
||||
|
||||
BUILD_LAUNCHERS += $(BUILD_JABSWITCH)
|
||||
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
|
||||
$(BUILD_LAUNCHERS) : $(JDK_TOPDIR)/makefiles/CompileLaunchers.gmk
|
||||
$(BUILD_LAUNCHERS): $(JDK_TOPDIR)/makefiles/CompileLaunchers.gmk
|
||||
|
||||
all: $(BUILD_LAUNCHERS)
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -28,22 +28,22 @@ INCLUDEDIR = $(JDK_OUTPUTDIR)/include
|
||||
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS)
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32
|
||||
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32
|
||||
else ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin
|
||||
OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin
|
||||
endif
|
||||
|
||||
#
|
||||
# Copy exported header files to outputdir.
|
||||
#
|
||||
H_TARGET_FILES =$(INCLUDEDIR)/jdwpTransport.h \
|
||||
$(INCLUDEDIR)/jni.h \
|
||||
$(INCLUDEDIR)/jvmti.h \
|
||||
$(INCLUDEDIR)/jvmticmlr.h \
|
||||
$(INCLUDEDIR)/classfile_constants.h \
|
||||
$(INCLUDEDIR)/jawt.h \
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h
|
||||
H_TARGET_FILES = $(INCLUDEDIR)/jdwpTransport.h \
|
||||
$(INCLUDEDIR)/jni.h \
|
||||
$(INCLUDEDIR)/jvmti.h \
|
||||
$(INCLUDEDIR)/jvmticmlr.h \
|
||||
$(INCLUDEDIR)/classfile_constants.h \
|
||||
$(INCLUDEDIR)/jawt.h \
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h
|
||||
|
||||
$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/share/javavm/export/%.h
|
||||
$(call install-file)
|
||||
@ -56,22 +56,22 @@ COPY_FILES = $(H_TARGET_FILES)
|
||||
##########################################################################################
|
||||
|
||||
ifndef OPENJDK
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
COPY_FILES += $(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCallbacks.h \
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.h \
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgePackages.h \
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.c \
|
||||
$(JDK_OUTPUTDIR)/lib/accessibility.properties
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.h \
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgePackages.h \
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/AccessBridgeCalls.c \
|
||||
$(JDK_OUTPUTDIR)/lib/accessibility.properties
|
||||
|
||||
$(OPENJDK_TARGET_OS_INCLUDE)/bridge/%: \
|
||||
$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/%
|
||||
$(install-file)
|
||||
$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/%
|
||||
$(install-file)
|
||||
|
||||
$(JDK_OUTPUTDIR)/lib/accessibility.properties: \
|
||||
$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/accessibility.properties
|
||||
$(install-file)
|
||||
$(JDK_TOPDIR)/src/closed/windows/native/sun/bridge/accessibility.properties
|
||||
$(install-file)
|
||||
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
@ -125,9 +125,9 @@ COPY_FILES += $(PSFONTPROPFILE_TARGET_FILES)
|
||||
# Copy flavormap.properties, cursor.properties and cursors gif files to LIBDIR
|
||||
#
|
||||
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
|
||||
OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/macosx/lib
|
||||
OPENJDK_TARGET_OS_LIB_SRC = $(JDK_TOPDIR)/src/macosx/lib
|
||||
endif
|
||||
|
||||
$(LIBDIR)/flavormap.properties: $(OPENJDK_TARGET_OS_LIB_SRC)/flavormap.properties
|
||||
@ -145,11 +145,11 @@ COPY_FILES += $(CURSORS_DEST_DIR)/cursors.properties
|
||||
|
||||
CURSORS_LIB_SRC = $(JDK_TOPDIR)/src/share/lib/images/cursors
|
||||
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
|
||||
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
|
||||
CURSORS_TARGET_FILES = $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES))
|
||||
CURSORS_TARGET_FILES = $(subst $(CURSORS_LIB_SRC),$(CURSORS_DEST_DIR),$(CURSORS_SRC_FILES))
|
||||
|
||||
$(CURSORS_DEST_DIR)/%: $(CURSORS_LIB_SRC)/%
|
||||
$(call install-file)
|
||||
@ -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
|
||||
$(call install-file)
|
||||
@ -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)
|
||||
|
||||
COPY_FILES += $(LIBDIR)/tzmappings
|
||||
COPY_FILES += $(LIBDIR)/tzmappings
|
||||
|
||||
endif
|
||||
|
||||
@ -199,13 +199,13 @@ endif
|
||||
ICCPROFILE_DEST_DIR := $(LIBDIR)/cmm
|
||||
|
||||
ifdef OPENJDK
|
||||
ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/share/lib/cmm/lcms
|
||||
ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/share/lib/cmm/lcms
|
||||
else
|
||||
ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/cmm/kcms
|
||||
ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/cmm/kcms
|
||||
endif
|
||||
|
||||
ICCPROFILE_SRCS:=$(wildcard $(ICCPROFILE_SRC_DIR)/*.pf)
|
||||
ICCPROFILE_TARGET_FILES:=$(subst $(ICCPROFILE_SRC_DIR),$(ICCPROFILE_DEST_DIR),$(ICCPROFILE_SRCS))
|
||||
ICCPROFILE_SRCS := $(wildcard $(ICCPROFILE_SRC_DIR)/*.pf)
|
||||
ICCPROFILE_TARGET_FILES := $(subst $(ICCPROFILE_SRC_DIR),$(ICCPROFILE_DEST_DIR),$(ICCPROFILE_SRCS))
|
||||
|
||||
$(ICCPROFILE_DEST_DIR)%.pf: $(ICCPROFILE_SRC_DIR)%.pf
|
||||
$(call install-file)
|
||||
@ -215,60 +215,60 @@ COPY_FILES += $(ICCPROFILE_TARGET_FILES)
|
||||
|
||||
##########################################################################################
|
||||
|
||||
#make sure freetype dll will be available at runtime as well as link time
|
||||
# make sure freetype dll will be available at runtime as well as link time
|
||||
#
|
||||
#NB: Default freetype build system uses -h linker option and
|
||||
# result .so contains hardcoded library name that is later
|
||||
# used for adding dependencies to other objects
|
||||
# (e.g. libfontmanager.so).
|
||||
# NB: Default freetype build system uses -h linker option and
|
||||
# result .so contains hardcoded library name that is later
|
||||
# used for adding dependencies to other objects
|
||||
# (e.g. libfontmanager.so).
|
||||
#
|
||||
# It is not obvious how to extract that hardcoded name (libfreetype.so.6)
|
||||
# without overcomplicating logic here.
|
||||
# To workaround this we hardcode .6 suffix for now.
|
||||
# It is not obvious how to extract that hardcoded name (libfreetype.so.6)
|
||||
# without overcomplicating logic here.
|
||||
# To workaround this we hardcode .6 suffix for now.
|
||||
#
|
||||
# Note that .so.6 library will not be found by System.loadLibrary()
|
||||
# but fortunately we need to load FreeType library explicitly
|
||||
# on windows only
|
||||
# Note that .so.6 library will not be found by System.loadLibrary()
|
||||
# but fortunately we need to load FreeType library explicitly
|
||||
# on windows only
|
||||
#
|
||||
#TODO: rework this to avoid hardcoding library name in the makefile
|
||||
#
|
||||
ifdef OPENJDK
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
FREETYPE_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype)
|
||||
else
|
||||
ifeq ($(USING_SYSTEM_FT_LIB), false)
|
||||
FREETYPE_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
|
||||
endif
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
FREETYPE_LIB = $(JDK_OUTPUTDIR)/bin/$(call SHARED_LIBRARY,freetype)
|
||||
else
|
||||
ifeq ($(USING_SYSTEM_FT_LIB), false)
|
||||
FREETYPE_LIB = $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6
|
||||
endif
|
||||
endif
|
||||
|
||||
$(FREETYPE_LIB): $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype)
|
||||
$(FREETYPE_LIB): $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype)
|
||||
$(CP) $(FREETYPE2_LIB_PATH)/$(call SHARED_LIBRARY,freetype) $@
|
||||
ifeq ($(OPENJDK_BUILD_OS), windows)
|
||||
$(CHMOD) +rx $@
|
||||
endif
|
||||
ifeq ($(OPENJDK_BUILD_OS), windows)
|
||||
$(CHMOD) +rx $@
|
||||
endif
|
||||
|
||||
COPY_FILES += $(FREETYPE_LIB)
|
||||
COPY_FILES += $(FREETYPE_LIB)
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
|
||||
# Copy msvcrXX.dll on windows
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL))
|
||||
# Chmod to avoid permission issues if bundles are unpacked on unix platforms.
|
||||
$(MSVCR_TARGET): $(MSVCR_DLL)
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
MSVCR_TARGET := $(JDK_OUTPUTDIR)/bin/$(notdir $(MSVCR_DLL))
|
||||
# Chmod to avoid permission issues if bundles are unpacked on unix platforms.
|
||||
$(MSVCR_TARGET): $(MSVCR_DLL)
|
||||
$(call install-file)
|
||||
$(CHMOD) a+rx $@
|
||||
|
||||
COPY_FILES += $(MSVCR_TARGET)
|
||||
COPY_FILES += $(MSVCR_TARGET)
|
||||
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)
|
||||
|
||||
COPY_FILES += $(LIBDIR)/jvm.hprof.txt
|
||||
@ -279,12 +279,12 @@ COPY_FILES += $(LIBDIR)/jvm.hprof.txt
|
||||
# How to install jvm.cfg.
|
||||
#
|
||||
ifeq ($(JVM_VARIANT_ZERO), true)
|
||||
JVMCFG_ARCH := zero
|
||||
JVMCFG_ARCH := zero
|
||||
else
|
||||
JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
|
||||
JVMCFG_ARCH := $(OPENJDK_TARGET_CPU_LEGACY)
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
JVMCFG_SRC := $(JDK_TOPDIR)/src/macosx/bin/$(JVMCFG_ARCH)/jvm.cfg
|
||||
else
|
||||
JVMCFG_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(JVMCFG_ARCH)/jvm.cfg
|
||||
@ -294,7 +294,7 @@ JVMCFG := $(JVMCFG_DIR)/jvm.cfg
|
||||
|
||||
# To do: should this also support -zeroshark?
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_CPU_BITS),64)
|
||||
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
|
||||
COPY_JVM_CFG_FILE := true
|
||||
else
|
||||
# On 32-bit machines we have three potential VMs: client, server and minimal.
|
||||
@ -305,7 +305,7 @@ else
|
||||
# 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
|
||||
# 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)
|
||||
COPY_JVM_CFG_FILE := true
|
||||
else
|
||||
@ -317,35 +317,34 @@ else
|
||||
endif
|
||||
|
||||
ifeq ($(COPY_JVM_CFG_FILE), true)
|
||||
$(JVMCFG): $(JVMCFG_SRC)
|
||||
$(JVMCFG): $(JVMCFG_SRC)
|
||||
$(call install-file)
|
||||
else
|
||||
$(JVMCFG):
|
||||
$(JVMCFG):
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $(@)
|
||||
|
||||
# Now check for other permutations
|
||||
ifeq ($(JVM_VARIANT_SERVER), true)
|
||||
$(PRINTF) "-server KNOWN\n">>$(@)
|
||||
$(PRINTF) "-client ALIASED_TO -server\n">>$(@)
|
||||
ifeq ($(JVM_VARIANT_MINIMAL1), true)
|
||||
# Now check for other permutations
|
||||
ifeq ($(JVM_VARIANT_SERVER), true)
|
||||
$(PRINTF) "-server KNOWN\n">>$(@)
|
||||
$(PRINTF) "-client ALIASED_TO -server\n">>$(@)
|
||||
ifeq ($(JVM_VARIANT_MINIMAL1), true)
|
||||
$(PRINTF) "-minimal KNOWN\n">>$(@)
|
||||
endif
|
||||
else
|
||||
ifeq ($(JVM_VARIANT_CLIENT), true)
|
||||
endif
|
||||
else
|
||||
ifeq ($(JVM_VARIANT_CLIENT), true)
|
||||
$(PRINTF) "-client KNOWN\n">>$(@)
|
||||
$(PRINTF) "-server ALIASED_TO -client\n">>$(@)
|
||||
ifeq ($(JVM_VARIANT_MINIMAL1), true)
|
||||
$(PRINTF) "-minimal KNOWN\n">>$(@)
|
||||
$(PRINTF) "-minimal KNOWN\n">>$(@)
|
||||
endif
|
||||
else
|
||||
else
|
||||
ifeq ($(JVM_VARIANT_MINIMAL1), true)
|
||||
$(PRINTF) "-minimal KNOWN\n">>$(@)
|
||||
$(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
|
||||
$(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
|
||||
$(PRINTF) "-minimal KNOWN\n">>$(@)
|
||||
$(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
|
||||
$(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
COPY_FILES += $(JVMCFG)
|
||||
@ -387,23 +386,23 @@ BLACKLISTED_CERTS_DST := $(JDK_OUTPUTDIR)/lib/security/blacklisted.certs
|
||||
|
||||
ifndef OPENJDK
|
||||
|
||||
BLACKLIST_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/blacklist
|
||||
BLACKLIST_DST := $(JDK_OUTPUTDIR)/lib/security/blacklist
|
||||
BLACKLIST_SRC := $(JDK_TOPDIR)/src/closed/share/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_DST := $(JDK_OUTPUTDIR)/lib/security/trusted.libraries
|
||||
TRUSTEDLIBS_SRC := $(JDK_TOPDIR)/src/closed/share/lib/security/trusted.libraries
|
||||
TRUSTEDLIBS_DST := $(JDK_OUTPUTDIR)/lib/security/trusted.libraries
|
||||
|
||||
$(BLACKLIST_DST): $(BLACKLIST_SRC)
|
||||
$(BLACKLIST_DST): $(BLACKLIST_SRC)
|
||||
$(call install-file)
|
||||
|
||||
COPY_FILES += $(BLACKLIST_DST)
|
||||
COPY_FILES += $(BLACKLIST_DST)
|
||||
|
||||
$(TRUSTEDLIBS_DST): $(TRUSTEDLIBS_SRC)
|
||||
$(TRUSTEDLIBS_DST): $(TRUSTEDLIBS_SRC)
|
||||
$(call install-file)
|
||||
|
||||
COPY_FILES += $(TRUSTEDLIBS_DST)
|
||||
COPY_FILES += $(TRUSTEDLIBS_DST)
|
||||
|
||||
endif
|
||||
|
||||
@ -425,98 +424,98 @@ COPY_FILES += $(BLACKLISTED_CERTS_DST)
|
||||
|
||||
ifndef OPENJDK
|
||||
|
||||
SHARED_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts
|
||||
SHARED_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/fonts
|
||||
SHARED_FONTS_FILES := \
|
||||
LucidaTypewriterRegular.ttf \
|
||||
LucidaTypewriterBold.ttf \
|
||||
LucidaBrightRegular.ttf \
|
||||
LucidaBrightDemiBold.ttf \
|
||||
LucidaBrightItalic.ttf \
|
||||
LucidaBrightDemiItalic.ttf \
|
||||
LucidaSansRegular.ttf \
|
||||
LucidaSansDemiBold.ttf \
|
||||
SHARED_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts
|
||||
SHARED_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/fonts
|
||||
SHARED_FONTS_FILES := \
|
||||
LucidaTypewriterRegular.ttf \
|
||||
LucidaTypewriterBold.ttf \
|
||||
LucidaBrightRegular.ttf \
|
||||
LucidaBrightDemiBold.ttf \
|
||||
LucidaBrightItalic.ttf \
|
||||
LucidaBrightDemiItalic.ttf \
|
||||
LucidaSansRegular.ttf \
|
||||
LucidaSansDemiBold.ttf \
|
||||
|
||||
SHARED_FONTS_SRC := $(foreach F,$(SHARED_FONTS_FILES),$(SHARED_FONTS_SRC_DIR)/$(F))
|
||||
SHARED_FONTS_DST := $(foreach F,$(SHARED_FONTS_FILES),$(SHARED_FONTS_DST_DIR)/$(F))
|
||||
SHARED_FONTS_SRC := $(foreach F, $(SHARED_FONTS_FILES), $(SHARED_FONTS_SRC_DIR)/$(F))
|
||||
SHARED_FONTS_DST := $(foreach F, $(SHARED_FONTS_FILES), $(SHARED_FONTS_DST_DIR)/$(F))
|
||||
|
||||
$(SHARED_FONTS_DST_DIR)/%.ttf : $(SHARED_FONTS_SRC_DIR)/%.ttf
|
||||
$(SHARED_FONTS_DST_DIR)/%.ttf: $(SHARED_FONTS_SRC_DIR)/%.ttf
|
||||
$(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)
|
||||
|
||||
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
|
||||
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_DST_DIR := $(JDK_OUTPUTDIR)/lib/oblique-fonts
|
||||
OBL_FONTS_FILES := LucidaTypewriterOblique.ttf LucidaTypewriterBoldOblique.ttf \
|
||||
LucidaSansOblique.ttf LucidaSansDemiOblique.ttf
|
||||
OBL_FONTS_SRC_DIR := $(JDK_TOPDIR)/src/closed/share/lib/fonts/oblique
|
||||
OBL_FONTS_DST_DIR := $(JDK_OUTPUTDIR)/lib/oblique-fonts
|
||||
OBL_FONTS_FILES := LucidaTypewriterOblique.ttf LucidaTypewriterBoldOblique.ttf \
|
||||
LucidaSansOblique.ttf LucidaSansDemiOblique.ttf
|
||||
|
||||
OBL_FONTS_SRC := $(foreach F,$(OBL_FONTS_FILES),$(OBL_FONTS_SRC_DIR)/$(F))
|
||||
OBL_FONTS_DST := $(foreach F,$(OBL_FONTS_FILES),$(OBL_FONTS_DST_DIR)/$(F))
|
||||
OBL_FONTS_SRC := $(foreach F, $(OBL_FONTS_FILES), $(OBL_FONTS_SRC_DIR)/$(F))
|
||||
OBL_FONTS_DST := $(foreach F, $(OBL_FONTS_FILES), $(OBL_FONTS_DST_DIR)/$(F))
|
||||
|
||||
$(OBL_FONTS_DST_DIR)/%.ttf : $(OBL_FONTS_SRC_DIR)/%.ttf
|
||||
$(OBL_FONTS_DST_DIR)/%.ttf: $(OBL_FONTS_SRC_DIR)/%.ttf
|
||||
$(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)
|
||||
|
||||
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
|
||||
|
||||
##########################################################################################
|
||||
|
||||
ifndef OPENJDK
|
||||
|
||||
#
|
||||
# Solaris X11 Direct Graphics Access library
|
||||
#
|
||||
#
|
||||
# Solaris X11 Direct Graphics Access library
|
||||
#
|
||||
|
||||
_DGALIBS_sparc = \
|
||||
libxinerama.so \
|
||||
libjdgaSUNWcg6.so \
|
||||
libjdgaSUNWffb.so \
|
||||
libjdgaSUNWm64.so \
|
||||
libjdgaSUNWafb.so
|
||||
_DGALIBS_sparc = \
|
||||
libxinerama.so \
|
||||
libjdgaSUNWcg6.so \
|
||||
libjdgaSUNWffb.so \
|
||||
libjdgaSUNWm64.so \
|
||||
libjdgaSUNWafb.so
|
||||
|
||||
_DGALIBS_sparcv9 = \
|
||||
libxinerama.so \
|
||||
libjdgaSUNWcg6.so \
|
||||
libjdgaSUNWffb.so \
|
||||
libjdgaSUNWm64.so \
|
||||
libjdgaSUNWafb.so
|
||||
_DGALIBS_sparcv9 = \
|
||||
libxinerama.so \
|
||||
libjdgaSUNWcg6.so \
|
||||
libjdgaSUNWffb.so \
|
||||
libjdgaSUNWm64.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)
|
||||
$(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)
|
||||
$(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)
|
||||
$(RM) $@
|
||||
$(LN) -s $(<F) $@
|
||||
|
||||
COPY_FILES += $(DGALIBS)
|
||||
COPY_FILES += $(DGALIBS)
|
||||
|
||||
endif
|
||||
|
||||
@ -524,35 +523,35 @@ endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||||
|
||||
SUNPKCS11_CFG_SRC := $(JDK_TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg
|
||||
SUNPKCS11_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/sunpkcs11-solaris.cfg
|
||||
SUNPKCS11_CFG_SRC := $(JDK_TOPDIR)/src/share/lib/security/sunpkcs11-solaris.cfg
|
||||
SUNPKCS11_CFG_DST := $(JDK_OUTPUTDIR)/lib/security/sunpkcs11-solaris.cfg
|
||||
|
||||
$(SUNPKCS11_CFG_DST) : $(SUNPKCS11_CFG_SRC)
|
||||
$(SUNPKCS11_CFG_DST): $(SUNPKCS11_CFG_SRC)
|
||||
$(call install-file)
|
||||
|
||||
COPY_FILES += $(SUNPKCS11_CFG_DST)
|
||||
COPY_FILES += $(SUNPKCS11_CFG_DST)
|
||||
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
|
||||
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_DST := $(JDK_OUTPUTDIR)/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) : $(UCRYPTO_CFG_SRC)
|
||||
$(UCRYPTO_CFG_DST): $(UCRYPTO_CFG_SRC)
|
||||
$(call install-file)
|
||||
|
||||
COPY_FILES += $(UCRYPTO_CFG_DST)
|
||||
COPY_FILES += $(UCRYPTO_CFG_DST)
|
||||
|
||||
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)
|
||||
|
||||
COPY_FILES += $(JDK_OUTPUTDIR)/lib/sound.properties
|
||||
|
||||
@ -31,56 +31,56 @@ COPY_PATTERNS = .icu _dict
|
||||
|
||||
XMLSECURITY_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource
|
||||
COPY_FILES += \
|
||||
$(XMLSECURITY_RESOURCEDIR)/config.dtd \
|
||||
$(XMLSECURITY_RESOURCEDIR)/config.xml
|
||||
$(XMLSECURITY_RESOURCEDIR)/config.dtd \
|
||||
$(XMLSECURITY_RESOURCEDIR)/config.xml
|
||||
|
||||
# Copy sun/tools related files into the classes directory.
|
||||
|
||||
# Extra jstat files
|
||||
JSTAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jstat/resources
|
||||
COPY_FILES += \
|
||||
$(JSTAT_RESOURCEDIR)/jstat_options \
|
||||
$(JSTAT_RESOURCEDIR)/jstat_unsupported_options
|
||||
$(JSTAT_RESOURCEDIR)/jstat_options \
|
||||
$(JSTAT_RESOURCEDIR)/jstat_unsupported_options
|
||||
|
||||
# Extra jhat files
|
||||
JHAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/hat/resources
|
||||
COPY_FILES += \
|
||||
$(JHAT_RESOURCEDIR)/hat.js \
|
||||
$(JHAT_RESOURCEDIR)/oqlhelp.html \
|
||||
$(JHAT_RESOURCEDIR)/platform_names.txt
|
||||
$(JHAT_RESOURCEDIR)/hat.js \
|
||||
$(JHAT_RESOURCEDIR)/oqlhelp.html \
|
||||
$(JHAT_RESOURCEDIR)/platform_names.txt
|
||||
|
||||
# Extra jrunscript files
|
||||
JRUNSCRIPT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/script/shell
|
||||
COPY_FILES += \
|
||||
$(JRUNSCRIPT_RESOURCEDIR)/init.js \
|
||||
$(JRUNSCRIPT_RESOURCEDIR)/messages.properties
|
||||
$(JRUNSCRIPT_RESOURCEDIR)/init.js \
|
||||
$(JRUNSCRIPT_RESOURCEDIR)/messages.properties
|
||||
|
||||
# Extra jvmstat files
|
||||
COPY_FILES += \
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap
|
||||
|
||||
# JConsole resources
|
||||
JCONSOLE_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources
|
||||
COPY_FILES += \
|
||||
$(wildcard $(JCONSOLE_RESOURCES_DIR)/*.png) \
|
||||
$(wildcard $(JCONSOLE_RESOURCES_DIR)/*.gif)
|
||||
$(wildcard $(JCONSOLE_RESOURCES_DIR)/*.png) \
|
||||
$(wildcard $(JCONSOLE_RESOURCES_DIR)/*.gif)
|
||||
|
||||
# Print resources
|
||||
PRINT_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/print/resources
|
||||
COPY_FILES += \
|
||||
$(wildcard $(PRINT_RESOURCES_DIR)/*.png)
|
||||
$(wildcard $(PRINT_RESOURCES_DIR)/*.png)
|
||||
|
||||
# IDN resources
|
||||
COPY_FILES += \
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/net/idn/uidna.spp
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/net/idn/uidna.spp
|
||||
|
||||
#
|
||||
# Swing plaf resources
|
||||
#
|
||||
SWING_PLAF_WINDOWS_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows
|
||||
COPY_FILES += \
|
||||
$(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.png)
|
||||
$(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.png)
|
||||
|
||||
ifndef OPENJDK
|
||||
SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/windows
|
||||
@ -88,18 +88,18 @@ ifndef OPENJDK
|
||||
COPY_FILES := $(filter-out $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/JavaCup32.png, $(COPY_FILES))
|
||||
# Alter JavaCup32.png from ClosedJDK
|
||||
COPY_FILES += \
|
||||
$(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png
|
||||
$(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png
|
||||
endif
|
||||
|
||||
ifndef OPENJDK
|
||||
JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
|
||||
COPY_FILES += \
|
||||
$(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
|
||||
$(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
|
||||
endif
|
||||
|
||||
SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic
|
||||
COPY_FILES += \
|
||||
$(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png)
|
||||
$(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png)
|
||||
|
||||
ifndef OPENJDK
|
||||
SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/javax/swing/plaf/basic
|
||||
@ -107,44 +107,44 @@ ifndef OPENJDK
|
||||
COPY_FILES := $(filter-out $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/JavaCup16.png, $(COPY_FILES))
|
||||
# Alter JavaCup16.png from ClosedJDK
|
||||
COPY_FILES += \
|
||||
$(SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED)/icons/JavaCup16.png
|
||||
$(SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED)/icons/JavaCup16.png
|
||||
endif
|
||||
|
||||
ifdef OPENJDK
|
||||
SWING_PLAF_MOTIF_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif
|
||||
COPY_FILES += \
|
||||
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png)
|
||||
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png)
|
||||
else
|
||||
SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/motif
|
||||
COPY_FILES += \
|
||||
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.png)
|
||||
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.png)
|
||||
endif
|
||||
|
||||
SWING_PLAF_METAL_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/metal
|
||||
COPY_FILES += \
|
||||
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.png) \
|
||||
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.png) \
|
||||
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/sounds/*.wav)
|
||||
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.png) \
|
||||
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.png) \
|
||||
$(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/sounds/*.wav)
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS), windows)
|
||||
# Only copy GTK resources on Solaris/Linux
|
||||
SWING_PLAF_GTK_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk
|
||||
COPY_FILES += \
|
||||
$(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.png) \
|
||||
$(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/resources/metacity/SwingFallbackTheme/metacity-1/*.xml)
|
||||
$(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.gif) \
|
||||
$(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.png) \
|
||||
$(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/resources/metacity/SwingFallbackTheme/metacity-1/*.xml)
|
||||
endif
|
||||
# END: Swing plaf resources
|
||||
|
||||
SWING_BEANINFO_RESOURCES_SRC_DIR = $(JDK_TOPDIR)/make/tools/swing-beans/beaninfo/images
|
||||
SWING_BEANINFO_RESOURCES_SRC = $(wildcard $(SWING_BEANINFO_RESOURCES_SRC_DIR)/*.gif)
|
||||
OUT_BEANINFO_RESOURCES = $(patsubst $(SWING_BEANINFO_RESOURCES_SRC_DIR)%,\
|
||||
$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%,\
|
||||
$(SWING_BEANINFO_RESOURCES_SRC))
|
||||
OUT_BEANINFO_RESOURCES = $(patsubst $(SWING_BEANINFO_RESOURCES_SRC_DIR)%, \
|
||||
$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%, \
|
||||
$(SWING_BEANINFO_RESOURCES_SRC))
|
||||
|
||||
COPY_EXTRA += $(OUT_BEANINFO_RESOURCES)
|
||||
# END: Swing beaninfo resources
|
||||
@ -152,8 +152,8 @@ COPY_EXTRA += $(OUT_BEANINFO_RESOURCES)
|
||||
# Swing text resources
|
||||
SWING_TEXT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/text
|
||||
COPY_FILES += \
|
||||
$(SWING_TEXT_RESOURCEDIR)/html/default.css \
|
||||
$(wildcard $(SWING_TEXT_RESOURCEDIR)/rtf/charsets/*.txt)
|
||||
$(SWING_TEXT_RESOURCEDIR)/html/default.css \
|
||||
$(wildcard $(SWING_TEXT_RESOURCEDIR)/rtf/charsets/*.txt)
|
||||
|
||||
##########################################################################################
|
||||
#
|
||||
@ -166,57 +166,57 @@ COPY_FILES += \
|
||||
# are uncommented and the configuration file is stored in the output META-INF directory.
|
||||
|
||||
# Make sure the output directory is created.
|
||||
$(eval $(call MakeDir,$(JDK_OUTPUTDIR)/classes/META-INF/services))
|
||||
$(eval $(call MakeDir, $(JDK_OUTPUTDIR)/classes/META-INF/services))
|
||||
# Find all META-INF/services/* files
|
||||
ALL_META-INF_DIRS_share:=$(shell $(FIND) $(JDK_TOPDIR)/src/share/classes -type d -a -name META-INF)
|
||||
ALL_META-INF_DIRS_targetapi:=$(shell $(FIND) $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes -type d -a -name META-INF)
|
||||
ALL_META-INF_DIRS_share := $(shell $(FIND) $(JDK_TOPDIR)/src/share/classes -type d -a -name META-INF)
|
||||
ALL_META-INF_DIRS_targetapi := $(shell $(FIND) $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes -type d -a -name META-INF)
|
||||
# Platform specific overrides shared
|
||||
ifneq ($(ALL_META-INF_DIRS_targetapi),)
|
||||
ALL_META-INF_DIRS:=$(ALL_META-INF_DIRS_targetapi) \
|
||||
$(filter-out %$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes%,%,$(ALL_META-INF_DIRS_targetapi)),\
|
||||
$(ALL_META-INF_DIRS_share))
|
||||
ifneq ($(ALL_META-INF_DIRS_targetapi), )
|
||||
ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_targetapi) \
|
||||
$(filter-out %$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes%,%,$(ALL_META-INF_DIRS_targetapi)), \
|
||||
$(ALL_META-INF_DIRS_share))
|
||||
else
|
||||
ALL_META-INF_DIRS:=$(ALL_META-INF_DIRS_share)
|
||||
ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share)
|
||||
endif
|
||||
|
||||
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
|
||||
|
||||
SRC_SERVICES_FILES:=$(wildcard $(addsuffix /services/*,$(ALL_META-INF_DIRS)))
|
||||
SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS)))
|
||||
|
||||
ifdef OPENJDK
|
||||
SRC_SERVICES_FILES:=$(filter-out %sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine,$(SRC_SERVICES_FILES))
|
||||
SRC_SERVICES_FILES:=$(filter-out %sun/java2d/cmm/kcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider,$(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))
|
||||
else
|
||||
SRC_SERVICES_FILES:=$(filter-out %sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine,$(SRC_SERVICES_FILES))
|
||||
SRC_SERVICES_FILES:=$(filter-out %sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.CMMServiceProvider,$(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))
|
||||
endif
|
||||
|
||||
# The number of services files are relatively few. If the increase in numbers, then
|
||||
# we have to use ListPathsSafelyNow here.
|
||||
# Change $(JDK_TOPDIR)/src/.../META-INF/services/yyyy into $(JDK_OUTPUTDIR)/classes/META-INF/services/yyyy
|
||||
# The \n in the printf command is needed to make sed work on Solaris.
|
||||
OUT_SERVICES_FILES:=$(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/,\
|
||||
$(shell $(PRINTF) "$(SRC_SERVICES_FILES)\n" | $(SED) -e 's|/[^ ]*/META-INF/services/||g'))
|
||||
OUT_SERVICES_FILES_COLON:=$(addsuffix :,$(OUT_SERVICES_FILES))
|
||||
OUT_SERVICES_FILES := $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \
|
||||
$(shell $(PRINTF) "$(SRC_SERVICES_FILES)\n" | $(SED) -e 's|/[^ ]*/META-INF/services/||g'))
|
||||
OUT_SERVICES_FILES_COLON := $(addsuffix :, $(OUT_SERVICES_FILES))
|
||||
# Exception handling for print services with no META-INF directory
|
||||
SRC_SERVICES_FILES_PRINT = $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/*)
|
||||
OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/,\
|
||||
$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/%,%,\
|
||||
$(SRC_SERVICES_FILES_PRINT)))
|
||||
OUT_SERVICES_FILES_PRINT_COLON = $(addsuffix :,$(OUT_SERVICES_FILES_PRINT))
|
||||
RULES_SERVICES_PRINT = $(join $(OUT_SERVICES_FILES_PRINT_COLON),$(SRC_SERVICES_FILES_PRINT))
|
||||
OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \
|
||||
$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/%, %, \
|
||||
$(SRC_SERVICES_FILES_PRINT)))
|
||||
OUT_SERVICES_FILES_PRINT_COLON = $(addsuffix :, $(OUT_SERVICES_FILES_PRINT))
|
||||
RULES_SERVICES_PRINT = $(join $(OUT_SERVICES_FILES_PRINT_COLON), $(SRC_SERVICES_FILES_PRINT))
|
||||
|
||||
# Now setup the dependency rules to generate a META-INF/services/... from the correct source.
|
||||
META-INF_RULES_SERVICES:=$(RULES_SERVICES_PRINT) $(join $(OUT_SERVICES_FILES_COLON),$(SRC_SERVICES_FILES))
|
||||
META-INF_RULES_SERVICES := $(RULES_SERVICES_PRINT) $(join $(OUT_SERVICES_FILES_COLON), $(SRC_SERVICES_FILES))
|
||||
# Eval the newly created rules to incorporate them into the make tree.
|
||||
define addto_meta-inf_services
|
||||
$1
|
||||
$1
|
||||
echo $(LOG_INFO) Installing META-INF/services/$$(@F)
|
||||
$(CAT) $$< | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $$@
|
||||
endef
|
||||
$(foreach i,$(META-INF_RULES_SERVICES),$(eval $(call addto_meta-inf_services,$i)))
|
||||
$(foreach i, $(META-INF_RULES_SERVICES), $(eval $(call addto_meta-inf_services, $i)))
|
||||
# Here is the generic rule, whose receipt the above rules will trigger.
|
||||
|
||||
COPY_EXTRA += $(OUT_SERVICES_FILES)
|
||||
@ -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)
|
||||
|
||||
COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/sun/nio/cs/ext/sjis0213.dat
|
||||
@ -234,17 +234,17 @@ COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/sun/nio/cs/ext/sjis0213.dat
|
||||
JAVAX_SOUND_SRC := $(JDK_TOPDIR)/src/share/classes/com/sun/media/sound/services
|
||||
|
||||
JAVAX_SOUND_SRC_FILES := \
|
||||
javax.sound.midi.spi.MidiDeviceProvider \
|
||||
javax.sound.midi.spi.MidiFileReader \
|
||||
javax.sound.midi.spi.MidiFileWriter \
|
||||
javax.sound.midi.spi.SoundbankReader \
|
||||
javax.sound.sampled.spi.AudioFileReader \
|
||||
javax.sound.sampled.spi.AudioFileWriter \
|
||||
javax.sound.sampled.spi.FormatConversionProvider \
|
||||
javax.sound.sampled.spi.MixerProvider
|
||||
javax.sound.midi.spi.MidiDeviceProvider \
|
||||
javax.sound.midi.spi.MidiFileReader \
|
||||
javax.sound.midi.spi.MidiFileWriter \
|
||||
javax.sound.midi.spi.SoundbankReader \
|
||||
javax.sound.sampled.spi.AudioFileReader \
|
||||
javax.sound.sampled.spi.AudioFileWriter \
|
||||
javax.sound.sampled.spi.FormatConversionProvider \
|
||||
javax.sound.sampled.spi.MixerProvider
|
||||
|
||||
COPY_EXTRA += $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/,$(JAVAX_SOUND_SRC_FILES))
|
||||
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)))
|
||||
|
||||
@ -41,15 +41,15 @@ SAMPLE_TARGET := $(subst $(SAMPLE_SOURCE_DIR),$(SAMPLE_TARGET_DIR),$(SAMPLE_SOUR
|
||||
|
||||
ifndef OPENJDK
|
||||
# Exclude Main.java in EbayClient dir
|
||||
SAMPLE_CLOSED_SOURCE := $(shell $(FIND) $(SAMPLE_CLOSED_SOURCE_DIR) -type f -print | $(GREP) -v EbayClient/Main.java)
|
||||
SAMPLE_CLOSED_TARGET := $(subst $(SAMPLE_CLOSED_SOURCE_DIR),$(SAMPLE_TARGET_DIR),$(SAMPLE_CLOSED_SOURCE))
|
||||
SAMPLE_TARGET += $(SAMPLE_CLOSED_TARGET)
|
||||
SAMPLE_CLOSED_SOURCE := $(shell $(FIND) $(SAMPLE_CLOSED_SOURCE_DIR) -type f -print | $(GREP) -v EbayClient/Main.java)
|
||||
SAMPLE_CLOSED_TARGET := $(subst $(SAMPLE_CLOSED_SOURCE_DIR),$(SAMPLE_TARGET_DIR),$(SAMPLE_CLOSED_SOURCE))
|
||||
SAMPLE_TARGET += $(SAMPLE_CLOSED_TARGET)
|
||||
endif
|
||||
|
||||
ifneq (, $(filter $(OPENJDK_TARGET_OS), solaris macosx))
|
||||
SAMPLE_SOLARIS_SOURCE := $(shell $(FIND) $(SAMPLE_SOLARIS_SOURCE_DIR) -type f -print)
|
||||
SAMPLE_SOLARIS_TARGET := $(subst $(SAMPLE_SOLARIS_SOURCE_DIR),$(SAMPLE_TARGET_DIR),$(SAMPLE_SOLARIS_SOURCE))
|
||||
SAMPLE_TARGET += $(SAMPLE_SOLARIS_TARGET)
|
||||
SAMPLE_SOLARIS_SOURCE := $(shell $(FIND) $(SAMPLE_SOLARIS_SOURCE_DIR) -type f -print)
|
||||
SAMPLE_SOLARIS_TARGET := $(subst $(SAMPLE_SOLARIS_SOURCE_DIR),$(SAMPLE_TARGET_DIR),$(SAMPLE_SOLARIS_SOURCE))
|
||||
SAMPLE_TARGET += $(SAMPLE_SOLARIS_TARGET)
|
||||
endif
|
||||
|
||||
$(SAMPLE_TARGET_DIR)/dtrace/%: $(SAMPLE_SOLARIS_SOURCE_DIR)/dtrace/%
|
||||
@ -63,6 +63,6 @@ $(SAMPLE_TARGET_DIR)/%: $(SAMPLE_SOURCE_DIR)/%
|
||||
|
||||
COPY_FILES += $(SAMPLE_TARGET)
|
||||
|
||||
all: $(COPY_FILES)
|
||||
all: $(COPY_FILES)
|
||||
|
||||
.PHONY: all
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -29,16 +29,16 @@
|
||||
|
||||
# input
|
||||
#
|
||||
# Notes: sun.text.resources.BreakIteratorRules no longer goes to runtime.
|
||||
# They are used at JDK build phase in order to create $(BIFILES) which
|
||||
# are used on runtime instead.
|
||||
# Notes: sun.text.resources.BreakIteratorRules no longer goes to runtime.
|
||||
# They are used at JDK build phase in order to create $(BIFILES) which
|
||||
# are used on runtime instead.
|
||||
#
|
||||
TEXT_SRCDIR = $(JDK_TOPDIR)/src/share/classes
|
||||
TEXT_PKG = sun/text/resources
|
||||
TEXT_SOURCES = $(TEXT_PKG)/BreakIteratorRules.java \
|
||||
$(TEXT_PKG)/BreakIteratorInfo.java \
|
||||
$(TEXT_PKG)/th/BreakIteratorRules_th.java \
|
||||
$(TEXT_PKG)/th/BreakIteratorInfo_th.java
|
||||
TEXT_PKG = sun/text/resources
|
||||
TEXT_SOURCES = $(TEXT_PKG)/BreakIteratorRules.java \
|
||||
$(TEXT_PKG)/BreakIteratorInfo.java \
|
||||
$(TEXT_PKG)/th/BreakIteratorRules_th.java \
|
||||
$(TEXT_PKG)/th/BreakIteratorInfo_th.java
|
||||
|
||||
# Generate BreakIteratorData
|
||||
BREAK_ITERATOR_DIR = $(JDK_OUTPUTDIR)/break_iterator
|
||||
@ -46,53 +46,53 @@ BREAK_ITERATOR_CLASSES = $(BREAK_ITERATOR_DIR)/classes
|
||||
|
||||
# JAVAC_SOURCE_PATH_UGLY_OVERRIDE is set to isolate the compile to just those
|
||||
# two files in that directory and not get anything implicit from
|
||||
# surrounding directories which aren't jdk 6 compatible.
|
||||
# surrounding directories which aren't jdk 6 compatible.
|
||||
# Because we are targeting jdk 6, but the surrounding source code is jdk 7. Ugh.
|
||||
# These two files should be moved out to a build tool! We have to disable
|
||||
# sjavac here as well.
|
||||
$(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR,\
|
||||
SETUP:=GENERATE_OLDBYTECODE,\
|
||||
SRC:=$(TEXT_SRCDIR),\
|
||||
DISABLE_SJAVAC:=true,\
|
||||
JAVAC_SOURCE_PATH_UGLY_OVERRIDE:=$(TEXT_SRCDIR)/$(TEXT_PKG),\
|
||||
INCLUDES:=$(TEXT_PKG),\
|
||||
INCLUDE_FILES:=$(TEXT_SOURCES),\
|
||||
BIN:=$(BREAK_ITERATOR_CLASSES)))
|
||||
$(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR, \
|
||||
SETUP := GENERATE_OLDBYTECODE, \
|
||||
SRC := $(TEXT_SRCDIR), \
|
||||
DISABLE_SJAVAC := true, \
|
||||
JAVAC_SOURCE_PATH_UGLY_OVERRIDE := $(TEXT_SRCDIR)/$(TEXT_PKG), \
|
||||
INCLUDES := $(TEXT_PKG), \
|
||||
INCLUDE_FILES := $(TEXT_SOURCES), \
|
||||
BIN := $(BREAK_ITERATOR_CLASSES)))
|
||||
|
||||
# Generate data resource files.
|
||||
# input
|
||||
UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData/UnicodeData.txt
|
||||
UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData/UnicodeData.txt
|
||||
|
||||
# output
|
||||
DATA_PKG_DIR = $(JDK_OUTPUTDIR)/classes/sun/text/resources
|
||||
BIFILES = $(DATA_PKG_DIR)/CharacterBreakIteratorData \
|
||||
$(DATA_PKG_DIR)/WordBreakIteratorData \
|
||||
$(DATA_PKG_DIR)/LineBreakIteratorData \
|
||||
$(DATA_PKG_DIR)/SentenceBreakIteratorData
|
||||
BIFILES_TH = $(DATA_PKG_DIR)/th/WordBreakIteratorData_th \
|
||||
$(DATA_PKG_DIR)/th/LineBreakIteratorData_th
|
||||
BIFILES = $(DATA_PKG_DIR)/CharacterBreakIteratorData \
|
||||
$(DATA_PKG_DIR)/WordBreakIteratorData \
|
||||
$(DATA_PKG_DIR)/LineBreakIteratorData \
|
||||
$(DATA_PKG_DIR)/SentenceBreakIteratorData
|
||||
BIFILES_TH = $(DATA_PKG_DIR)/th/WordBreakIteratorData_th \
|
||||
$(DATA_PKG_DIR)/th/LineBreakIteratorData_th
|
||||
|
||||
$(BIFILES): $(DATA_PKG_DIR)/_the.bifiles
|
||||
$(DATA_PKG_DIR)/_the.bifiles: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
|
||||
$(DATA_PKG_DIR)/_the.bifiles: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
|
||||
$(ECHO) $(LOG_INFO) "Generating BreakIteratorData"
|
||||
$(MKDIR) -p $(DATA_PKG_DIR)
|
||||
$(MKDIR) -p $(DATA_PKG_DIR)
|
||||
$(RM) $(BIFILES)
|
||||
$(TOOL_GENERATEBREAKITERATORDATA) \
|
||||
-o $(DATA_PKG_DIR) \
|
||||
-spec $(UNICODEDATA)
|
||||
-o $(DATA_PKG_DIR) \
|
||||
-spec $(UNICODEDATA)
|
||||
$(TOUCH) $@
|
||||
|
||||
$(BIFILES_TH): $(DATA_PKG_DIR)/_the.bifiles_th
|
||||
$(DATA_PKG_DIR)/_the.bifiles_th: JAVA_FLAGS += -Xbootclasspath/p:$(BREAK_ITERATOR_CLASSES)
|
||||
$(DATA_PKG_DIR)/_the.bifiles_th: $(BUILD_TOOLS) $(UNICODEDATA) $(BUILD_BREAKITERATOR)
|
||||
$(ECHO) $(LOG_INFO) "Generating BreakIteratorData_th"
|
||||
$(MKDIR) -p $(DATA_PKG_DIR)/th
|
||||
$(MKDIR) -p $(DATA_PKG_DIR)/th
|
||||
$(RM) $(BIFILES_TH)
|
||||
$(TOOL_GENERATEBREAKITERATORDATA) \
|
||||
-o $(DATA_PKG_DIR) \
|
||||
-spec $(UNICODEDATA) \
|
||||
-language th
|
||||
-o $(DATA_PKG_DIR) \
|
||||
-spec $(UNICODEDATA) \
|
||||
-language th
|
||||
$(TOUCH) $@
|
||||
|
||||
|
||||
|
||||
@ -26,53 +26,53 @@
|
||||
GENDATA_FONT_CONFIG_DST := $(JDK_OUTPUTDIR)/lib
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX :=
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX :=
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), linux)
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX := linux.
|
||||
ifdef OPENJDK
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs
|
||||
# This is placeholder for possible fonconfig files which may
|
||||
# useful for some highly specialized Linux distributions
|
||||
GENDATA_FONT_CONFIG_SRC_FILES :=
|
||||
# useful for some highly specialized Linux distributions
|
||||
GENDATA_FONT_CONFIG_SRC_FILES :=
|
||||
else
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
$(JDK_TOPDIR)/src/closed/solaris/classes/sun/awt/fontconfigs
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := \
|
||||
fontconfig.properties \
|
||||
fontconfig.RedHat.5.properties \
|
||||
fontconfig.RedHat.6.properties \
|
||||
fontconfig.Turbo.properties \
|
||||
fontconfig.SuSE.10.properties \
|
||||
fontconfig.SuSE.11.properties
|
||||
fontconfig.properties \
|
||||
fontconfig.RedHat.5.properties \
|
||||
fontconfig.RedHat.6.properties \
|
||||
fontconfig.Turbo.properties \
|
||||
fontconfig.SuSE.10.properties \
|
||||
fontconfig.SuSE.11.properties
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/sun/awt/fontconfigs
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX := solaris.
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
GENDATA_FONT_CONFIG_SRC_DIR := \
|
||||
$(JDK_TOPDIR)/src/macosx/classes/sun/awt/fontconfigs
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_FILES := fontconfig.properties
|
||||
GENDATA_FONT_CONFIG_SRC_PREFIX := macosx.
|
||||
endif
|
||||
|
||||
###
|
||||
|
||||
$(GENDATA_FONT_CONFIG_DST)/%.src : \
|
||||
$(GENDATA_FONT_CONFIG_DST)/%.src: \
|
||||
$(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%
|
||||
$(call install-file)
|
||||
|
||||
$(GENDATA_FONT_CONFIG_DST)/%.bfc : \
|
||||
$(GENDATA_FONT_CONFIG_DST)/%.bfc: \
|
||||
$(GENDATA_FONT_CONFIG_SRC_DIR)/$(GENDATA_FONT_CONFIG_SRC_PREFIX)%.properties
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
@ -87,4 +87,3 @@ GENDATA_BFONT_CONFIGS := $(GENDATA_FONT_CONFIG_SRC_FILES:%.properties=$(GENDATA_
|
||||
GENDATA_FONT_CONFIG := $(GENDATA_FONT_CONFIGS) $(GENDATA_BFONT_CONFIGS)
|
||||
|
||||
###
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
# questions.
|
||||
#
|
||||
|
||||
GENDATA_HTML32DTD :=
|
||||
GENDATA_HTML32DTD :=
|
||||
|
||||
HTML32DTD = $(JDK_OUTPUTDIR)/classes/javax/swing/text/html/parser/html32.bdtd
|
||||
$(HTML32DTD): $(BUILD_TOOLS)
|
||||
|
||||
@ -34,7 +34,7 @@ TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))
|
||||
|
||||
GENDATA_TZDB_DAT := $(JDK_OUTPUTDIR)/lib/tzdb.dat
|
||||
|
||||
$(GENDATA_TZDB_DAT) : $(TZDATA_TZFILES)
|
||||
$(GENDATA_TZDB_DAT): $(TZDATA_TZFILES)
|
||||
$(RM) $(GENDATA_TZDB_DAT)
|
||||
$(TOOL_TZDB) -srcdir $(TZDATA_DIR) -dstfile $(GENDATA_TZDB_DAT) $(TZDATA_TZFILE)
|
||||
|
||||
|
||||
@ -43,9 +43,9 @@ TZFILES := \
|
||||
$(addprefix $(JDK_TOPDIR)/make/sun/javazic/tzdata/,$(TZFILE0)) \
|
||||
$(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)
|
||||
$(MKDIR) -p $(GENDATA_TIMEZONE_TMP)
|
||||
$(RM) -r $(GENDATA_TIMEZONE_DST)
|
||||
|
||||
@ -30,64 +30,64 @@ include MakeBase.gmk
|
||||
include RMICompilation.gmk
|
||||
|
||||
# To ensure the latest stub generator files are picked up from corba repo
|
||||
# when available, we need to run with latest rmic version available.
|
||||
ifneq ($(COMPILE_TYPE),cross)
|
||||
RMIC := $(FIXPATH) $(JDK_OUTPUTDIR)/bin/rmic
|
||||
endif
|
||||
# when available, we need to run with latest rmic version available.
|
||||
ifneq ($(COMPILE_TYPE), cross)
|
||||
RMIC := $(FIXPATH) $(JDK_OUTPUTDIR)/bin/rmic
|
||||
endif
|
||||
|
||||
CLASSES_DIR := $(JDK_OUTPUTDIR)/classes
|
||||
# NOTE: If the smart javac dependency management is reintroduced, these classes risk
|
||||
# NOTE: If the smart javac dependency management is reintroduced, these classes risk
|
||||
# interfering with the dependency checking. In that case they will need to be kept separate.
|
||||
STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/classes
|
||||
RMIC_GENSRC_DIR := $(JDK_OUTPUTDIR)/gendocsrc_rmic
|
||||
|
||||
GENCLASSES :=
|
||||
GENCLASSES :=
|
||||
|
||||
##########################################################################################
|
||||
#
|
||||
# Generate RMI stubs
|
||||
#
|
||||
|
||||
$(eval $(call SetupRMICompilation,RMI_12,\
|
||||
CLASSES:=sun.rmi.server.Activation$$$$ActivationSystemImpl\
|
||||
java.rmi.activation.ActivationGroup\
|
||||
com.sun.jndi.rmi.registry.ReferenceWrapper,\
|
||||
CLASSES_DIR:=$(CLASSES_DIR),\
|
||||
STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\
|
||||
RUN_V12:=true))
|
||||
$(eval $(call SetupRMICompilation,RMI_12, \
|
||||
CLASSES := sun.rmi.server.Activation$$$$ActivationSystemImpl \
|
||||
java.rmi.activation.ActivationGroup \
|
||||
com.sun.jndi.rmi.registry.ReferenceWrapper, \
|
||||
CLASSES_DIR := $(CLASSES_DIR), \
|
||||
STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
|
||||
RUN_V12 := true))
|
||||
GENCLASSES += $(RMI_12)
|
||||
|
||||
$(eval $(call SetupRMICompilation,RMI_11,\
|
||||
CLASSES:=sun.rmi.registry.RegistryImpl\
|
||||
sun.rmi.transport.DGCImpl,\
|
||||
CLASSES_DIR:=$(CLASSES_DIR),\
|
||||
STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\
|
||||
RUN_V11:=true))
|
||||
$(eval $(call SetupRMICompilation,RMI_11, \
|
||||
CLASSES := sun.rmi.registry.RegistryImpl \
|
||||
sun.rmi.transport.DGCImpl, \
|
||||
CLASSES_DIR := $(CLASSES_DIR), \
|
||||
STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
|
||||
RUN_V11 := true))
|
||||
GENCLASSES += $(RMI_11)
|
||||
|
||||
# For RMI/IIOP call rmic a second time with -standardPackage option
|
||||
# so that *_tie classes are generated in package without the prefix
|
||||
# org.omg.stub (6375696)
|
||||
JMAN_RMI_CLASSES:=javax.management.remote.rmi.RMIConnectionImpl\
|
||||
javax.management.remote.rmi.RMIServerImpl
|
||||
$(eval $(call SetupRMICompilation,RMI_IIOP,\
|
||||
CLASSES:=$(JMAN_RMI_CLASSES),\
|
||||
CLASSES_DIR:=$(CLASSES_DIR),\
|
||||
STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\
|
||||
RUN_V12:=true,\
|
||||
RUN_IIOP:=true,\
|
||||
RUN_IIOP_STDPKG:=true))
|
||||
JMAN_RMI_CLASSES := javax.management.remote.rmi.RMIConnectionImpl \
|
||||
javax.management.remote.rmi.RMIServerImpl
|
||||
$(eval $(call SetupRMICompilation,RMI_IIOP, \
|
||||
CLASSES := $(JMAN_RMI_CLASSES), \
|
||||
CLASSES_DIR := $(CLASSES_DIR), \
|
||||
STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
|
||||
RUN_V12 := true, \
|
||||
RUN_IIOP := true, \
|
||||
RUN_IIOP_STDPKG := true))
|
||||
GENCLASSES += $(RMI_IIOP)
|
||||
|
||||
# Keep generated RMI/JRMP Stub source files and copy them to RMIC_GENSRC_DIR
|
||||
# so that javadoc can include them in the API (4997471)
|
||||
$(eval $(call SetupRMICompilation,RMI_SRC,\
|
||||
CLASSES:=$(JMAN_RMI_CLASSES),\
|
||||
CLASSES_DIR:=$(CLASSES_DIR),\
|
||||
STUB_CLASSES_DIR:=$(RMIC_GENSRC_DIR),\
|
||||
RUN_V12:=true,\
|
||||
KEEP_GENERATED:=true))
|
||||
GENCLASSES += $(filter %.java,$(RMI_SRC))
|
||||
$(eval $(call SetupRMICompilation,RMI_SRC, \
|
||||
CLASSES := $(JMAN_RMI_CLASSES), \
|
||||
CLASSES_DIR := $(CLASSES_DIR), \
|
||||
STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR), \
|
||||
RUN_V12 := true, \
|
||||
KEEP_GENERATED := true))
|
||||
GENCLASSES += $(filter %.java, $(RMI_SRC))
|
||||
|
||||
##########################################################################################
|
||||
|
||||
|
||||
@ -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) $@
|
||||
|
||||
all: $(JDK_OUTPUTDIR)/classes/_the.gendata
|
||||
|
||||
@ -65,11 +65,11 @@ GENSRC += $(GENSRC_BUFFER)
|
||||
include GensrcExceptions.gmk
|
||||
GENSRC += $(GENSRC_EXCEPTIONS)
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS),windows)
|
||||
ifneq ($(OPENJDK_TARGET_OS), windows)
|
||||
include GensrcIcons.gmk
|
||||
GENSRC += $(GENSRC_AWT_ICONS)
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
GENSRC += $(GENSRC_OSX_ICONS)
|
||||
endif
|
||||
|
||||
@ -84,11 +84,11 @@ include GensrcSwing.gmk
|
||||
GENSRC += $(GENSRC_SWING_BEANINFO) $(GENSRC_SWING_NIMBUS)
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
include GensrcJObjC.gmk
|
||||
GENSRC += $(GENSRC_JOBJC)
|
||||
include GensrcJObjC.gmk
|
||||
GENSRC += $(GENSRC_JOBJC)
|
||||
endif
|
||||
|
||||
$(GENSRC) : $(BUILD_TOOLS)
|
||||
$(GENSRC): $(BUILD_TOOLS)
|
||||
|
||||
all: $(GENSRC)
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
# questions.
|
||||
#
|
||||
|
||||
GENSRC_BUFFER :=
|
||||
GENSRC_BUFFER :=
|
||||
|
||||
GENSRC_BUFFER_TMP := $(JDK_OUTPUTDIR)/gensrc
|
||||
GENSRC_BUFFER_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio
|
||||
@ -32,349 +32,349 @@ GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio
|
||||
|
||||
###
|
||||
|
||||
$(GENSRC_BUFFER_DST)/_the.buffer.dir :
|
||||
$(GENSRC_BUFFER_DST)/_the.buffer.dir:
|
||||
$(ECHO) "Generating buffer classes"
|
||||
$(MKDIR) -p $(@D)
|
||||
$(TOUCH) $@
|
||||
|
||||
define fixRw
|
||||
$1_RW := $2
|
||||
$1_rwkey := rw
|
||||
ifeq (R,$2)
|
||||
$1_rwkey := ro
|
||||
endif
|
||||
$1_RW := $2
|
||||
$1_rwkey := rw
|
||||
ifeq (R, $2)
|
||||
$1_rwkey := ro
|
||||
endif
|
||||
endef
|
||||
|
||||
define typesAndBits
|
||||
# param 1 target
|
||||
# param 2 type
|
||||
# param 3 BO
|
||||
$1_a := a
|
||||
$1_A := A
|
||||
# param 1 target
|
||||
# param 2 type
|
||||
# param 3 BO
|
||||
$1_a := a
|
||||
$1_A := A
|
||||
|
||||
$1_type := $2
|
||||
$1_type := $2
|
||||
|
||||
ifeq ($2, byte)
|
||||
$1_x := b
|
||||
$1_Type := Byte
|
||||
$1_fulltype := byte
|
||||
$1_Fulltype := Byte
|
||||
$1_category := integralType
|
||||
$1_LBPV := 0
|
||||
endif
|
||||
ifeq ($2, byte)
|
||||
$1_x := b
|
||||
$1_Type := Byte
|
||||
$1_fulltype := byte
|
||||
$1_Fulltype := Byte
|
||||
$1_category := integralType
|
||||
$1_LBPV := 0
|
||||
endif
|
||||
|
||||
ifeq ($2, char)
|
||||
$1_x := c
|
||||
$1_Type := Char
|
||||
$1_fulltype := character
|
||||
$1_Fulltype := Character
|
||||
$1_category := integralType
|
||||
$1_streams := streamableType
|
||||
$1_streamtype := int
|
||||
$1_Streamtype := Int
|
||||
$1_LBPV := 1
|
||||
endif
|
||||
ifeq ($2, char)
|
||||
$1_x := c
|
||||
$1_Type := Char
|
||||
$1_fulltype := character
|
||||
$1_Fulltype := Character
|
||||
$1_category := integralType
|
||||
$1_streams := streamableType
|
||||
$1_streamtype := int
|
||||
$1_Streamtype := Int
|
||||
$1_LBPV := 1
|
||||
endif
|
||||
|
||||
ifeq ($2, short)
|
||||
$1_x := s
|
||||
$1_Type := Short
|
||||
$1_fulltype := short
|
||||
$1_Fulltype := Short
|
||||
$1_category := integralType
|
||||
$1_LBPV := 1
|
||||
endif
|
||||
ifeq ($2, short)
|
||||
$1_x := s
|
||||
$1_Type := Short
|
||||
$1_fulltype := short
|
||||
$1_Fulltype := Short
|
||||
$1_category := integralType
|
||||
$1_LBPV := 1
|
||||
endif
|
||||
|
||||
ifeq ($2, int)
|
||||
$1_a := an
|
||||
$1_A := An
|
||||
$1_x := i
|
||||
$1_Type := Int
|
||||
$1_fulltype := integer
|
||||
$1_Fulltype := Integer
|
||||
$1_category := integralType
|
||||
$1_LBPV := 2
|
||||
endif
|
||||
ifeq ($2, int)
|
||||
$1_a := an
|
||||
$1_A := An
|
||||
$1_x := i
|
||||
$1_Type := Int
|
||||
$1_fulltype := integer
|
||||
$1_Fulltype := Integer
|
||||
$1_category := integralType
|
||||
$1_LBPV := 2
|
||||
endif
|
||||
|
||||
ifeq ($2, long)
|
||||
$1_x := l
|
||||
$1_Type := Long
|
||||
$1_fulltype := long
|
||||
$1_Fulltype := Long
|
||||
$1_category := integralType
|
||||
$1_LBPV := 3
|
||||
endif
|
||||
ifeq ($2, long)
|
||||
$1_x := l
|
||||
$1_Type := Long
|
||||
$1_fulltype := long
|
||||
$1_Fulltype := Long
|
||||
$1_category := integralType
|
||||
$1_LBPV := 3
|
||||
endif
|
||||
|
||||
ifeq ($2, float)
|
||||
$1_x := f
|
||||
$1_Type := Float
|
||||
$1_fulltype := float
|
||||
$1_Fulltype := Float
|
||||
$1_category := floatingPointType
|
||||
$1_LBPV := 2
|
||||
endif
|
||||
ifeq ($2, float)
|
||||
$1_x := f
|
||||
$1_Type := Float
|
||||
$1_fulltype := float
|
||||
$1_Fulltype := Float
|
||||
$1_category := floatingPointType
|
||||
$1_LBPV := 2
|
||||
endif
|
||||
|
||||
ifeq ($2, double)
|
||||
$1_x := d
|
||||
$1_Type := Double
|
||||
$1_fulltype := double
|
||||
$1_Fulltype := Double
|
||||
$1_category := floatingPointType
|
||||
$1_LBPV := 3
|
||||
endif
|
||||
ifeq ($2, double)
|
||||
$1_x := d
|
||||
$1_Type := Double
|
||||
$1_fulltype := double
|
||||
$1_Fulltype := Double
|
||||
$1_category := floatingPointType
|
||||
$1_LBPV := 3
|
||||
endif
|
||||
|
||||
$1_Swaptype := $$($1_Type)
|
||||
$1_memtype := $2
|
||||
$1_Memtype := $$($1_Type)
|
||||
$1_Swaptype := $$($1_Type)
|
||||
$1_memtype := $2
|
||||
$1_Memtype := $$($1_Type)
|
||||
|
||||
ifeq ($2, float)
|
||||
$1_memtype := int
|
||||
$1_Memtype := Int
|
||||
ifneq ($3,U)
|
||||
$1_Swaptype := Int
|
||||
$1_fromBits := Float.intBitsToFloat
|
||||
$1_toBits := Float.floatToRawIntBits
|
||||
endif
|
||||
endif
|
||||
ifeq ($2, float)
|
||||
$1_memtype := int
|
||||
$1_Memtype := Int
|
||||
ifneq ($3, U)
|
||||
$1_Swaptype := Int
|
||||
$1_fromBits := Float.intBitsToFloat
|
||||
$1_toBits := Float.floatToRawIntBits
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($2, double)
|
||||
$1_memtype := long
|
||||
$1_Memtype := Long
|
||||
ifneq ($3,U)
|
||||
$1_Swaptype := Long
|
||||
$1_fromBits := Double.longBitsToDouble
|
||||
$1_toBits := Double.doubleToRawLongBits
|
||||
endif
|
||||
endif
|
||||
ifeq ($2, double)
|
||||
$1_memtype := long
|
||||
$1_Memtype := Long
|
||||
ifneq ($3, U)
|
||||
$1_Swaptype := Long
|
||||
$1_fromBits := Double.longBitsToDouble
|
||||
$1_toBits := Double.doubleToRawLongBits
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($3, S)
|
||||
$1_swap := Bits.swap
|
||||
endif
|
||||
ifeq ($3, S)
|
||||
$1_swap := Bits.swap
|
||||
endif
|
||||
endef
|
||||
|
||||
define genBinOps
|
||||
# param 1 target
|
||||
# param 2 type
|
||||
# param 3 BO
|
||||
# param 4 RW
|
||||
# param 5 nbytes
|
||||
# param 6 nbytesButOne
|
||||
$(call typesAndBits,$1,$2,$3)
|
||||
$(call fixRw,$1,$4)
|
||||
$1_nbytes := $5
|
||||
$1_nbytesButOne := $6
|
||||
$1_CMD := $(TOOL_SPP) \
|
||||
-Dtype=$$($1_type) \
|
||||
-DType=$$($1_Type) \
|
||||
-Dfulltype=$$($1_fulltype) \
|
||||
-Dmemtype=$$($1_memtype) \
|
||||
-DMemtype=$$($1_Memtype) \
|
||||
-DfromBits=$$($1_fromBits) \
|
||||
-DtoBits=$$($1_toBits) \
|
||||
-DLG_BYTES_PER_VALUE=$$($1_LBPV) \
|
||||
-DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \
|
||||
-Dnbytes=$$($1_nbytes) \
|
||||
-DnbytesButOne=$$($1_nbytesButOne) \
|
||||
-DRW=$$($1_RW) \
|
||||
-K$$($1_rwkey) \
|
||||
-Da=$$($1_a) \
|
||||
-be
|
||||
# param 1 target
|
||||
# param 2 type
|
||||
# param 3 BO
|
||||
# param 4 RW
|
||||
# param 5 nbytes
|
||||
# param 6 nbytesButOne
|
||||
$(call typesAndBits,$1,$2,$3)
|
||||
$(call fixRw,$1,$4)
|
||||
$1_nbytes := $5
|
||||
$1_nbytesButOne := $6
|
||||
$1_CMD := $(TOOL_SPP) \
|
||||
-Dtype=$$($1_type) \
|
||||
-DType=$$($1_Type) \
|
||||
-Dfulltype=$$($1_fulltype) \
|
||||
-Dmemtype=$$($1_memtype) \
|
||||
-DMemtype=$$($1_Memtype) \
|
||||
-DfromBits=$$($1_fromBits) \
|
||||
-DtoBits=$$($1_toBits) \
|
||||
-DLG_BYTES_PER_VALUE=$$($1_LBPV) \
|
||||
-DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \
|
||||
-Dnbytes=$$($1_nbytes) \
|
||||
-DnbytesButOne=$$($1_nbytesButOne) \
|
||||
-DRW=$$($1_RW) \
|
||||
-K$$($1_rwkey) \
|
||||
-Da=$$($1_a) \
|
||||
-be
|
||||
endef
|
||||
|
||||
define SetupGenBuffer
|
||||
# param 1 is for output file
|
||||
# param 2 is template dependency
|
||||
# param 3-9 are named args.
|
||||
# type :=
|
||||
# BIN :=
|
||||
# RW := Mutability (R)ead-only (W)ritable
|
||||
# BO := (U)nswapped/(S)wapped/(L)ittle/(B)ig
|
||||
#
|
||||
$(if $3,$1_$(strip $3))
|
||||
$(if $4,$1_$(strip $4))
|
||||
$(if $5,$1_$(strip $5))
|
||||
$(if $6,$1_$(strip $6))
|
||||
$(if $7,$1_$(strip $7))
|
||||
$(if $8,$1_$(strip $8))
|
||||
$(if $9,$1_$(strip $9))
|
||||
$(if $(10),$1_$(strip $(10)))
|
||||
$(if $(11),$1_$(strip $(11)))
|
||||
$(if $(12),$1_$(strip $(12)))
|
||||
$(if $(13),$1_$(strip $(13)))
|
||||
$(if $(14),$1_$(strip $(14)))
|
||||
$(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15,$(if $($i),$1_$(strip $($i)))$(NEWLINE))
|
||||
$(call LogSetupMacroEntry,SetupGenBuffer($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
|
||||
$(if $(16),$(error Internal makefile error: Too many arguments to SetupGenBuffer, please update GensrcBuffer.gmk))
|
||||
# param 1 is for output file
|
||||
# param 2 is template dependency
|
||||
# param 3-9 are named args.
|
||||
# type :=
|
||||
# BIN :=
|
||||
# RW := Mutability (R)ead-only (W)ritable
|
||||
# BO := (U)nswapped/(S)wapped/(L)ittle/(B)ig
|
||||
#
|
||||
$(if $3,$1_$(strip $3))
|
||||
$(if $4,$1_$(strip $4))
|
||||
$(if $5,$1_$(strip $5))
|
||||
$(if $6,$1_$(strip $6))
|
||||
$(if $7,$1_$(strip $7))
|
||||
$(if $8,$1_$(strip $8))
|
||||
$(if $9,$1_$(strip $9))
|
||||
$(if $(10),$1_$(strip $(10)))
|
||||
$(if $(11),$1_$(strip $(11)))
|
||||
$(if $(12),$1_$(strip $(12)))
|
||||
$(if $(13),$1_$(strip $(13)))
|
||||
$(if $(14),$1_$(strip $(14)))
|
||||
$(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15,$(if $($i),$1_$(strip $($i)))$(NEWLINE))
|
||||
$(call LogSetupMacroEntry,SetupGenBuffer($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
|
||||
$(if $(16),$(error Internal makefile error: Too many arguments to SetupGenBuffer, please update GensrcBuffer.gmk))
|
||||
|
||||
$(call fixRw,$1,$$($1_RW))
|
||||
$(call typesAndBits,$1,$$($1_type),$$($1_BO))
|
||||
$(call fixRw,$1,$$($1_RW))
|
||||
$(call typesAndBits,$1,$$($1_type),$$($1_BO))
|
||||
|
||||
$1_DST := $(GENSRC_BUFFER_DST)/$1.java
|
||||
$1_SRC := $(GENSRC_BUFFER_SRC)/$(strip $2).java.template
|
||||
$1_SRC_BIN := $(GENSRC_BUFFER_SRC)/$(strip $2)-bin.java.template
|
||||
$1_DST := $(GENSRC_BUFFER_DST)/$1.java
|
||||
$1_SRC := $(GENSRC_BUFFER_SRC)/$(strip $2).java.template
|
||||
$1_SRC_BIN := $(GENSRC_BUFFER_SRC)/$(strip $2)-bin.java.template
|
||||
|
||||
$1_DEP := $$($1_SRC)
|
||||
ifneq ($$($1_BIN),1)
|
||||
$1_DEP := $$($1_SRC)
|
||||
$1_OUT := $$($1_DST)
|
||||
else
|
||||
$1_DEP += $$($1_SRC) $$($1_SRC_BIN)
|
||||
$1_OUT := $(GENSRC_BUFFER_DST)/$1.binop.0.java
|
||||
endif
|
||||
$1_DEP := $$($1_SRC)
|
||||
ifneq ($$($1_BIN), 1)
|
||||
$1_DEP := $$($1_SRC)
|
||||
$1_OUT := $$($1_DST)
|
||||
else
|
||||
$1_DEP += $$($1_SRC) $$($1_SRC_BIN)
|
||||
$1_OUT := $(GENSRC_BUFFER_DST)/$1.binop.0.java
|
||||
endif
|
||||
|
||||
ifeq ($$($1_BIN),1)
|
||||
$(call genBinOps,$1_char,char,$$($1_BO),$$($1_RW),two,one)
|
||||
$(call genBinOps,$1_short,short,$$($1_BO),$$($1_RW),two,one)
|
||||
$(call genBinOps,$1_int,int,$$($1_BO),$$($1_RW),four,three)
|
||||
$(call genBinOps,$1_long,long,$$($1_BO),$$($1_RW),eight,seven)
|
||||
$(call genBinOps,$1_float,float,$$($1_BO),$$($1_RW),four,three)
|
||||
$(call genBinOps,$1_double,double,$$($1_BO),$$($1_RW),eight,seven)
|
||||
endif
|
||||
ifeq ($$($1_BIN), 1)
|
||||
$(call genBinOps,$1_char,char,$$($1_BO),$$($1_RW),two,one)
|
||||
$(call genBinOps,$1_short,short,$$($1_BO),$$($1_RW),two,one)
|
||||
$(call genBinOps,$1_int,int,$$($1_BO),$$($1_RW),four,three)
|
||||
$(call genBinOps,$1_long,long,$$($1_BO),$$($1_RW),eight,seven)
|
||||
$(call genBinOps,$1_float,float,$$($1_BO),$$($1_RW),four,three)
|
||||
$(call genBinOps,$1_double,double,$$($1_BO),$$($1_RW),eight,seven)
|
||||
endif
|
||||
|
||||
$$($1_DST) : $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.buffer.dir
|
||||
$$($1_DST): $$($1_DEP) $(GENSRC_BUFFER_DST)/_the.buffer.dir
|
||||
$(TOOL_SPP) < $$($1_SRC) > $$($1_OUT).tmp \
|
||||
-K$$($1_type) \
|
||||
-K$$($1_category) \
|
||||
-K$$($1_streams) \
|
||||
-Dtype=$$($1_type) \
|
||||
-DType=$$($1_Type) \
|
||||
-Dfulltype=$$($1_fulltype) \
|
||||
-DFulltype=$$($1_Fulltype) \
|
||||
-Dstreamtype=$$($1_streamtype) \
|
||||
-DStreamtype=$$($1_Streamtype) \
|
||||
-Dx=$$($1_x) \
|
||||
-Dmemtype=$$($1_memtype) \
|
||||
-DMemtype=$$($1_Memtype) \
|
||||
-DSwaptype=$$($1_Swaptype) \
|
||||
-DfromBits=$$($1_fromBits) \
|
||||
-DtoBits=$$($1_toBits) \
|
||||
-DLG_BYTES_PER_VALUE=$$($1_LBPV) \
|
||||
-DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \
|
||||
-DBO=$$($1_BO) \
|
||||
-Dswap=$$($1_swap) \
|
||||
-DRW=$$($1_RW) \
|
||||
-K$$($1_rwkey) \
|
||||
-Da=$$($1_a) \
|
||||
-DA=$$($1_A) \
|
||||
-Kbo$$($1_BO)
|
||||
$(MV) $$($1_OUT).tmp $$($1_OUT)
|
||||
# Do the extra bin thing
|
||||
ifeq ($$($1_BIN),1)
|
||||
$(SED) -e '/#BIN/,$$$$d' < $$($1_OUT) > $$($1_DST).tmp
|
||||
$(RM) $$($1_OUT)
|
||||
$$($1_char_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_short_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_int_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_long_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_float_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_double_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$(PRINTF) "}\n" >> $$($1_DST).tmp
|
||||
mv $$($1_DST).tmp $$($1_DST)
|
||||
endif
|
||||
-K$$($1_type) \
|
||||
-K$$($1_category) \
|
||||
-K$$($1_streams) \
|
||||
-Dtype=$$($1_type) \
|
||||
-DType=$$($1_Type) \
|
||||
-Dfulltype=$$($1_fulltype) \
|
||||
-DFulltype=$$($1_Fulltype) \
|
||||
-Dstreamtype=$$($1_streamtype) \
|
||||
-DStreamtype=$$($1_Streamtype) \
|
||||
-Dx=$$($1_x) \
|
||||
-Dmemtype=$$($1_memtype) \
|
||||
-DMemtype=$$($1_Memtype) \
|
||||
-DSwaptype=$$($1_Swaptype) \
|
||||
-DfromBits=$$($1_fromBits) \
|
||||
-DtoBits=$$($1_toBits) \
|
||||
-DLG_BYTES_PER_VALUE=$$($1_LBPV) \
|
||||
-DBYTES_PER_VALUE="(1 << $$($1_LBPV))" \
|
||||
-DBO=$$($1_BO) \
|
||||
-Dswap=$$($1_swap) \
|
||||
-DRW=$$($1_RW) \
|
||||
-K$$($1_rwkey) \
|
||||
-Da=$$($1_a) \
|
||||
-DA=$$($1_A) \
|
||||
-Kbo$$($1_BO)
|
||||
$(MV) $$($1_OUT).tmp $$($1_OUT)
|
||||
# Do the extra bin thing
|
||||
ifeq ($$($1_BIN), 1)
|
||||
$(SED) -e '/#BIN/,$$$$d' < $$($1_OUT) > $$($1_DST).tmp
|
||||
$(RM) $$($1_OUT)
|
||||
$$($1_char_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_short_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_int_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_long_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_float_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$$($1_double_CMD) < $$($1_SRC_BIN) >> $$($1_DST).tmp
|
||||
$(PRINTF) "}\n" >> $$($1_DST).tmp
|
||||
mv $$($1_DST).tmp $$($1_DST)
|
||||
endif
|
||||
|
||||
GENSRC_BUFFER += $$($1_DST)
|
||||
GENSRC_BUFFER += $$($1_DST)
|
||||
|
||||
endef
|
||||
|
||||
###
|
||||
|
||||
X_BUF :=X-Buffer
|
||||
X_BUF := X-Buffer
|
||||
|
||||
$(eval $(call SetupGenBuffer,ByteBuffer, $(X_BUF),type:=byte,BIN:=1))
|
||||
$(eval $(call SetupGenBuffer,CharBuffer, $(X_BUF),type:=char))
|
||||
$(eval $(call SetupGenBuffer,ShortBuffer, $(X_BUF),type:=short))
|
||||
$(eval $(call SetupGenBuffer,IntBuffer, $(X_BUF),type:=int))
|
||||
$(eval $(call SetupGenBuffer,LongBuffer, $(X_BUF),type:=long))
|
||||
$(eval $(call SetupGenBuffer,FloatBuffer, $(X_BUF),type:=float))
|
||||
$(eval $(call SetupGenBuffer,DoubleBuffer,$(X_BUF),type:=double))
|
||||
$(eval $(call SetupGenBuffer,ByteBuffer, $(X_BUF), type:=byte, BIN:=1))
|
||||
$(eval $(call SetupGenBuffer,CharBuffer, $(X_BUF), type:=char))
|
||||
$(eval $(call SetupGenBuffer,ShortBuffer, $(X_BUF), type:=short))
|
||||
$(eval $(call SetupGenBuffer,IntBuffer, $(X_BUF), type:=int))
|
||||
$(eval $(call SetupGenBuffer,LongBuffer, $(X_BUF), type:=long))
|
||||
$(eval $(call SetupGenBuffer,FloatBuffer, $(X_BUF), type:=float))
|
||||
$(eval $(call SetupGenBuffer,DoubleBuffer,$(X_BUF), type:=double))
|
||||
|
||||
# Buffers whose contents are heap-allocated
|
||||
#
|
||||
#
|
||||
HEAP_X_BUF := Heap-X-Buffer
|
||||
|
||||
$(eval $(call SetupGenBuffer,HeapByteBuffer, $(HEAP_X_BUF),type:=byte))
|
||||
$(eval $(call SetupGenBuffer,HeapByteBufferR, $(HEAP_X_BUF),type:=byte,RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapCharBuffer, $(HEAP_X_BUF),type:=char))
|
||||
$(eval $(call SetupGenBuffer,HeapCharBufferR, $(HEAP_X_BUF),type:=char,RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapShortBuffer, $(HEAP_X_BUF),type:=short))
|
||||
$(eval $(call SetupGenBuffer,HeapShortBufferR, $(HEAP_X_BUF),type:=short,RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapIntBuffer, $(HEAP_X_BUF),type:=int))
|
||||
$(eval $(call SetupGenBuffer,HeapIntBufferR, $(HEAP_X_BUF),type:=int,RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapLongBuffer, $(HEAP_X_BUF),type:=long))
|
||||
$(eval $(call SetupGenBuffer,HeapLongBufferR, $(HEAP_X_BUF),type:=long,RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapFloatBuffer, $(HEAP_X_BUF),type:=float))
|
||||
$(eval $(call SetupGenBuffer,HeapFloatBufferR, $(HEAP_X_BUF),type:=float,RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapDoubleBuffer, $(HEAP_X_BUF),type:=double))
|
||||
$(eval $(call SetupGenBuffer,HeapDoubleBufferR,$(HEAP_X_BUF),type:=double,RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapByteBuffer, $(HEAP_X_BUF), type:=byte))
|
||||
$(eval $(call SetupGenBuffer,HeapByteBufferR, $(HEAP_X_BUF), type:=byte, RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapCharBuffer, $(HEAP_X_BUF), type:=char))
|
||||
$(eval $(call SetupGenBuffer,HeapCharBufferR, $(HEAP_X_BUF), type:=char, RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapShortBuffer, $(HEAP_X_BUF), type:=short))
|
||||
$(eval $(call SetupGenBuffer,HeapShortBufferR, $(HEAP_X_BUF), type:=short, RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapIntBuffer, $(HEAP_X_BUF), type:=int))
|
||||
$(eval $(call SetupGenBuffer,HeapIntBufferR, $(HEAP_X_BUF), type:=int, RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapLongBuffer, $(HEAP_X_BUF), type:=long))
|
||||
$(eval $(call SetupGenBuffer,HeapLongBufferR, $(HEAP_X_BUF), type:=long, RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapFloatBuffer, $(HEAP_X_BUF), type:=float))
|
||||
$(eval $(call SetupGenBuffer,HeapFloatBufferR, $(HEAP_X_BUF), type:=float, RW:=R))
|
||||
$(eval $(call SetupGenBuffer,HeapDoubleBuffer, $(HEAP_X_BUF), type:=double))
|
||||
$(eval $(call SetupGenBuffer,HeapDoubleBufferR,$(HEAP_X_BUF), type:=double, RW:=R))
|
||||
|
||||
# Direct byte buffer
|
||||
#
|
||||
#
|
||||
DIRECT_X_BUF := Direct-X-Buffer
|
||||
|
||||
$(eval $(call SetupGenBuffer,DirectByteBuffer, $(DIRECT_X_BUF),type:=byte,BIN:=1))
|
||||
$(eval $(call SetupGenBuffer,DirectByteBufferR,$(DIRECT_X_BUF),type:=byte,BIN:=1,RW:=R))
|
||||
$(eval $(call SetupGenBuffer,DirectByteBuffer, $(DIRECT_X_BUF), type:=byte, BIN:=1))
|
||||
$(eval $(call SetupGenBuffer,DirectByteBufferR,$(DIRECT_X_BUF), type:=byte, BIN:=1, RW:=R))
|
||||
|
||||
# Unswapped views of direct byte buffers
|
||||
#
|
||||
$(eval $(call SetupGenBuffer,DirectCharBufferU, $(DIRECT_X_BUF),type:=char,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectCharBufferRU, $(DIRECT_X_BUF),type:=char,RW:=R,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectShortBufferU, $(DIRECT_X_BUF),type:=short,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectShortBufferRU, $(DIRECT_X_BUF),type:=short,RW:=R,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectIntBufferU, $(DIRECT_X_BUF),type:=int,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectIntBufferRU, $(DIRECT_X_BUF),type:=int,RW:=R,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectLongBufferU, $(DIRECT_X_BUF),type:=long,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectLongBufferRU, $(DIRECT_X_BUF),type:=long,RW:=R,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectFloatBufferU, $(DIRECT_X_BUF),type:=float,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectFloatBufferRU, $(DIRECT_X_BUF),type:=float,RW:=R,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectDoubleBufferU, $(DIRECT_X_BUF),type:=double,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectDoubleBufferRU,$(DIRECT_X_BUF),type:=double,RW:=R,BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectCharBufferU, $(DIRECT_X_BUF), type:=char, BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectCharBufferRU, $(DIRECT_X_BUF), type:=char, RW:=R, BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectShortBufferU, $(DIRECT_X_BUF), type:=short, BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectShortBufferRU, $(DIRECT_X_BUF), type:=short, RW:=R, BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectIntBufferU, $(DIRECT_X_BUF), type:=int, BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectIntBufferRU, $(DIRECT_X_BUF), type:=int, RW:=R, BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectLongBufferU, $(DIRECT_X_BUF), type:=long, BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectLongBufferRU, $(DIRECT_X_BUF), type:=long, RW:=R, BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectFloatBufferU, $(DIRECT_X_BUF), type:=float, BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectFloatBufferRU, $(DIRECT_X_BUF), type:=float, RW:=R, BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectDoubleBufferU, $(DIRECT_X_BUF), type:=double, BO:=U))
|
||||
$(eval $(call SetupGenBuffer,DirectDoubleBufferRU,$(DIRECT_X_BUF), type:=double, RW:=R, BO:=U))
|
||||
|
||||
# Swapped views of direct byte buffers
|
||||
#
|
||||
$(eval $(call SetupGenBuffer,DirectCharBufferS, $(DIRECT_X_BUF),type:=char,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectCharBufferRS, $(DIRECT_X_BUF),type:=char,RW:=R,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectShortBufferS, $(DIRECT_X_BUF),type:=short,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectShortBufferRS, $(DIRECT_X_BUF),type:=short,RW:=R,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectIntBufferS, $(DIRECT_X_BUF),type:=int,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectIntBufferRS, $(DIRECT_X_BUF),type:=int,RW:=R,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectLongBufferS, $(DIRECT_X_BUF),type:=long,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectLongBufferRS, $(DIRECT_X_BUF),type:=long,RW:=R,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectFloatBufferS, $(DIRECT_X_BUF),type:=float,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectFloatBufferRS, $(DIRECT_X_BUF),type:=float,RW:=R,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectDoubleBufferS, $(DIRECT_X_BUF),type:=double,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectDoubleBufferRS,$(DIRECT_X_BUF),type:=double,RW:=R,BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectCharBufferS, $(DIRECT_X_BUF), type:=char, BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectCharBufferRS, $(DIRECT_X_BUF), type:=char, RW:=R, BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectShortBufferS, $(DIRECT_X_BUF), type:=short, BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectShortBufferRS, $(DIRECT_X_BUF), type:=short, RW:=R, BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectIntBufferS, $(DIRECT_X_BUF), type:=int, BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectIntBufferRS, $(DIRECT_X_BUF), type:=int, RW:=R, BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectLongBufferS, $(DIRECT_X_BUF), type:=long, BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectLongBufferRS, $(DIRECT_X_BUF), type:=long, RW:=R, BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectFloatBufferS, $(DIRECT_X_BUF), type:=float, BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectFloatBufferRS, $(DIRECT_X_BUF), type:=float, RW:=R, BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectDoubleBufferS, $(DIRECT_X_BUF), type:=double, BO:=S))
|
||||
$(eval $(call SetupGenBuffer,DirectDoubleBufferRS,$(DIRECT_X_BUF), type:=double, RW:=R, BO:=S))
|
||||
|
||||
# Big-endian views of byte buffers
|
||||
#
|
||||
BYTE_X_BUF := ByteBufferAs-X-Buffer
|
||||
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferB, $(BYTE_X_BUF),type:=char,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRB, $(BYTE_X_BUF),type:=char,RW:=R,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferB, $(BYTE_X_BUF),type:=short,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRB, $(BYTE_X_BUF),type:=short,RW:=R,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferB, $(BYTE_X_BUF),type:=int,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRB, $(BYTE_X_BUF),type:=int,RW:=R,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferB, $(BYTE_X_BUF),type:=long,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRB, $(BYTE_X_BUF),type:=long,RW:=R,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferB, $(BYTE_X_BUF),type:=float,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRB, $(BYTE_X_BUF),type:=float,RW:=R,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferB, $(BYTE_X_BUF),type:=double,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRB,$(BYTE_X_BUF),type:=double,RW:=R,BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferB, $(BYTE_X_BUF), type:=char, BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRB, $(BYTE_X_BUF), type:=char, RW:=R, BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferB, $(BYTE_X_BUF), type:=short, BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRB, $(BYTE_X_BUF), type:=short, RW:=R, BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferB, $(BYTE_X_BUF), type:=int, BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRB, $(BYTE_X_BUF), type:=int, RW:=R, BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferB, $(BYTE_X_BUF), type:=long, BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRB, $(BYTE_X_BUF), type:=long, RW:=R, BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferB, $(BYTE_X_BUF), type:=float, BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRB, $(BYTE_X_BUF), type:=float, RW:=R, BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferB, $(BYTE_X_BUF), type:=double, BO:=B))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRB,$(BYTE_X_BUF), type:=double, RW:=R, BO:=B))
|
||||
|
||||
# Little-endian views of byte buffers
|
||||
#
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferL, $(BYTE_X_BUF),type:=char,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRL, $(BYTE_X_BUF),type:=char,RW:=R,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferL, $(BYTE_X_BUF),type:=short,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRL, $(BYTE_X_BUF),type:=short,RW:=R,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferL, $(BYTE_X_BUF),type:=int,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRL, $(BYTE_X_BUF),type:=int,RW:=R,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferL, $(BYTE_X_BUF),type:=long,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRL, $(BYTE_X_BUF),type:=long,RW:=R,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferL, $(BYTE_X_BUF),type:=float,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRL, $(BYTE_X_BUF),type:=float,RW:=R,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferL, $(BYTE_X_BUF),type:=double,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRL,$(BYTE_X_BUF),type:=double,RW:=R,BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferL, $(BYTE_X_BUF), type:=char, BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsCharBufferRL, $(BYTE_X_BUF), type:=char, RW:=R, BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferL, $(BYTE_X_BUF), type:=short, BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsShortBufferRL, $(BYTE_X_BUF), type:=short, RW:=R, BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferL, $(BYTE_X_BUF), type:=int, BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsIntBufferRL, $(BYTE_X_BUF), type:=int, RW:=R, BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferL, $(BYTE_X_BUF), type:=long, BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsLongBufferRL, $(BYTE_X_BUF), type:=long, RW:=R, BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferL, $(BYTE_X_BUF), type:=float, BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsFloatBufferRL, $(BYTE_X_BUF), type:=float, RW:=R, BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferL, $(BYTE_X_BUF), type:=double, BO:=L))
|
||||
$(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRL,$(BYTE_X_BUF), type:=double, RW:=R, BO:=L))
|
||||
|
||||
###
|
||||
|
||||
$(GENSRC_BUFFER) : $(BUILD_TOOLS)
|
||||
$(GENSRC_BUFFER): $(BUILD_TOOLS)
|
||||
|
||||
@ -31,8 +31,8 @@ GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc
|
||||
CLDR_METAINFO_FILE := $(GENSRC_DIR)/sun/util/cldr/CLDRLocaleDataMetaInfo.java
|
||||
|
||||
$(CLDR_METAINFO_FILE): $(wildcard $(CLDRSRCDIR)/common/dtd/*.dtd) \
|
||||
$(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
|
||||
$(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml)
|
||||
$(wildcard $(CLDRSRCDIR)/common/main/*.xml) \
|
||||
$(wildcard $(CLDRSRCDIR)/common/supplemental/*.xml)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(TOOL_CLDRCONVERTER) -base $(CLDRSRCDIR) -o $(GENSRC_DIR)
|
||||
|
||||
|
||||
@ -24,41 +24,41 @@
|
||||
#
|
||||
|
||||
#
|
||||
# Rules to create $(JDK_OUTPUTDIR)/gensrc/sun/lang/CharacterData*.java
|
||||
# Rules to create $(JDK_OUTPUTDIR)/gensrc/sun/lang/CharacterData*.java
|
||||
#
|
||||
|
||||
GENSRC_CHARACTERDATA:=
|
||||
GENSRC_CHARACTERDATA :=
|
||||
|
||||
CHARACTERDATA = $(JDK_TOPDIR)/make/tools/GenerateCharacter
|
||||
UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData
|
||||
UNICODEDATA = $(JDK_TOPDIR)/make/tools/UnicodeData
|
||||
|
||||
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)
|
||||
$(ECHO) $(LOG_INFO) Generating $1.java
|
||||
$(TOOL_GENERATECHARACTER) $2 \
|
||||
-template $(CHARACTERDATA)/$1.java.template \
|
||||
-spec $(UNICODEDATA)/UnicodeData.txt \
|
||||
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
|
||||
-proplist $(UNICODEDATA)/PropList.txt \
|
||||
-o $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java -string \
|
||||
-usecharforbyte $3
|
||||
-template $(CHARACTERDATA)/$1.java.template \
|
||||
-spec $(UNICODEDATA)/UnicodeData.txt \
|
||||
-specialcasing $(UNICODEDATA)/SpecialCasing.txt \
|
||||
-proplist $(UNICODEDATA)/PropList.txt \
|
||||
-o $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java -string \
|
||||
-usecharforbyte $3
|
||||
|
||||
GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java
|
||||
GENSRC_CHARACTERDATA += $(JDK_OUTPUTDIR)/gensrc/java/lang/$1.java
|
||||
endef
|
||||
|
||||
$(eval $(call SetupCharacterData,CharacterDataLatin1,,-latin1 8))
|
||||
$(eval $(call SetupCharacterData,CharacterData00,-plane 0,11 4 1))
|
||||
$(eval $(call SetupCharacterData,CharacterData01,-plane 1,11 4 1))
|
||||
$(eval $(call SetupCharacterData,CharacterData02,-plane 2,11 4 1))
|
||||
$(eval $(call SetupCharacterData,CharacterData0E,-plane 14,11 4 1))
|
||||
$(eval $(call SetupCharacterData,CharacterDataLatin1, , -latin1 8))
|
||||
$(eval $(call SetupCharacterData,CharacterData00, -plane 0, 11 4 1))
|
||||
$(eval $(call SetupCharacterData,CharacterData01, -plane 1, 11 4 1))
|
||||
$(eval $(call SetupCharacterData,CharacterData02, -plane 2, 11 4 1))
|
||||
$(eval $(call SetupCharacterData,CharacterData0E, -plane 14, 11 4 1))
|
||||
|
||||
# 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)
|
||||
$(call install-file)
|
||||
|
||||
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)
|
||||
|
||||
@ -34,74 +34,74 @@ GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Cod
|
||||
|
||||
###
|
||||
|
||||
$(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java : $(GENSRC_CHARSETCODER_TEMPLATE)
|
||||
$(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java: $(GENSRC_CHARSETCODER_TEMPLATE)
|
||||
$(MKDIR) -p $(@D)
|
||||
-$(RM) $@.tmp
|
||||
$(TOOL_SPP) < $< >$@.tmp \
|
||||
-Kdecoder \
|
||||
-DA='A' \
|
||||
-Da='a' \
|
||||
-DCode='Decode' \
|
||||
-Dcode='decode' \
|
||||
-DitypesPhrase='bytes in a specific charset' \
|
||||
-DotypesPhrase='sixteen-bit Unicode characters' \
|
||||
-Ditype='byte' \
|
||||
-Dotype='character' \
|
||||
-DItype='Byte' \
|
||||
-DOtype='Char' \
|
||||
-Dcoder='decoder' \
|
||||
-DCoder='Decoder' \
|
||||
-Dcoding='decoding' \
|
||||
-DOtherCoder='Encoder' \
|
||||
-DreplTypeName='string' \
|
||||
-DdefaultRepl='"\\uFFFD"' \
|
||||
-DdefaultReplName='<tt>"\\uFFFD"<\/tt>' \
|
||||
-DreplType='String' \
|
||||
-DreplFQType='java.lang.String' \
|
||||
-DreplLength='length()' \
|
||||
-DItypesPerOtype='CharsPerByte' \
|
||||
-DnotLegal='not legal for this charset' \
|
||||
-Dotypes-per-itype='chars-per-byte' \
|
||||
-DoutSequence='Unicode character'
|
||||
-Kdecoder \
|
||||
-DA='A' \
|
||||
-Da='a' \
|
||||
-DCode='Decode' \
|
||||
-Dcode='decode' \
|
||||
-DitypesPhrase='bytes in a specific charset' \
|
||||
-DotypesPhrase='sixteen-bit Unicode characters' \
|
||||
-Ditype='byte' \
|
||||
-Dotype='character' \
|
||||
-DItype='Byte' \
|
||||
-DOtype='Char' \
|
||||
-Dcoder='decoder' \
|
||||
-DCoder='Decoder' \
|
||||
-Dcoding='decoding' \
|
||||
-DOtherCoder='Encoder' \
|
||||
-DreplTypeName='string' \
|
||||
-DdefaultRepl='"\\uFFFD"' \
|
||||
-DdefaultReplName='<tt>"\\uFFFD"<\/tt>' \
|
||||
-DreplType='String' \
|
||||
-DreplFQType='java.lang.String' \
|
||||
-DreplLength='length()' \
|
||||
-DItypesPerOtype='CharsPerByte' \
|
||||
-DnotLegal='not legal for this charset' \
|
||||
-Dotypes-per-itype='chars-per-byte' \
|
||||
-DoutSequence='Unicode character'
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
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)
|
||||
-$(RM) $@.tmp
|
||||
$(TOOL_SPP) < $< >$@.tmp \
|
||||
-Kencoder \
|
||||
-DA='An' \
|
||||
-Da='an' \
|
||||
-DCode='Encode' \
|
||||
-Dcode='encode' \
|
||||
-DitypesPhrase='sixteen-bit Unicode characters' \
|
||||
-DotypesPhrase='bytes in a specific charset' \
|
||||
-Ditype='character' \
|
||||
-Dotype='byte' \
|
||||
-DItype='Char' \
|
||||
-DOtype='Byte' \
|
||||
-Dcoder='encoder' \
|
||||
-DCoder='Encoder' \
|
||||
-Dcoding='encoding' \
|
||||
-DOtherCoder='Decoder' \
|
||||
-DreplTypeName='byte array' \
|
||||
-DdefaultRepl='new byte[] { (byte)'"'"\\?"'"' }' \
|
||||
-DdefaultReplName='<tt>{<\/tt>\ <tt>(byte)'"'"\\?"'"'<\/tt>\ <tt>}<\/tt>' \
|
||||
-DreplType='byte[]' \
|
||||
-DreplFQType='byte[]' \
|
||||
-DreplLength='length' \
|
||||
-DItypesPerOtype='BytesPerChar' \
|
||||
-DnotLegal='not a legal sixteen-bit Unicode sequence' \
|
||||
-Dotypes-per-itype='bytes-per-char' \
|
||||
-DoutSequence='byte sequence in the given charset'
|
||||
-Kencoder \
|
||||
-DA='An' \
|
||||
-Da='an' \
|
||||
-DCode='Encode' \
|
||||
-Dcode='encode' \
|
||||
-DitypesPhrase='sixteen-bit Unicode characters' \
|
||||
-DotypesPhrase='bytes in a specific charset' \
|
||||
-Ditype='character' \
|
||||
-Dotype='byte' \
|
||||
-DItype='Char' \
|
||||
-DOtype='Byte' \
|
||||
-Dcoder='encoder' \
|
||||
-DCoder='Encoder' \
|
||||
-Dcoding='encoding' \
|
||||
-DOtherCoder='Decoder' \
|
||||
-DreplTypeName='byte array' \
|
||||
-DdefaultRepl='new byte[] { (byte)'"'"\\?"'"' }' \
|
||||
-DdefaultReplName='<tt>{<\/tt>\ <tt>(byte)'"'"\\?"'"'<\/tt>\ <tt>}<\/tt>' \
|
||||
-DreplType='byte[]' \
|
||||
-DreplFQType='byte[]' \
|
||||
-DreplLength='length' \
|
||||
-DItypesPerOtype='BytesPerChar' \
|
||||
-DnotLegal='not a legal sixteen-bit Unicode sequence' \
|
||||
-Dotypes-per-itype='bytes-per-char' \
|
||||
-DoutSequence='byte sequence in the given charset'
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java
|
||||
|
||||
###
|
||||
|
||||
$(GENSRC_CHARSETCODER) : $(BUILD_TOOLS)
|
||||
$(GENSRC_CHARSETCODER): $(BUILD_TOOLS)
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
# questions.
|
||||
#
|
||||
|
||||
GENSRC_CHARSETMAPPING:=
|
||||
GENSRC_CHARSETMAPPING :=
|
||||
|
||||
GENSRC_TMP := $(JDK_OUTPUTDIR)/gensrc
|
||||
GENSRC_DST := $(JDK_OUTPUTDIR)/gensrc/sun/nio/cs
|
||||
@ -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
|
||||
$(MKDIR) -p $(GENSRC_DST)/ext
|
||||
$(TOUCH) $@
|
||||
@ -44,7 +44,7 @@ $(GENSRC_TMP)/_the.charsetmapping.dir :
|
||||
|
||||
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
|
||||
$(TOUCH) $@
|
||||
|
||||
@ -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
|
||||
|
||||
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
|
||||
|
||||
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
|
||||
|
||||
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
|
||||
$(TOUCH) $@
|
||||
|
||||
@ -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
|
||||
$(TOUCH) $@
|
||||
|
||||
@ -91,15 +91,14 @@ GENSRC_CHARSETMAPPING += $(GENSRC_TMP)/gensrc_the.charsetmapping.dbcs
|
||||
|
||||
GENSRC_CHARSET_PROVIDER_CMD := $(JDK_TOPDIR)/makefiles/scripts/genCharsetProvider.sh
|
||||
|
||||
$(GENSRC_DST)/StandardCharsets.java : $(JDK_TOPDIR)/src/share/classes/sun/nio/cs/standard-charsets \
|
||||
$(GENSRC_CHARSET_PROVIDER_CMD) \
|
||||
$(GENSRC_TMP)/_the.charsetmapping.dir
|
||||
|
||||
$(GENSRC_DST)/StandardCharsets.java: $(JDK_TOPDIR)/src/share/classes/sun/nio/cs/standard-charsets \
|
||||
$(GENSRC_CHARSET_PROVIDER_CMD) \
|
||||
$(GENSRC_TMP)/_the.charsetmapping.dir
|
||||
NAWK="$(NAWK)" TEMPDIR="$(GENSRC_TMP)" SH="$(SH)" \
|
||||
HASHER="$(TOOL_HASHER)" \
|
||||
SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" \
|
||||
$(SH) -e $(GENSRC_CHARSET_PROVIDER_CMD) $(LOG_INFO) $< $(@D)
|
||||
HASHER="$(TOOL_HASHER)" \
|
||||
SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" \
|
||||
$(SH) -e $(GENSRC_CHARSET_PROVIDER_CMD) $(LOG_INFO) $< $(@D)
|
||||
|
||||
GENSRC_CHARSETMAPPING += $(GENSRC_DST)/StandardCharsets.java
|
||||
|
||||
$(GENSRC_CHARSETMAPPING) : $(BUILD_TOOLS)
|
||||
$(GENSRC_CHARSETMAPPING): $(BUILD_TOOLS)
|
||||
|
||||
@ -31,11 +31,11 @@ GENSRC_EXCEPTIONS_DST := $(JDK_OUTPUTDIR)/gensrc/java/nio
|
||||
GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/share/classes/java/nio
|
||||
GENSRC_EXCEPTIONS_CMD := $(JDK_TOPDIR)/makefiles/scripts/genExceptions.sh
|
||||
|
||||
GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels
|
||||
GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels
|
||||
|
||||
###
|
||||
|
||||
$(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir :
|
||||
$(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir:
|
||||
$(ECHO) "Generating exceptions classes"
|
||||
$(MKDIR) -p $(@D)
|
||||
$(TOUCH) $@
|
||||
@ -43,13 +43,13 @@ $(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir :
|
||||
|
||||
###
|
||||
|
||||
$(GENSRC_EXCEPTIONS_DST)/_the.% : $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
|
||||
$(GENSRC_EXCEPTIONS_CMD) \
|
||||
$(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir
|
||||
$(GENSRC_EXCEPTIONS_DST)/_the.%: $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
|
||||
$(GENSRC_EXCEPTIONS_CMD) \
|
||||
$(GENSRC_EXCEPTIONS_DST)/_the.exceptions.dir
|
||||
$(MKDIR) -p $(@D)/$*
|
||||
SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$* $(LOG_INFO)
|
||||
SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$* $(LOG_INFO)
|
||||
$(TOUCH) $@
|
||||
|
||||
GENSRC_EXCEPTIONS += $(foreach D,$(GENSRC_EXCEPTIONS_SRC_DIRS),$(GENSRC_EXCEPTIONS_DST)/_the.$(D))
|
||||
|
||||
$(GENSRC_EXCEPTIONS) : $(BUILD_TOOLS)
|
||||
$(GENSRC_EXCEPTIONS): $(BUILD_TOOLS)
|
||||
|
||||
@ -44,18 +44,18 @@ GENSRC_AWT_ICONS_SRC += \
|
||||
AWT_ICONPATH := $(JDK_TOPDIR)/src/share/classes/sun/awt/resources
|
||||
|
||||
GENSRC_AWT_ICONS_SRC += \
|
||||
$(AWT_ICONPATH)/security-icon-bw16.png \
|
||||
$(AWT_ICONPATH)/security-icon-interim16.png \
|
||||
$(AWT_ICONPATH)/security-icon-yellow16.png \
|
||||
$(AWT_ICONPATH)/security-icon-bw24.png \
|
||||
$(AWT_ICONPATH)/security-icon-interim24.png \
|
||||
$(AWT_ICONPATH)/security-icon-yellow24.png \
|
||||
$(AWT_ICONPATH)/security-icon-bw32.png \
|
||||
$(AWT_ICONPATH)/security-icon-interim32.png \
|
||||
$(AWT_ICONPATH)/security-icon-yellow32.png \
|
||||
$(AWT_ICONPATH)/security-icon-bw48.png \
|
||||
$(AWT_ICONPATH)/security-icon-interim48.png \
|
||||
$(AWT_ICONPATH)/security-icon-yellow48.png
|
||||
$(AWT_ICONPATH)/security-icon-bw16.png \
|
||||
$(AWT_ICONPATH)/security-icon-interim16.png \
|
||||
$(AWT_ICONPATH)/security-icon-yellow16.png \
|
||||
$(AWT_ICONPATH)/security-icon-bw24.png \
|
||||
$(AWT_ICONPATH)/security-icon-interim24.png \
|
||||
$(AWT_ICONPATH)/security-icon-yellow24.png \
|
||||
$(AWT_ICONPATH)/security-icon-bw32.png \
|
||||
$(AWT_ICONPATH)/security-icon-interim32.png \
|
||||
$(AWT_ICONPATH)/security-icon-yellow32.png \
|
||||
$(AWT_ICONPATH)/security-icon-bw48.png \
|
||||
$(AWT_ICONPATH)/security-icon-interim48.png \
|
||||
$(AWT_ICONPATH)/security-icon-yellow48.png
|
||||
|
||||
GENSRC_AWT_ICONS_FILES := $(notdir $(GENSRC_AWT_ICONS_SRC))
|
||||
|
||||
@ -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
|
||||
$(MKDIR) -p $(GENSRC_AWT_ICONS_DST)
|
||||
$(TOUCH) $@
|
||||
@ -72,15 +72,15 @@ $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir :
|
||||
###
|
||||
|
||||
define SetupGensrcAWTIcon
|
||||
# param 1 is for src-file
|
||||
# param 2 is for src-dir
|
||||
$1_SHORTNAME := $(call GENSRC_AWT_ICONS_SHORT_NAME,$1)
|
||||
$1_NAME32 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,32)
|
||||
$1_TARGET32 := $(GENSRC_AWT_ICONS_DST)/$$($1_NAME32).java
|
||||
$1_NAME64 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,64)
|
||||
$1_TARGET64 := $(GENSRC_AWT_ICONS_DST)/$$($1_NAME64).java
|
||||
# param 1 is for src-file
|
||||
# param 2 is for src-dir
|
||||
$1_SHORTNAME := $(call GENSRC_AWT_ICONS_SHORT_NAME,$1)
|
||||
$1_NAME32 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,32)
|
||||
$1_TARGET32 := $(GENSRC_AWT_ICONS_DST)/$$($1_NAME32).java
|
||||
$1_NAME64 := $(call GENSRC_AWT_ICONS_DST_NAME,$1,64)
|
||||
$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
|
||||
$(ECHO) "package sun.awt;" > $$@.tmp
|
||||
$(ECHO) "public class $$($1_NAME32) {" >> $$@.tmp
|
||||
@ -89,9 +89,9 @@ $$($1_TARGET32) : $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir
|
||||
$(ECHO) "}; }" >> $$@.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
|
||||
$(ECHO) "package sun.awt;" > $$@.tmp
|
||||
$(ECHO) "public class $$($1_NAME64) {" >> $$@.tmp
|
||||
@ -100,18 +100,18 @@ $$($1_TARGET64) : $2/$1 $(GENSRC_AWT_ICONS_TMP)/_the.icons.dir
|
||||
$(ECHO) "}; }" >> $$@.tmp
|
||||
$(MV) $$@.tmp $$@
|
||||
|
||||
GENSRC_AWT_ICONS += $$($1_TARGET64)
|
||||
GENSRC_AWT_ICONS += $$($1_TARGET64)
|
||||
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_DST := $(GENSRC_OSX_ICONS_TMP)/sun/osxapp
|
||||
GENSRC_OSX_ICONS := $(GENSRC_OSX_ICONS_DST)/AWTIconData.h
|
||||
GENSRC_OSX_ICONS_TMP := $(JDK_OUTPUTDIR)/gensrc
|
||||
GENSRC_OSX_ICONS_DST := $(GENSRC_OSX_ICONS_TMP)/sun/osxapp
|
||||
GENSRC_OSX_ICONS := $(GENSRC_OSX_ICONS_DST)/AWTIconData.h
|
||||
|
||||
ifdef OPENJDK
|
||||
GENSRC_OSX_ICONS_SRC := $(JDK_TOPDIR)/src/macosx/native/sun/osxapp/resource/icons/JavaApp.icns
|
||||
@ -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
|
||||
endif
|
||||
|
||||
$(GENSRC_OSX_ICONS_DST)/AWTIconData.h: $(GENSRC_OSX_ICONS_SRC)
|
||||
$(GENSRC_OSX_ICONS_DST)/AWTIconData.h: $(GENSRC_OSX_ICONS_SRC)
|
||||
$(RM) $@ $@.tmp
|
||||
$(MKDIR) -p $(dir $@)
|
||||
$(ECHO) "static unsigned char sAWTIconData[] = { " >> $@.tmp
|
||||
@ -128,4 +128,3 @@ $(GENSRC_OSX_ICONS_DST)/AWTIconData.h: $(GENSRC_OSX_ICONS_SRC)
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
endif
|
||||
|
||||
|
||||
@ -26,21 +26,21 @@
|
||||
# Translate the Java debugger wire protocol (jdwp.spec) file into a JDWP.java 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 $(JDK_OUTPUTDIR)/gensrc_jdwp_headers
|
||||
$(RM) $@ $(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h
|
||||
$(ECHO) $(LOG_INFO) Creating JDWP.java and JDWPCommands.h from jdwp.spec
|
||||
$(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)
|
||||
$(RM) $@
|
||||
$(ECHO) $(LOG_INFO) Creating $(@F) from jdwp.spec
|
||||
$(TOOL_JDWPGEN) $< -doc $@
|
||||
|
||||
GENSRC_JDWP:= $(JDK_OUTPUTDIR)/gensrc/com/sun/tools/jdi/JDWP.java \
|
||||
$(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h \
|
||||
$(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
|
||||
GENSRC_JDWP := $(JDK_OUTPUTDIR)/gensrc/com/sun/tools/jdi/JDWP.java \
|
||||
$(JDK_OUTPUTDIR)/gensrc_jdwp_headers/JDWPCommands.h \
|
||||
$(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
|
||||
|
||||
@ -36,57 +36,57 @@ JOBJC_DST := $(JDK_OUTPUTDIR)/gensrc_jobjc/src
|
||||
#
|
||||
# Build generator
|
||||
#
|
||||
$(eval $(call SetupJavaCompilation,BUILD_JOBJC_PRIMITIVE_CODER,\
|
||||
SETUP:=GENERATE_OLDBYTECODE,\
|
||||
DISABLE_SJAVAC:=true,\
|
||||
INCLUDES:=core/java \
|
||||
com/apple,\
|
||||
SRC:=$(JOBJC_SRC)/src \
|
||||
$(JOBJC_SRC)/src/generator/java, \
|
||||
BIN:=$(JOBJC_TMP)/bin))
|
||||
$(eval $(call SetupJavaCompilation,BUILD_JOBJC_PRIMITIVE_CODER, \
|
||||
SETUP := GENERATE_OLDBYTECODE, \
|
||||
DISABLE_SJAVAC := true, \
|
||||
INCLUDES := core/java \
|
||||
com/apple, \
|
||||
SRC := $(JOBJC_SRC)/src \
|
||||
$(JOBJC_SRC)/src/generator/java, \
|
||||
BIN := $(JOBJC_TMP)/bin))
|
||||
|
||||
GENSRC_JOBJC += $(BUILD_JOBJC_PRIMITIVE_CODER)
|
||||
|
||||
#
|
||||
# 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
|
||||
# Not sure why, but if the system has this framework bridge support,
|
||||
# we appear to copy that, otherwise we run GBM which can be very slow.
|
||||
# Not sure why, but if the system has this framework bridge support,
|
||||
# we appear to copy that, otherwise we run GBM which can be very slow.
|
||||
#
|
||||
define CreateBridgeSupport # Framework
|
||||
$(RM) $@ $@.tmp
|
||||
$(MKDIR) -p $(@D)
|
||||
if [ -f $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) ]; then \
|
||||
$(CP) $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) $@.tmp ;\
|
||||
else \
|
||||
$(GBM) $(LOG_INFO) -F complete --framework $1 -o $@.tmp ; \
|
||||
fi
|
||||
$(MV) $@.tmp $@
|
||||
$(RM) $@ $@.tmp
|
||||
$(MKDIR) -p $(@D)
|
||||
if [ -f $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) ]; then \
|
||||
$(CP) $(FRAMEWORKS_DIR)/$1.framework/Resources/BridgeSupport/$(@F) $@.tmp ; \
|
||||
else \
|
||||
$(GBM) $(LOG_INFO) -F complete --framework $1 -o $@.tmp ; \
|
||||
fi
|
||||
$(MV) $@.tmp $@
|
||||
endef
|
||||
|
||||
#
|
||||
# Currently 3 frameworks, avoid pattern rule due to the names being conflicting
|
||||
#
|
||||
$(JOBJC_TMP)/bridge/FoundationFull.bridgesupport : \
|
||||
$(wildcard $(FRAMEWORKS_DIR)/Foundation.framework/Headers/*.h)
|
||||
$(JOBJC_TMP)/bridge/FoundationFull.bridgesupport: \
|
||||
$(wildcard $(FRAMEWORKS_DIR)/Foundation.framework/Headers/*.h)
|
||||
$(call CreateBridgeSupport,Foundation)
|
||||
$(JOBJC_TMP)/bridge/CoreFoundationFull.bridgesupport : \
|
||||
$(wildcard $(FRAMEWORKS_DIR)/CoreFoundation.framework/Headers/*.h)
|
||||
$(JOBJC_TMP)/bridge/CoreFoundationFull.bridgesupport: \
|
||||
$(wildcard $(FRAMEWORKS_DIR)/CoreFoundation.framework/Headers/*.h)
|
||||
$(call CreateBridgeSupport,CoreFoundation)
|
||||
$(JOBJC_TMP)/bridge/AppKitFull.bridgesupport : \
|
||||
$(wildcard $(FRAMEWORKS_DIR)/AppKit.framework/Headers/*.h)
|
||||
$(JOBJC_TMP)/bridge/AppKitFull.bridgesupport: \
|
||||
$(wildcard $(FRAMEWORKS_DIR)/AppKit.framework/Headers/*.h)
|
||||
$(call CreateBridgeSupport,AppKit)
|
||||
|
||||
#
|
||||
# Find Xbootclasspath, for some reason, this involves firing up Java just
|
||||
# so we can get the boot classpath, so we can remove anything in that
|
||||
# classpath that ends with "JObjC.jar", and emit the new bootclasspath.
|
||||
# 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.
|
||||
#
|
||||
$(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER)
|
||||
$(JOBJC_TMP)/_the.generator_bootclasspath: $(BUILD_JOBJC_PRIMITIVE_CODER)
|
||||
$(ECHO) Generating jobjc framework bridge
|
||||
$(RM) $@
|
||||
$(JAVA) $(LOG_INFO) -cp $(JOBJC_TMP)/bin com.apple.internal.jobjc.generator.BootClassPathMinus JObjC.jar > $@.tmp
|
||||
@ -94,17 +94,17 @@ $(JOBJC_TMP)/_the.generator_bootclasspath : $(BUILD_JOBJC_PRIMITIVE_CODER)
|
||||
|
||||
#
|
||||
# Run generator
|
||||
# Now we use bootclasspath to run java again, with the bridge support to
|
||||
# generate more source.
|
||||
# Now we use bootclasspath to run java again, with the bridge support to
|
||||
# generate more source.
|
||||
#
|
||||
$(JOBJC_TMP)/_the.generator : $(JOBJC_TMP)/_the.generator_bootclasspath $(BRIDGESUPPORT)
|
||||
$(JOBJC_TMP)/_the.generator: $(JOBJC_TMP)/_the.generator_bootclasspath $(BRIDGESUPPORT)
|
||||
$(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
|
||||
$(TOUCH) $@
|
||||
|
||||
# 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.
|
||||
$(JDK_OUTPUTDIR)/gensrc/_the.jobjc.files : $(JOBJC_TMP)/_the.generator
|
||||
$(JDK_OUTPUTDIR)/gensrc/_the.jobjc.files: $(JOBJC_TMP)/_the.generator
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CP) -rp $(JOBJC_DST)/* $(@D)
|
||||
$(TOUCH) $@
|
||||
|
||||
@ -28,49 +28,49 @@
|
||||
# into LocaleDataMetaInfo.java
|
||||
|
||||
# First go look for all locale files
|
||||
LOCALE_FILES:=$(shell $(FIND) $(JDK_TOPDIR)/src/share/classes \
|
||||
-name "FormatData_*.java" -o -name "FormatData_*.properties" -o \
|
||||
-name "CollationData_*.java" -o -name "CollationData_*.properties" -o \
|
||||
-name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \
|
||||
-name "LocaleNames_*.java" -o -name "LocaleNames_*.properties" -o \
|
||||
-name "CurrencyNames_*.java" -o -name "CurrencyNames_*.properties" -o \
|
||||
-name "CalendarData_*.java" -o -name "CalendarData_*.properties")
|
||||
LOCALE_FILES := $(shell $(FIND) $(JDK_TOPDIR)/src/share/classes \
|
||||
-name "FormatData_*.java" -o -name "FormatData_*.properties" -o \
|
||||
-name "CollationData_*.java" -o -name "CollationData_*.properties" -o \
|
||||
-name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \
|
||||
-name "LocaleNames_*.java" -o -name "LocaleNames_*.properties" -o \
|
||||
-name "CurrencyNames_*.java" -o -name "CurrencyNames_*.properties" -o \
|
||||
-name "CalendarData_*.java" -o -name "CalendarData_*.properties")
|
||||
|
||||
# Then translate the locale files into for example: FormatData_sv
|
||||
LOCALE_RESOURCES:=$(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES)))))
|
||||
# Then translate the locale files into for example: FormatData_sv
|
||||
LOCALE_RESOURCES := $(sort $(subst .properties,,$(subst .java,,$(notdir $(LOCALE_FILES)))))
|
||||
|
||||
# Include the list of resources found during the previous compile.
|
||||
-include $(JDK_OUTPUTDIR)/gensrc/_the.locale_resources
|
||||
|
||||
MISSING_RESOURCES:=$(filter-out $(LOCALE_RESOURCES),$(PREV_LOCALE_RESOURCES))
|
||||
NEW_RESOURCES:=$(filter-out $(PREV_LOCALE_RESOURCES),$(LOCALE_RESOURCES))
|
||||
MISSING_RESOURCES := $(filter-out $(LOCALE_RESOURCES), $(PREV_LOCALE_RESOURCES))
|
||||
NEW_RESOURCES := $(filter-out $(PREV_LOCALE_RESOURCES), $(LOCALE_RESOURCES))
|
||||
|
||||
ifneq (,$(MISSING_RESOURCES)$(NEW_RESOURCES))
|
||||
# There is a difference in the number of supported resources. Trigger a regeneration.
|
||||
$(shell $(RM) $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java)
|
||||
ifneq (, $(MISSING_RESOURCES)$(NEW_RESOURCES))
|
||||
# There is a difference in the number of supported resources. Trigger a regeneration.
|
||||
$(shell $(RM) $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java)
|
||||
endif
|
||||
|
||||
# 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.
|
||||
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:
|
||||
# #FormatData_ENLocales# with: en% locales.
|
||||
define CaptureLocale
|
||||
$1_LOCALES := $$(subst _,-,$$(filter-out $1,$$(subst $1_,,$$(filter $1_%,$(LOCALE_RESOURCES)))))
|
||||
$1_EN_LOCALES := $$(filter $(EN_LOCALES),$$($1_LOCALES))
|
||||
$1_NON_EN_LOCALES := $$(filter-out $(EN_LOCALES),$$($1_LOCALES))
|
||||
$1_LOCALES := $$(subst _,-,$$(filter-out $1, $$(subst $1_,,$$(filter $1_%, $(LOCALE_RESOURCES)))))
|
||||
$1_EN_LOCALES := $$(filter $(EN_LOCALES), $$($1_LOCALES))
|
||||
$1_NON_EN_LOCALES := $$(filter-out $(EN_LOCALES), $$($1_LOCALES))
|
||||
|
||||
ALL_EN_LOCALES += $$($1_EN_LOCALES)
|
||||
ALL_NON_EN_LOCALES += $$($1_NON_EN_LOCALES)
|
||||
ALL_EN_LOCALES += $$($1_EN_LOCALES)
|
||||
ALL_NON_EN_LOCALES += $$($1_NON_EN_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_NonENLocales$$(HASH)/$$(if $$($1_NON_EN_LOCALES),$$(SPACE)$$($1_NON_EN_LOCALES),)/g'
|
||||
# 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_NonENLocales$$(HASH)/$$(if $$($1_NON_EN_LOCALES),$$(SPACE)$$($1_NON_EN_LOCALES),)/g'
|
||||
endef
|
||||
|
||||
#sun.text.resources.FormatData
|
||||
@ -91,17 +91,17 @@ $(eval $(call CaptureLocale,CurrencyNames))
|
||||
#sun.util.resources.CalendarData
|
||||
$(eval $(call CaptureLocale,CalendarData))
|
||||
|
||||
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_ENLocales$(HASH)/$(sort $(ALL_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_TOPDIR)/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
|
||||
$(MKDIR) -p $(@D)
|
||||
$(ECHO) Creating sun/util/LocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources.
|
||||
$(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" > $(JDK_OUTPUTDIR)/gensrc/_the.locale_resources
|
||||
$(SED) $(SED_ARGS) $< > $@
|
||||
|
||||
GENSRC_LOCALEDATAMETAINFO:=$(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java
|
||||
GENSRC_LOCALEDATAMETAINFO := $(JDK_OUTPUTDIR)/gensrc/sun/util/locale/provider/LocaleDataMetaInfo.java
|
||||
|
||||
###
|
||||
|
||||
@ -110,10 +110,10 @@ GENSRC_CRBC_CMD := $(JDK_TOPDIR)/makefiles/scripts/localelist.sh
|
||||
|
||||
JRE_NONEXIST_LOCALES := en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh
|
||||
|
||||
$(GENSRC_CRBC_DST) : $(JDK_TOPDIR)/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template \
|
||||
$(GENSRC_CRBC_CMD)
|
||||
$(GENSRC_CRBC_DST): $(JDK_TOPDIR)/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template \
|
||||
$(GENSRC_CRBC_CMD)
|
||||
$(MKDIR) -p $(@D)
|
||||
NAWK="$(NAWK)" SED="$(SED)" $(SH) $(GENSRC_CRBC_CMD) "$(JRE_NONEXIST_LOCALES)" $< $@
|
||||
NAWK="$(NAWK)" SED="$(SED)" $(SH) $(GENSRC_CRBC_CMD) "$(JRE_NONEXIST_LOCALES)" $< $@
|
||||
|
||||
GENSRC_LOCALEDATAMETAINFO += $(GENSRC_CRBC_DST)
|
||||
|
||||
|
||||
@ -32,16 +32,16 @@ include ProfileNames.gmk
|
||||
|
||||
$(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
|
||||
$(PROFILE_VERSION_JAVA_TARGETS): \
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/misc/Version.java.template
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/misc/Version.java.template
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
$(ECHO) Generating sun/misc/Version.java $(call profile_version_name, $@)
|
||||
$(SED) -e 's/@@launcher_name@@/$(LAUNCHER_NAME)/g' \
|
||||
-e 's/@@java_version@@/$(RELEASE)/g' \
|
||||
-e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
|
||||
-e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
|
||||
-e 's/@@java_profile_name@@/$(call profile_version_name, $@)/g' \
|
||||
$< > $@.tmp
|
||||
-e 's/@@java_version@@/$(RELEASE)/g' \
|
||||
-e 's/@@java_runtime_version@@/$(FULL_VERSION)/g' \
|
||||
-e 's/@@java_runtime_name@@/$(RUNTIME_NAME)/g' \
|
||||
-e 's/@@java_profile_name@@/$(call profile_version_name, $@)/g' \
|
||||
$< > $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
|
||||
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
|
||||
@ -51,7 +51,7 @@ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/misc/Version.java \
|
||||
# Version file for jconsole
|
||||
|
||||
$(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java: \
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/Version.java.template
|
||||
$(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/Version.java.template
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
$(ECHO) $(LOG_INFO) Generating sun/tools/jconsole/Version.java
|
||||
@ -62,21 +62,21 @@ GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/sun/tools/jconsole/Version.java
|
||||
|
||||
##########################################################################################
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS_API),posix)
|
||||
UPSUFFIX:=$(OPENJDK_TARGET_OS)
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
UPSUFFIX:=bsd
|
||||
endif
|
||||
# UNIXProcess.java is different for solaris and linux. We need to copy
|
||||
# the correct UNIXProcess.java over to $(JDK_OUTPUTDIR)/gensrc/java/lang/.
|
||||
ifeq ($(OPENJDK_TARGET_OS_API), posix)
|
||||
UPSUFFIX := $(OPENJDK_TARGET_OS)
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
UPSUFFIX := bsd
|
||||
endif
|
||||
# UNIXProcess.java is different for solaris and linux. We need to copy
|
||||
# the correct UNIXProcess.java over to $(JDK_OUTPUTDIR)/gensrc/java/lang/.
|
||||
|
||||
$(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java : \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/java/lang/UNIXProcess.java.$(UPSUFFIX)
|
||||
$(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java: \
|
||||
$(JDK_TOPDIR)/src/solaris/classes/java/lang/UNIXProcess.java.$(UPSUFFIX)
|
||||
$(ECHO) $(LOG_INFO) Copying UNIXProcess.java.$(OPENJDK_TARGET_OS) to java/lang/UNIXProcess.java
|
||||
$(call install-file)
|
||||
$(CHMOD) u+rw $@
|
||||
|
||||
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java
|
||||
GENSRC_MISC += $(JDK_OUTPUTDIR)/gensrc/java/lang/UNIXProcess.java
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
@ -88,100 +88,100 @@ GENSRC_SOR_SRC_FILE := genSocketOptionRegistry.c
|
||||
GENSRC_SOR_BIN := $(JDK_OUTPUTDIR)/gensrc/genSocketOptionRegistry
|
||||
|
||||
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,\
|
||||
SRC:=$(GENSRC_SOR_SRC),\
|
||||
INCLUDE_FILES:=$(GENSRC_SOR_SRC_FILE),\
|
||||
LANG:=C,\
|
||||
CC:=$(BUILD_CC),\
|
||||
LDEXE:=$(BUILD_LD),\
|
||||
OBJECT_DIR:=$(GENSRC_SOR_BIN),\
|
||||
OUTPUT_DIR:=$(GENSRC_SOR_BIN),\
|
||||
PROGRAM:=genSocketOptionRegistry))
|
||||
$(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOR_EXE, \
|
||||
SRC := $(GENSRC_SOR_SRC), \
|
||||
INCLUDE_FILES := $(GENSRC_SOR_SRC_FILE), \
|
||||
LANG := C, \
|
||||
CC := $(BUILD_CC), \
|
||||
LDEXE := $(BUILD_LD), \
|
||||
OBJECT_DIR := $(GENSRC_SOR_BIN), \
|
||||
OUTPUT_DIR := $(GENSRC_SOR_BIN), \
|
||||
PROGRAM := genSocketOptionRegistry))
|
||||
|
||||
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
|
||||
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
|
||||
endif
|
||||
|
||||
ifneq ($(HAS_SOCKET_OPTION_REGISTRY),true)
|
||||
$(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java : $(BUILD_GENSRC_SOR_EXE)
|
||||
ifneq ($(HAS_SOCKET_OPTION_REGISTRY), true)
|
||||
$(JDK_OUTPUTDIR)/gensrc/sun/nio/ch/SocketOptionRegistry.java: $(BUILD_GENSRC_SOR_EXE)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@.tmp
|
||||
$(BUILD_GENSRC_SOR_EXE) >> $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
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)
|
||||
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_FILE := genUnixConstants.c
|
||||
GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/gensrc/genUnixConstants
|
||||
GENSRC_UC_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
|
||||
GENSRC_UC_SRC_FILE := genUnixConstants.c
|
||||
GENSRC_UC_BIN := $(JDK_OUTPUTDIR)/gensrc/genUnixConstants
|
||||
|
||||
UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \
|
||||
$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
|
||||
UC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_UC_SRC)/$(GENSRC_UC_SRC_FILE) | \
|
||||
$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
|
||||
|
||||
$(eval $(call SetupNativeCompilation,BUILD_GENSRC_UC_EXE,\
|
||||
SRC:=$(GENSRC_UC_SRC),\
|
||||
INCLUDE_FILES:=$(GENSRC_UC_SRC_FILE),\
|
||||
LANG:=C,\
|
||||
CC:=$(BUILD_CC),\
|
||||
LDEXE:=$(BUILD_CC),\
|
||||
CFLAGS:=$(filter -D%,$(CFLAGS_JDKEXE)),\
|
||||
OBJECT_DIR:=$(GENSRC_UC_BIN),\
|
||||
OUTPUT_DIR:=$(GENSRC_UC_BIN),\
|
||||
PROGRAM:=genUnixConstants))
|
||||
$(eval $(call SetupNativeCompilation,BUILD_GENSRC_UC_EXE, \
|
||||
SRC := $(GENSRC_UC_SRC), \
|
||||
INCLUDE_FILES := $(GENSRC_UC_SRC_FILE), \
|
||||
LANG := C, \
|
||||
CC := $(BUILD_CC), \
|
||||
LDEXE := $(BUILD_CC), \
|
||||
CFLAGS := $(filter -D%, $(CFLAGS_JDKEXE)), \
|
||||
OBJECT_DIR := $(GENSRC_UC_BIN), \
|
||||
OUTPUT_DIR := $(GENSRC_UC_BIN), \
|
||||
PROGRAM := genUnixConstants))
|
||||
|
||||
ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java),)
|
||||
HAS_UNIX_CONSTANTS:=true
|
||||
endif
|
||||
ifneq ($(wildcard $(JDK_TOPDIR)/src/closed/solaris/classes/sun/nio/fs/UnixConstants-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH).java), )
|
||||
HAS_UNIX_CONSTANTS := true
|
||||
endif
|
||||
|
||||
ifneq ($(HAS_UNIX_CONSTANTS),true)
|
||||
$(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java : $(BUILD_GENSRC_UC_EXE)
|
||||
ifneq ($(HAS_UNIX_CONSTANTS), true)
|
||||
$(JDK_OUTPUTDIR)/gensrc/sun/nio/fs/UnixConstants.java: $(BUILD_GENSRC_UC_EXE)
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@ $@.tmp
|
||||
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(UC_COPYRIGHT_YEARS)" > $@.tmp
|
||||
$(BUILD_GENSRC_UC_EXE) >> $@.tmp
|
||||
$(MV) $@.tmp $@
|
||||
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
|
||||
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
|
||||
$(call install-file)
|
||||
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_FILE := genSolarisConstants.c
|
||||
GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/gensrc/genSolarisConstants
|
||||
GENSRC_SOL_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/nio/fs
|
||||
GENSRC_SOL_SRC_FILE := genSolarisConstants.c
|
||||
GENSRC_SOL_BIN := $(JDK_OUTPUTDIR)/gensrc/genSolarisConstants
|
||||
|
||||
SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \
|
||||
$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
|
||||
SOL_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSRC_SOL_SRC)/$(GENSRC_SOL_SRC_FILE) | \
|
||||
$(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }')
|
||||
|
||||
$(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOL_EXE,\
|
||||
SRC:=$(GENSRC_SOL_SRC),\
|
||||
INCLUDE_FILES:=$(GENSRC_SOL_SRC_FILE),\
|
||||
LANG:=C,\
|
||||
CC:=$(BUILD_CC),\
|
||||
LDEXE:=$(BUILD_CC),\
|
||||
OBJECT_DIR:=$(GENSRC_SOL_BIN),\
|
||||
OUTPUT_DIR:=$(GENSRC_SOL_BIN),\
|
||||
PROGRAM:=genSolarisConstants))
|
||||
$(eval $(call SetupNativeCompilation,BUILD_GENSRC_SOL_EXE, \
|
||||
SRC := $(GENSRC_SOL_SRC), \
|
||||
INCLUDE_FILES := $(GENSRC_SOL_SRC_FILE), \
|
||||
LANG := C, \
|
||||
CC := $(BUILD_CC), \
|
||||
LDEXE := $(BUILD_CC), \
|
||||
OBJECT_DIR := $(GENSRC_SOL_BIN), \
|
||||
OUTPUT_DIR := $(GENSRC_SOL_BIN), \
|
||||
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)
|
||||
$(RM) $@ $@.tmp
|
||||
NAWK="$(NAWK)" SH="$(SH)" $(SH) -e $(JDK_TOPDIR)/makefiles/scripts/addNotices.sh "$(SOL_COPYRIGHT_YEARS)" > $@.tmp
|
||||
@ -194,48 +194,47 @@ endif
|
||||
##########################################################################################
|
||||
|
||||
ifndef OPENJDK
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
|
||||
AB_GENSRC_DIR := $(JDK_OUTPUTDIR)/gensrc_ab
|
||||
AB_SRC_DIR := $(JDK_TOPDIR)/src/closed/windows/classes/com/sun/java/accessibility
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_CPU_BITS), 32)
|
||||
$(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java: \
|
||||
$(AB_SRC_DIR)/32bit/AccessBridgeLoader.java
|
||||
$(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java: \
|
||||
$(AB_SRC_DIR)/32bit/AccessBridgeLoader.java
|
||||
$(install-file)
|
||||
|
||||
$(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java: \
|
||||
$(AB_SRC_DIR)/AccessBridge.java
|
||||
$(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java: \
|
||||
$(AB_SRC_DIR)/AccessBridge.java
|
||||
$(install-file)
|
||||
|
||||
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java: \
|
||||
$(AB_SRC_DIR)/legacy/AccessBridgeLoader.java
|
||||
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java: \
|
||||
$(AB_SRC_DIR)/legacy/AccessBridgeLoader.java
|
||||
$(install-file)
|
||||
|
||||
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java: \
|
||||
$(AB_SRC_DIR)/AccessBridge.java
|
||||
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java: \
|
||||
$(AB_SRC_DIR)/AccessBridge.java
|
||||
$(install-file)
|
||||
|
||||
GENSRC_MISC += $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java \
|
||||
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java \
|
||||
$(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java \
|
||||
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java
|
||||
GENSRC_MISC += $(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridgeLoader.java \
|
||||
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridgeLoader.java \
|
||||
$(AB_GENSRC_DIR)/32bit/com/sun/java/accessibility/AccessBridge.java \
|
||||
$(AB_GENSRC_DIR)/legacy/com/sun/java/accessibility/AccessBridge.java
|
||||
|
||||
else
|
||||
$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java: \
|
||||
$(AB_SRC_DIR)/64bit/AccessBridgeLoader.java
|
||||
$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java: \
|
||||
$(AB_SRC_DIR)/64bit/AccessBridgeLoader.java
|
||||
$(install-file)
|
||||
|
||||
$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java: \
|
||||
$(AB_SRC_DIR)/AccessBridge.java
|
||||
$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java: \
|
||||
$(AB_SRC_DIR)/AccessBridge.java
|
||||
$(install-file)
|
||||
|
||||
GENSRC_MISC += $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java \
|
||||
$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java
|
||||
GENSRC_MISC += $(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridgeLoader.java \
|
||||
$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java
|
||||
|
||||
endif
|
||||
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
##########################################################################################
|
||||
|
||||
@ -24,21 +24,21 @@
|
||||
#
|
||||
|
||||
# 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_COMPILED_PROPSOURCES:=
|
||||
ALL_COMPILED_PROPSOURCES :=
|
||||
# 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.
|
||||
COMPILE_PROPCMDLINE:=
|
||||
COMPILE_PROPCMDLINE :=
|
||||
|
||||
# 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_CLEANED_PROPOUTPUT:=
|
||||
ALL_CLEANED_PROPOUTPUT :=
|
||||
# The (very long) command line for cleaning, stored in a file, prior to use.
|
||||
CLEAN_PROPCMDLINE:=
|
||||
CLEAN_PROPCMDLINE :=
|
||||
|
||||
define add_properties_to_compile
|
||||
# $1 is the name of the properties group
|
||||
@ -49,25 +49,25 @@ define add_properties_to_compile
|
||||
|
||||
# Strip away prefix and suffix,
|
||||
# leaving for example: sun/util/resources/CurrencyNames_sv
|
||||
$1_PROPPATHS:=$$(patsubst $(JDK_TOPDIR)/src/windows/classes/%.properties,%,\
|
||||
$$(patsubst $(JDK_TOPDIR)/src/macosx/classes/%.properties,%,\
|
||||
$$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties,%,$2)))
|
||||
$1_PROPPATHS := $$(patsubst $(JDK_TOPDIR)/src/windows/classes/%.properties, %, \
|
||||
$$(patsubst $(JDK_TOPDIR)/src/macosx/classes/%.properties, %, \
|
||||
$$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties, %, $2)))
|
||||
|
||||
# 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.
|
||||
ALL_COMPILED_PROPSOURCES+=$2
|
||||
ALL_COMPILED_PROPSOURCES += $2
|
||||
|
||||
# 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"
|
||||
# suitable to be fed into the CompileProperties command.
|
||||
COMPILE_PROPCMDLINE+=$$(subst _SPACE_,$(SPACE),$$(join $$(addprefix -compile_SPACE_,$2), \
|
||||
$$(addsuffix _SPACE_$(strip $3),\
|
||||
$$(addprefix _SPACE_$(JDK_OUTPUTDIR)/gensrc/,\
|
||||
$$(addsuffix .java,$$($1_PROPPATHS))))))
|
||||
COMPILE_PROPCMDLINE += $$(subst _SPACE_,$(SPACE),$$(join $$(addprefix -compile_SPACE_, $2), \
|
||||
$$(addsuffix _SPACE_$(strip $3), \
|
||||
$$(addprefix _SPACE_$(JDK_OUTPUTDIR)/gensrc/, \
|
||||
$$(addsuffix .java, $$($1_PROPPATHS))))))
|
||||
endef
|
||||
|
||||
define add_properties_to_clean
|
||||
@ -79,28 +79,28 @@ define add_properties_to_clean
|
||||
|
||||
# Strip away prefix and suffix,
|
||||
# leaving for example: sun/util/resources/CurrencyNames_sv
|
||||
$1_PROPPATHS:=$$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/%.properties,%,\
|
||||
$$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties,%,$2))
|
||||
$1_PROPPATHS := $$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/%.properties, %, \
|
||||
$$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties, %, $2))
|
||||
|
||||
# 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.
|
||||
ALL_CLEANED_PROPSOURCES+=$2
|
||||
ALL_CLEANED_PROPSOURCES += $2
|
||||
|
||||
# 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.
|
||||
ifneq ($5,)
|
||||
$1_PROPOUTPUT:=$$(foreach p,$$($1_PROPOUTPUT), $$(dir $$p)$5/$$(notdir $$p))
|
||||
ifneq ($5, )
|
||||
$1_PROPOUTPUT := $$(foreach p, $$($1_PROPOUTPUT), $$(dir $$p)$5/$$(notdir $$p))
|
||||
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"
|
||||
# suitable to be fed into the StripProperties command.
|
||||
CLEAN_PROPCMDLINE+=$$(subst _SPACE_,$(SPACE),$$(join $$(addprefix -clean_SPACE_,$2), \
|
||||
$$(addprefix _SPACE_,$$($1_PROPOUTPUT))))
|
||||
CLEAN_PROPCMDLINE += $$(subst _SPACE_,$(SPACE),$$(join $$(addprefix -clean_SPACE_,$2), \
|
||||
$$(addprefix _SPACE_, $$($1_PROPOUTPUT))))
|
||||
endef
|
||||
|
||||
# Some packages contain pregenerated java files instead of properties files.
|
||||
@ -118,140 +118,140 @@ endef
|
||||
# Some packages have properties that need to be converted to java source files.
|
||||
|
||||
#com/apple/laf/resources
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
$(eval $(call add_properties_to_compile,COM_APPLE_LAF,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/macosx/classes/com/apple/laf/resources)),\
|
||||
ListResourceBundle))
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
$(eval $(call add_properties_to_compile,COM_APPLE_LAF, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/macosx/classes/com/apple/laf/resources)), \
|
||||
ListResourceBundle))
|
||||
endif
|
||||
|
||||
#com/sun/accessibility/internal/resources
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY_HK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY_HK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
#com/sun/imageio/plugins/common
|
||||
$(eval $(call add_properties_to_clean,COM_SUN_IMAGEIO,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/imageio))))
|
||||
$(eval $(call add_properties_to_clean,COM_SUN_IMAGEIO, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/imageio))))
|
||||
#com/sun/java/swing/plaf/gtk/resources
|
||||
ifneq ($(OPENJDK_TARGET_OS), windows)
|
||||
# Only compile GTK resource bundles on Solaris/Linux
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK_HK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
# Only compile GTK resource bundles on Solaris/Linux
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK_HK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
endif
|
||||
#com/sun/java/swing/plaf/motif/resources
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF_HK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF_HK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
#com/sun/java/swing/plaf/windows/resources
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS_HK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS_HK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
#com/sun/java/util/jar/pack
|
||||
$(eval $(call add_properties_to_clean,JNDI_COSNAMING,\
|
||||
$(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties))
|
||||
$(eval $(call add_properties_to_clean,JNDI_COSNAMING, \
|
||||
$(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties))
|
||||
#com/sun/jndi/cosnaming
|
||||
$(eval $(call add_properties_to_clean,JNDI_COSNAMING,\
|
||||
$(JDK_TOPDIR)/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties))
|
||||
$(eval $(call add_properties_to_clean,JNDI_COSNAMING, \
|
||||
$(JDK_TOPDIR)/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties))
|
||||
#com/sun/jndi/ldap
|
||||
$(eval $(call add_properties_to_clean,JNDI_COSNAMING,\
|
||||
$(JDK_TOPDIR)/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties))
|
||||
$(eval $(call add_properties_to_clean,JNDI_COSNAMING, \
|
||||
$(JDK_TOPDIR)/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties))
|
||||
|
||||
#com/sun/org/apache/xml/internal/security/resource
|
||||
#FIXME: The "xmlsecurity*.properties" pattern is not ideal; we might want to find
|
||||
#a better way to select the properties files that are needed.
|
||||
$(eval $(call add_properties_to_clean,XML_SECURITY,\
|
||||
$(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))))
|
||||
$(eval $(call add_properties_to_clean,XML_SECURITY, \
|
||||
$(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))))
|
||||
|
||||
#com/sun/rowset
|
||||
$(eval $(call add_properties_to_clean,COM_SUN_ROWSET,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/rowset))))
|
||||
$(eval $(call add_properties_to_clean,COM_SUN_ROWSET_HK,\
|
||||
$(filter %zh_TW.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/rowset)),\
|
||||
%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_clean,COM_SUN_ROWSET, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/rowset))))
|
||||
$(eval $(call add_properties_to_clean,COM_SUN_ROWSET_HK, \
|
||||
$(filter %zh_TW.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/rowset)), \
|
||||
%zh_TW, %zh_HK))
|
||||
|
||||
#com/sun/swing/internal/plaf/basic/resources
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC_HK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC_HK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
#com/sun/swing/internal/plaf/metal/resources
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources)),\
|
||||
ListResourceBundle))
|
||||
$(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)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources)), \
|
||||
ListResourceBundle))
|
||||
$(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)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
#com/sun/swing/internal/plaf/synth/resources
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH_HK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH_HK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
|
||||
#com/sun/tools/jdi/resources
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_TOOLS_JDI,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/tools/jdi/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,COM_SUN_TOOLS_JDI, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/tools/jdi/resources)), \
|
||||
ListResourceBundle))
|
||||
|
||||
#com/sun/tools/script/shell
|
||||
#java/util
|
||||
#javax/sql/rowset
|
||||
$(eval $(call add_properties_to_clean,JAVAX_SQL_ROWSET,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/javax/sql/rowset))))
|
||||
$(eval $(call add_properties_to_clean,JAVAX_SQL_ROWSET, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/javax/sql/rowset))))
|
||||
#sun/awt/resources
|
||||
$(eval $(call add_properties_to_compile,SUN_AWT,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/awt/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_AWT_HK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/awt/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,SUN_AWT, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/awt/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_AWT_HK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/awt/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
#sun/awt/windows/
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
$(eval $(call add_properties_to_compile,SUN_AWT,\
|
||||
$(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_AWT_HK,\
|
||||
$(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
$(eval $(call add_properties_to_compile,SUN_AWT, \
|
||||
$(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_AWT_HK, \
|
||||
$(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
endif
|
||||
# os x specific awt properties
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
@ -262,101 +262,101 @@ $(eval $(call add_properties_to_compile,SUN_AWT,\
|
||||
endif
|
||||
|
||||
#sun/launcher/resources
|
||||
$(eval $(call add_properties_to_compile,SUN_LAUNCHER,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_LAUNCHER_HK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,SUN_LAUNCHER, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_LAUNCHER_HK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
#sun/management/resources
|
||||
$(eval $(call add_properties_to_compile,SUN_MANAGEMENT,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/management/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_MANAGEMENT_KH,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/management/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,SUN_MANAGEMENT, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/management/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_MANAGEMENT_KH, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/management/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
#sun/print
|
||||
#sun/print/resources
|
||||
$(eval $(call add_properties_to_compile,SUN_PRINT,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/print/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_PRINT_HK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/print/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,SUN_PRINT, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/print/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_PRINT_HK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/print/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
#sun/rmi/registry/resources
|
||||
$(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources))))
|
||||
$(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY_HK,\
|
||||
$(filter %zh_TW.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources)),\
|
||||
%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources))))
|
||||
$(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY_HK, \
|
||||
$(filter %zh_TW.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources)), \
|
||||
%zh_TW, %zh_HK))
|
||||
|
||||
#sun/rmi/rmic/resources
|
||||
$(eval $(call add_properties_to_clean,SUN_RMI_RMIC,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/rmic/resources))))
|
||||
$(eval $(call add_properties_to_clean,SUN_RMI_RMIC, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/rmic/resources))))
|
||||
|
||||
#sun/rmi/server/resources
|
||||
$(eval $(call add_properties_to_clean,SUN_RMI_SERVER,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources))))
|
||||
$(eval $(call add_properties_to_clean,SUN_RMI_SERVER_HK,\
|
||||
$(filter %zh_TW.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources)),\
|
||||
%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_clean,SUN_RMI_SERVER, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources))))
|
||||
$(eval $(call add_properties_to_clean,SUN_RMI_SERVER_HK, \
|
||||
$(filter %zh_TW.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources)), \
|
||||
%zh_TW, %zh_HK))
|
||||
|
||||
# sun/tools/jar/resources
|
||||
$(eval $(call add_properties_to_compile,SUN_TOOLS_JAR,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_TOOLS_JAR_HK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,SUN_TOOLS_JAR, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_TOOLS_JAR_HK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
|
||||
#sun/tools/javac/resources
|
||||
# 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.
|
||||
$(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER,\
|
||||
$(filter %javac.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/javac/resources))))
|
||||
$(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER, \
|
||||
$(filter %javac.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/javac/resources))))
|
||||
|
||||
#sun/tools/jconsole/resources
|
||||
$(eval $(call add_properties_to_clean,SUN_TOOLS_JCONSOLE,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources))))
|
||||
$(eval $(call add_properties_to_clean,SUN_TOOLS_JCONSOLE, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources))))
|
||||
|
||||
#sun/tools/serialver
|
||||
$(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/serialver)),,,resources))
|
||||
$(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/serialver)), , ,resources))
|
||||
|
||||
#sun/util/logging/resources
|
||||
$(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)),\
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING_HK,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)),\
|
||||
ListResourceBundle,%zh_TW,%zh_HK))
|
||||
$(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)), \
|
||||
ListResourceBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING_HK, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)), \
|
||||
ListResourceBundle, %zh_TW, %zh_HK))
|
||||
# sun/util/resources
|
||||
$(eval $(call add_properties_to_compile,SUN_UTIL,\
|
||||
$(filter %.properties,\
|
||||
$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/util/resources)),\
|
||||
sun.util.resources.LocaleNamesBundle))
|
||||
$(eval $(call add_properties_to_compile,SUN_UTIL, \
|
||||
$(filter %.properties, \
|
||||
$(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/util/resources)), \
|
||||
sun.util.resources.LocaleNamesBundle))
|
||||
|
||||
# Now setup the rule for the generation of the resource bundles.
|
||||
$(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...
|
||||
$(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...
|
||||
$(MKDIR) -p $(sort $(dir $(ALL_COMPILED_PROPJAVAS)))
|
||||
$(ECHO) Compiling $(words $(ALL_COMPILED_PROPSOURCES)) properties into resource bundles
|
||||
$(call ListPathsSafely,COMPILE_PROPCMDLINE,\n, >> $(JDK_OUTPUTDIR)/gensrc/_the.cmdline)
|
||||
@ -364,19 +364,19 @@ $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $
|
||||
$(TOUCH) $@
|
||||
|
||||
# Now setup the rule for the generation of the cleaned properties.
|
||||
# FIXME: We currently don't handle removed properties incrementally.
|
||||
$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties : $(ALL_CLEANED_PROPSOURCES) $(BUILD_TOOLS)
|
||||
# FIXME: We currently don't handle removed properties incrementally.
|
||||
$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties: $(ALL_CLEANED_PROPSOURCES) $(BUILD_TOOLS)
|
||||
$(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)))
|
||||
$(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)
|
||||
$(TOOL_STRIPPROPERTIES) @$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline
|
||||
$(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
|
||||
@ -384,12 +384,12 @@ $(JDK_OUTPUTDIR)/gensrc/%_zh_HK.java: $(JDK_TOPDIR)/src/share/classes/%_zh_TW.ja
|
||||
$(MKDIR) -p $(@D)
|
||||
$(CAT) $< | $(SED) -e '/class/s/_zh_TW/_zh_HK/' > $@
|
||||
|
||||
ZH_HK_JAVA:= sun/applet/resources/MsgAppletViewer_zh_HK.java \
|
||||
sun/misc/resources/Messages_zh_HK.java \
|
||||
sun/security/util/AuthResources_zh_HK.java \
|
||||
sun/security/util/Resources_zh_HK.java
|
||||
ZH_HK_JAVA := sun/applet/resources/MsgAppletViewer_zh_HK.java \
|
||||
sun/misc/resources/Messages_zh_HK.java \
|
||||
sun/security/util/AuthResources_zh_HK.java \
|
||||
sun/security/util/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)
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
|
||||
#
|
||||
# Generate java files for javax.swing.plaf package
|
||||
#
|
||||
#
|
||||
NIMBUS_PACKAGE = javax.swing.plaf
|
||||
NIMBUS_GENSRC_DIR = $(JDK_OUTPUTDIR)/gensrc/javax/swing/plaf/nimbus
|
||||
NIMBUS_SKIN_FILE = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/skin.laf
|
||||
@ -48,22 +48,22 @@ GENSRC_SWING_NIMBUS := $(JDK_OUTPUTDIR)/gensrc/_the.generated_nimbus
|
||||
DOCLETSRC_DIR = $(JDK_TOPDIR)/make/tools/swing-beans
|
||||
|
||||
# javax.swing package
|
||||
BEANS = AbstractButton Box JComponent JApplet JButton \
|
||||
JCheckBox JCheckBoxMenuItem JComboBox JColorChooser \
|
||||
JDesktopPane JDialog JEditorPane JFileChooser JFrame \
|
||||
JFormattedTextField JInternalFrame JLabel JLayeredPane \
|
||||
JList JMenu JMenuBar JMenuItem JOptionPane JPanel \
|
||||
JPasswordField JPopupMenu JProgressBar JRadioButton \
|
||||
JRadioButtonMenuItem JScrollBar JScrollPane JSeparator \
|
||||
JSlider JSplitPane JSpinner JTabbedPane JTable \
|
||||
JTextArea JTextField JTextPane JToggleButton JToolBar \
|
||||
JTree JWindow
|
||||
BEANS = AbstractButton Box JComponent JApplet JButton \
|
||||
JCheckBox JCheckBoxMenuItem JComboBox JColorChooser \
|
||||
JDesktopPane JDialog JEditorPane JFileChooser JFrame \
|
||||
JFormattedTextField JInternalFrame JLabel JLayeredPane \
|
||||
JList JMenu JMenuBar JMenuItem JOptionPane JPanel \
|
||||
JPasswordField JPopupMenu JProgressBar JRadioButton \
|
||||
JRadioButtonMenuItem JScrollBar JScrollPane JSeparator \
|
||||
JSlider JSplitPane JSpinner JTabbedPane JTable \
|
||||
JTextArea JTextField JTextPane JToggleButton JToolBar \
|
||||
JTree JWindow
|
||||
|
||||
# javax.swing.text package
|
||||
BEANS_TEXT = JTextComponent
|
||||
|
||||
BEANS_SRC = $(BEANS:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/%.java) \
|
||||
$(BEANS_TEXT:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/text/%.java)
|
||||
$(BEANS_TEXT:%=$(JDK_TOPDIR)/src/share/classes/javax/swing/text/%.java)
|
||||
|
||||
# Dummy variable so far, in the old build system it was false by default
|
||||
SWINGBEAN_DEBUG_FLAG = false
|
||||
@ -71,21 +71,21 @@ SWINGBEAN_DEBUG_FLAG = false
|
||||
# LocaleDataMetaInfo needs to be generated before running this to avoid confusing errors
|
||||
# in the build log.
|
||||
$(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \
|
||||
$(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java \
|
||||
$(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS) \
|
||||
| $(GENSRC_LOCALEDATAMETAINFO)
|
||||
$(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java \
|
||||
$(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS) \
|
||||
| $(GENSRC_LOCALEDATAMETAINFO)
|
||||
$(ECHO) Generating beaninfo
|
||||
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing
|
||||
$(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) \
|
||||
-sourcepath "$(JDK_TOPDIR)/src/share/classes$(PATH_SEP)$(JDK_OUTPUTDIR)/gensrc" \
|
||||
-doclet GenDocletBeanInfo \
|
||||
-x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \
|
||||
-t $(DOCLETSRC_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \
|
||||
-XDignore.symbol.file=true \
|
||||
-classpath $(JDK_OUTPUTDIR)/btclasses $(BEANS_SRC) $(LOG_INFO)
|
||||
# Move the JTextComponent into its proper package directory.
|
||||
-sourcepath "$(JDK_TOPDIR)/src/share/classes$(PATH_SEP)$(JDK_OUTPUTDIR)/gensrc" \
|
||||
-doclet GenDocletBeanInfo \
|
||||
-x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \
|
||||
-t $(DOCLETSRC_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \
|
||||
-XDignore.symbol.file=true \
|
||||
-classpath $(JDK_OUTPUTDIR)/btclasses $(BEANS_SRC) $(LOG_INFO)
|
||||
# Move the JTextComponent into its proper package directory.
|
||||
$(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) $@
|
||||
|
||||
# This file is the part of dt.jar
|
||||
@ -94,7 +94,7 @@ $(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \
|
||||
$(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java: $(DOCLETSRC_DIR)/javax/swing/SwingBeanInfoBase.java
|
||||
$(call install-file)
|
||||
|
||||
# This file is the part of dt.jar
|
||||
# This file is the part of dt.jar
|
||||
# For some reason it is under $(JDK_TOPDIR)/make/tools/swing-beans/sun/swing
|
||||
# Should it be moved under $(JDK_TOPDIR)/src/share/classes/sun/swing instead?
|
||||
$(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java: $(DOCLETSRC_DIR)/sun/swing/BeanInfoUtils.java
|
||||
|
||||
@ -48,75 +48,74 @@ GENSRC_SIZER_DIR := $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
|
||||
GENSRC_X11_VERSION := $(OPENJDK_TARGET_CPU_BITS)
|
||||
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
|
||||
ifneq ($(OPENJDK_TARGET_OS), linux)
|
||||
# On all 64-bit systems except Linux, generate both 32 and 64 bit versions
|
||||
GENSRC_X11_VERSION := 32 64
|
||||
# On all 64-bit systems except Linux, generate both 32 and 64 bit versions
|
||||
GENSRC_X11_VERSION := 32 64
|
||||
endif
|
||||
else
|
||||
ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||||
# As a special case, solaris 32-bit also generates the 64-bit version
|
||||
GENSRC_X11_VERSION := 32 64
|
||||
# As a special case, solaris 32-bit also generates the 64-bit version
|
||||
GENSRC_X11_VERSION := 32 64
|
||||
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.
|
||||
$(GENSRC_X11WRAPPERS_TMP)/sizes.%: $(GENSRC_SIZER_DIR)/sizes.%
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) '$@'
|
||||
$(SORT) $< > $@
|
||||
|
||||
# Run the tool on the offset files copied from the source repository to generate several Java classes
|
||||
# Run the tool on the offset files copied from the source repository to generate several Java classes
|
||||
# used in awt.
|
||||
$(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)
|
||||
$(TOOL_WRAPPERGENERATOR) $(GENSRC_X11WRAPPERS_DST) $(GENSRC_SIZER_DIR)/xlibtypes.txt "gen" $(GENSRC_X11WRAPPERS_TMP)/sizes
|
||||
$(TOUCH) $@
|
||||
|
||||
GENSRC_X11WRAPPERS += $(JDK_OUTPUTDIR)/gensrc/_the.generated.x11
|
||||
|
||||
ifneq ($(COMPILE_TYPE),cross)
|
||||
# This is not a cross compile, regenerate the offset file, so that we
|
||||
# can compare it with the version in the source code repository.
|
||||
ifneq ($(COMPILE_TYPE), cross)
|
||||
# This is not a cross compile, regenerate the offset file, so that we
|
||||
# can compare it with the version in the source code repository.
|
||||
|
||||
# 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)
|
||||
# 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)
|
||||
$(ECHO) "Generating X11 wrapper ($*-bit version)"
|
||||
$(MKDIR) -p $(@D)
|
||||
$(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $*
|
||||
|
||||
# use -m32/-m64 only if the compiler supports it
|
||||
ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG),true)
|
||||
MEMORY_MODEL_FLAG="-m$*"
|
||||
endif
|
||||
# use -m32/-m64 only if the compiler supports it
|
||||
ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG), true)
|
||||
MEMORY_MODEL_FLAG = "-m$*"
|
||||
endif
|
||||
|
||||
# Compile the C code into an executable.
|
||||
$(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
|
||||
# Compile the C code into an executable.
|
||||
$(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
|
||||
$(MKDIR) -p $(@D)
|
||||
(cd $(@D) && $(CC) $(MEMORY_MODEL_FLAG) -o $@ $< \
|
||||
$(X_CFLAGS) \
|
||||
$(X_LIBS) \
|
||||
-I$(JDK_OUTPUTDIR)/include \
|
||||
-I$(JDK_TOPDIR)/src/share/javavm/export \
|
||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
|
||||
-I$(JDK_TOPDIR)/src/share/native/common \
|
||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
|
||||
-I$(JDK_TOPDIR)/src/solaris/native/sun/awt \
|
||||
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
|
||||
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils -lc)
|
||||
$(X_CFLAGS) \
|
||||
$(X_LIBS) \
|
||||
-I$(JDK_OUTPUTDIR)/include \
|
||||
-I$(JDK_TOPDIR)/src/share/javavm/export \
|
||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
|
||||
-I$(JDK_TOPDIR)/src/share/native/common \
|
||||
-I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/common \
|
||||
-I$(JDK_TOPDIR)/src/solaris/native/sun/awt \
|
||||
-I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
|
||||
-I$(JDK_TOPDIR)/src/share/native/sun/awt/image/cvutils -lc)
|
||||
|
||||
.PRECIOUS: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
|
||||
.PRECIOUS: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
|
||||
|
||||
# Run the executable create the offset file and check that it is identical
|
||||
# to the offset file in the source code repository.
|
||||
$(GENSRC_X11WRAPPERS_TMP)/sizes.%.verification : $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe
|
||||
# Run the executable create the offset file and check that it is identical
|
||||
# to the offset file in the source code repository.
|
||||
$(GENSRC_X11WRAPPERS_TMP)/sizes.%.verification: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe
|
||||
$(MKDIR) -p $(@D)
|
||||
$(GENSRC_X11WRAPPERS_TMP)/sizer.$*.exe | $(SORT) > $@.tmp
|
||||
$(ECHO) Verifying $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp to $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
|
||||
$(DIFF) $(GENSRC_X11WRAPPERS_TMP)/sizes.$*.verification.tmp $(GENSRC_X11WRAPPERS_TMP)/sizes.$*
|
||||
mv $@.tmp $@
|
||||
|
||||
GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
|
||||
GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
|
||||
endif
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -40,25 +40,25 @@ IMPORT_BINARIES := CORBA
|
||||
#######
|
||||
|
||||
# Put the libraries here. Different locations for different target apis.
|
||||
ifeq ($(OPENJDK_TARGET_OS_API),posix)
|
||||
INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
|
||||
HOTSPOT_LIB_DIR:=$(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)
|
||||
ifeq ($(OPENJDK_TARGET_OS_API), posix)
|
||||
INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
|
||||
HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)
|
||||
else
|
||||
INSTALL_LIBRARIES_HERE:=$(JDK_OUTPUTDIR)/bin
|
||||
HOTSPOT_LIB_DIR:=$(HOTSPOT_DIST)/jre/bin
|
||||
INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/bin
|
||||
HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/bin
|
||||
endif
|
||||
|
||||
#######
|
||||
|
||||
#
|
||||
# jar xf/unzip fails when executing them all in parallel
|
||||
# introduce artificial dependency (_DEP) buuhhh
|
||||
# introduce artificial dependency (_DEP) buuhhh
|
||||
|
||||
define ImportClasses
|
||||
$1_CLASSES_DEP := $$(IMPORT_TARGET_CLASSES)
|
||||
IMPORT_TARGET_CLASSES += $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported
|
||||
$1_CLASSES_DEP := $$(IMPORT_TARGET_CLASSES)
|
||||
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
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(RM) $$@ $$@.tmp
|
||||
@ -67,10 +67,10 @@ $(JDK_OUTPUTDIR)/classes/_the.$1.classes.imported : $$($1_DIST)/lib/classes.jar
|
||||
endef
|
||||
|
||||
define ImportSources
|
||||
$1_SOURCES_DEP := $$(IMPORT_TARGET_SOURCES)
|
||||
IMPORT_TARGET_SOURCES += $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported
|
||||
$1_SOURCES_DEP := $$(IMPORT_TARGET_SOURCES)
|
||||
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
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(RM) $$@ $$@.tmp
|
||||
@ -79,10 +79,10 @@ $(JDK_OUTPUTDIR)/impsrc/_the.$1.src.imported : $$($1_DIST)/lib/src.zip $$($1_SOU
|
||||
endef
|
||||
|
||||
define ImportBinaries
|
||||
$1_BINARIES_DEP := $$(IMPORT_TARGET_BINARIES)
|
||||
IMPORT_TARGET_BINARIES += $(JDK_OUTPUTDIR)/_the.$1.binaries.imported
|
||||
$1_BINARIES_DEP := $$(IMPORT_TARGET_BINARIES)
|
||||
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
|
||||
$(MKDIR) -p $$(@D)
|
||||
$(RM) $$@ $$@.tmp
|
||||
@ -92,19 +92,19 @@ endef
|
||||
|
||||
#######
|
||||
|
||||
$(foreach I,$(IMPORT_CLASSES), $(eval $(call ImportClasses,$I)))
|
||||
$(foreach I,$(IMPORT_SOURCES), $(eval $(call ImportSources,$I)))
|
||||
$(foreach I,$(IMPORT_BINARIES), $(eval $(call ImportBinaries,$I)))
|
||||
$(foreach I, $(IMPORT_CLASSES), $(eval $(call ImportClasses,$I)))
|
||||
$(foreach I, $(IMPORT_SOURCES), $(eval $(call ImportSources,$I)))
|
||||
$(foreach I, $(IMPORT_BINARIES), $(eval $(call ImportBinaries,$I)))
|
||||
|
||||
IMPORT_TARGET_FILES += $(IMPORT_TARGET_CLASSES) $(IMPORT_TARGET_SOURCES) $(IMPORT_TARGET_BINARIES)
|
||||
|
||||
#######
|
||||
|
||||
define CopyDir
|
||||
$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))
|
||||
IMPORT_TARGET_FILES += $$($1_DST_FILES)
|
||||
$3/% : $2/%
|
||||
$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))
|
||||
IMPORT_TARGET_FILES += $$($1_DST_FILES)
|
||||
$3/%: $2/%
|
||||
$(ECHO) $(LOG_INFO) Copying $$(@F)
|
||||
$$(install-file)
|
||||
endef
|
||||
@ -114,46 +114,46 @@ endef
|
||||
#
|
||||
# Import hotspot
|
||||
#
|
||||
HOTSPOT_IMPORT_FILES:=$(addprefix $(LIBRARY_PREFIX), jvm.* saproc.* jsig.* sawindbg.* jvm_db.* jvm_dtrace.*) \
|
||||
Xusage.txt sa-jdi.jar
|
||||
HOTSPOT_IMPORT_FILES := $(addprefix $(LIBRARY_PREFIX), jvm.* saproc.* jsig.* sawindbg.* jvm_db.* jvm_dtrace.*) \
|
||||
Xusage.txt sa-jdi.jar
|
||||
$(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)))
|
||||
|
||||
JSIG_DEBUGINFO := $(strip $(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.debuginfo) \
|
||||
$(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
|
||||
$(wildcard $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/libjsig.diz) )
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS), windows)
|
||||
ifeq ($(JVM_VARIANT_SERVER), true)
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
|
||||
ifneq (,$(JSIG_DEBUGINFO))
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
|
||||
endif
|
||||
ifeq ($(JVM_VARIANT_SERVER), true)
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
|
||||
ifneq (, $(JSIG_DEBUGINFO))
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/server/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
|
||||
endif
|
||||
ifeq ($(JVM_VARIANT_CLIENT), true)
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
|
||||
ifneq (,$(JSIG_DEBUGINFO))
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
|
||||
endif
|
||||
endif
|
||||
ifeq ($(JVM_VARIANT_CLIENT), true)
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
|
||||
ifneq (, $(JSIG_DEBUGINFO))
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/client/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
|
||||
endif
|
||||
ifeq ($(JVM_VARIANT_MINIMAL1), true)
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
|
||||
ifneq (,$(JSIG_DEBUGINFO))
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
|
||||
endif
|
||||
endif
|
||||
ifeq ($(JVM_VARIANT_MINIMAL1), true)
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(LIBRARY_PREFIX)jsig$(SHARED_LIBRARY_SUFFIX)
|
||||
ifneq (, $(JSIG_DEBUGINFO))
|
||||
IMPORT_TARGET_FILES += $(INSTALL_LIBRARIES_HERE)/minimal/$(foreach I,$(JSIG_DEBUGINFO),$(notdir $I))
|
||||
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)
|
||||
$(RM) $@
|
||||
$(LN) -s ../$(@F) $@
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/server/%.debuginfo : $(INSTALL_LIBRARIES_HERE)/%.debuginfo
|
||||
$(INSTALL_LIBRARIES_HERE)/server/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(LN) -s ../$(@F) $@
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/server/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
|
||||
$(INSTALL_LIBRARIES_HERE)/server/%.diz: $(INSTALL_LIBRARIES_HERE)/%.diz
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(RM) $@.tmp $(basename $@).debuginfo
|
||||
@ -162,17 +162,17 @@ $(INSTALL_LIBRARIES_HERE)/server/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
|
||||
$(RM) $(basename $@).debuginfo
|
||||
$(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)
|
||||
$(RM) $@
|
||||
$(LN) -s ../$(@F) $@
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/client/%.debuginfo : $(INSTALL_LIBRARIES_HERE)/%.debuginfo
|
||||
$(INSTALL_LIBRARIES_HERE)/client/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(LN) -s ../$(@F) $@
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/client/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
|
||||
$(INSTALL_LIBRARIES_HERE)/client/%.diz: $(INSTALL_LIBRARIES_HERE)/%.diz
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(RM) $@.tmp $(basename $@).debuginfo
|
||||
@ -181,17 +181,17 @@ $(INSTALL_LIBRARIES_HERE)/client/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
|
||||
$(RM) $(basename $@).debuginfo
|
||||
$(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)
|
||||
$(RM) $@
|
||||
$(LN) -s ../$(@F) $@
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/minimal/%.debuginfo : $(INSTALL_LIBRARIES_HERE)/%.debuginfo
|
||||
$(INSTALL_LIBRARIES_HERE)/minimal/%.debuginfo: $(INSTALL_LIBRARIES_HERE)/%.debuginfo
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(LN) -s ../$(@F) $@
|
||||
|
||||
$(INSTALL_LIBRARIES_HERE)/minimal/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
|
||||
$(INSTALL_LIBRARIES_HERE)/minimal/%.diz: $(INSTALL_LIBRARIES_HERE)/%.diz
|
||||
$(MKDIR) -p $(@D)
|
||||
$(RM) $@
|
||||
$(RM) $@.tmp $(basename $@).debuginfo
|
||||
@ -202,10 +202,10 @@ $(INSTALL_LIBRARIES_HERE)/minimal/%.diz : $(INSTALL_LIBRARIES_HERE)/%.diz
|
||||
|
||||
##########################################################################################
|
||||
# Unpack the binary distributions of the crypto classes if they exist.
|
||||
SEC_FILES_ZIP:=$(JDK_TOPDIR)/make/tools/crypto/sec-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_WIN64_FILES_ZIP:=$(JDK_TOPDIR)/make/tools/crypto/jgss-windows-x64-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
|
||||
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
|
||||
|
||||
define unzip-sec-file
|
||||
$(ECHO) Unzipping $(<F)
|
||||
@ -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)
|
||||
$(call unzip-sec-file)
|
||||
|
||||
ifneq ($(wildcard $(SEC_FILES_ZIP)),)
|
||||
ifneq ($(wildcard $(SEC_FILES_ZIP)), )
|
||||
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
|
||||
ifeq ($(OPENJDK_TARGET_CPU),x86)
|
||||
ifeq ($(OPENJDK_TARGET_CPU), x86)
|
||||
IMPORT_TARGET_FILES += $(JDK_OUTPUTDIR)/classes/_the.jgss-windows-i586-bin.unzipped
|
||||
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
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -24,19 +24,19 @@
|
||||
#
|
||||
|
||||
# Locate this Makefile
|
||||
ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
|
||||
makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
|
||||
ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
|
||||
makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
|
||||
else
|
||||
makefile_path:=$(lastword $(MAKEFILE_LIST))
|
||||
makefile_path := $(lastword $(MAKEFILE_LIST))
|
||||
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)?
|
||||
subsystem_name:=$(notdir $(repo_dir))
|
||||
subsystem_name := $(notdir $(repo_dir))
|
||||
|
||||
# Try to locate top-level makefile
|
||||
top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile
|
||||
ifneq ($(wildcard $(top_level_makefile)),)
|
||||
top_level_makefile := $(repo_dir)/../common/makefiles/Makefile
|
||||
ifneq ($(wildcard $(top_level_makefile)), )
|
||||
$(info Will run $(subsystem_name) target on top-level Makefile)
|
||||
$(info WARNING: This is a non-recommended way of building!)
|
||||
$(info ===================================================)
|
||||
|
||||
@ -19,7 +19,7 @@ RUNTIME 5.8 Sparc 108921-16 x86 108922-16 REQ "CDE patch"
|
||||
RUNTIME 5.8 Sparc 108773-18 x86 108774-18 REQ "X input method patch"
|
||||
RUNTIME 5.8 Sparc 110386-03 x86 none REQ "RBAC Feature Patch"
|
||||
RUNTIME 5.8 Sparc 111023-02 x86 none REQ "/kernel/fs/mntfs and /kernel/fs/sparcv9/mntfs patch"
|
||||
RUNTIME 5.8 Sparc 112472-01 x86 112473-01 OPT "Font2DTest2 patch"
|
||||
RUNTIME 5.8 Sparc 112472-01 x86 112473-01 OPT "Font2DTest2 patch"
|
||||
RUNTIME 5.8 Sparc 112438-01 x86 112439-01 REQ "/kernel/drv/random patch"
|
||||
|
||||
COMPILER 5.8 Sparc 109505-06 x86 109502-03 REQ "For C 5.0, C++ 5.0"
|
||||
@ -28,4 +28,3 @@ COMPILER 5.8 Sparc 109508-03 x86 109509-03 REQ "For Forte Development 6 upd
|
||||
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 110480-01 x86 110481-01 REQ "For Forte TeamWare"
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
PROFILE_NAMES := compact1 compact2 compact3
|
||||
|
||||
# The include files use 1,2,3 for simplicity and conciseness. Internally we
|
||||
# use profile_1, profile_2 and profile_3.
|
||||
# use profile_1, profile_2 and profile_3.
|
||||
|
||||
ALL_PROFILES := profile_1 profile_2 profile_3
|
||||
|
||||
@ -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))
|
||||
|
||||
# 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
|
||||
# An invalid number maps to an empty name
|
||||
@ -58,7 +58,6 @@ profile_name = $(word $(1), $(PROFILE_NAMES))
|
||||
# Evaluates to the arg if the arg is not a profile version target
|
||||
profile_version_number = $(patsubst $(JDK_OUTPUTDIR)/gen_profile_%/$(VERSION_JAVA_PATH), %, $(1))
|
||||
|
||||
# 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
|
||||
profile_version_name = $(word $(if $(filter-out $(call profile_version_number, $(1)), $(1)), $(call profile_version_number, $(1)), $(words $(PROFILE_NAMES) extra)), $(PROFILE_NAMES))
|
||||
|
||||
|
||||
@ -40,8 +40,8 @@ include profile-includes.txt
|
||||
# imported (signed jars) rather than built.
|
||||
#
|
||||
# The incoming lists, eg PROFILE_1_JRE_JARS_FILES, are the jars to be
|
||||
# included in this profile. They have the jar name relative to the lib
|
||||
# directory. We have to turn these into targets by adding the
|
||||
# included in this profile. They have the jar name relative to the lib
|
||||
# directory. We have to turn these into targets by adding the
|
||||
# $(IMAGES_OUTPUTDIR)/lib prefix
|
||||
#
|
||||
# Note that some jars may be optional depending on the type of build (jdk vs.
|
||||
@ -58,7 +58,7 @@ CUSTOM_PROFILE_JARS := $(addprefix $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/, $(CUSTOM_
|
||||
# These are the common jar files built for and included with this profile
|
||||
# Filter out the custom jars and turn them into targets.
|
||||
|
||||
PROFILE_1_JARS := \
|
||||
PROFILE_1_JARS := \
|
||||
$(addprefix $(IMAGES_OUTPUTDIR)/lib/, $(filter-out $(CUSTOM_JARS), $(PROFILE_1_JRE_JAR_FILES)))
|
||||
|
||||
PROFILE_2_JARS := \
|
||||
@ -74,7 +74,7 @@ ifdef OPENJDK
|
||||
endif
|
||||
|
||||
ifneq ($(ENABLE_JFR), true)
|
||||
FULL_JRE_JAR_FILES := $(filter-out jfr.jar, $(FULL_JRE_JAR_FILES))
|
||||
FULL_JRE_JAR_FILES := $(filter-out jfr.jar, $(FULL_JRE_JAR_FILES))
|
||||
endif
|
||||
|
||||
FULL_JRE_JARS := \
|
||||
@ -87,43 +87,43 @@ FULL_JRE_JARS := \
|
||||
# rt.jar and resources.jar that we filtered out above
|
||||
|
||||
ALL_JARS := $(FULL_JRE_JARS) \
|
||||
$(IMAGES_OUTPUTDIR)/lib/rt.jar \
|
||||
$(IMAGES_OUTPUTDIR)/lib/resources.jar \
|
||||
$(IMAGES_OUTPUTDIR)/lib/jconsole.jar \
|
||||
$(IMAGES_OUTPUTDIR)/lib/dt.jar \
|
||||
$(IMAGES_OUTPUTDIR)/lib/tools.jar \
|
||||
$(IMAGES_OUTPUTDIR)/lib/ct.sym \
|
||||
$(IMAGES_OUTPUTDIR)/src.zip
|
||||
$(IMAGES_OUTPUTDIR)/lib/rt.jar \
|
||||
$(IMAGES_OUTPUTDIR)/lib/resources.jar \
|
||||
$(IMAGES_OUTPUTDIR)/lib/jconsole.jar \
|
||||
$(IMAGES_OUTPUTDIR)/lib/dt.jar \
|
||||
$(IMAGES_OUTPUTDIR)/lib/tools.jar \
|
||||
$(IMAGES_OUTPUTDIR)/lib/ct.sym \
|
||||
$(IMAGES_OUTPUTDIR)/src.zip
|
||||
|
||||
ifeq ($(INCLUDE_SA),true)
|
||||
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar
|
||||
ifeq ($(INCLUDE_SA), true)
|
||||
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),solaris)
|
||||
ifndef OPENJDK
|
||||
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/ext/ucrypto.jar
|
||||
endif
|
||||
ifeq ($(OPENJDK_TARGET_OS), solaris)
|
||||
ifndef OPENJDK
|
||||
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/ext/ucrypto.jar
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),windows)
|
||||
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar
|
||||
endif
|
||||
ifeq ($(OPENJDK_TARGET_OS), windows)
|
||||
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar
|
||||
endif
|
||||
|
||||
ifeq ($(OPENJDK_TARGET_OS),macosx)
|
||||
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/JObjC.jar
|
||||
ifeq ($(OPENJDK_TARGET_OS), macosx)
|
||||
ALL_JARS += $(IMAGES_OUTPUTDIR)/lib/JObjC.jar
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE), profile_1)
|
||||
PROFILE_JARS := $(PROFILE_1_JARS)
|
||||
PROFILE_JARS := $(PROFILE_1_JARS)
|
||||
else ifeq ($(PROFILE), profile_2)
|
||||
PROFILE_JARS := $(PROFILE_2_JARS)
|
||||
PROFILE_JARS := $(PROFILE_2_JARS)
|
||||
else ifeq ($(PROFILE), profile_3)
|
||||
PROFILE_JARS := $(PROFILE_3_JARS)
|
||||
PROFILE_JARS := $(PROFILE_3_JARS)
|
||||
endif
|
||||
ifneq ($(PROFILE),)
|
||||
JARS := $(CUSTOM_PROFILE_JARS) $(PROFILE_JARS)
|
||||
ifneq ($(PROFILE), )
|
||||
JARS := $(CUSTOM_PROFILE_JARS) $(PROFILE_JARS)
|
||||
else
|
||||
JARS := $(ALL_JARS)
|
||||
JARS := $(ALL_JARS)
|
||||
endif
|
||||
|
||||
###############################################################################
|
||||
@ -132,37 +132,37 @@ endif
|
||||
|
||||
|
||||
# we don't need to do anything if not building a profile
|
||||
ifneq ($(PROFILE),)
|
||||
ifneq ($(PROFILE), )
|
||||
|
||||
|
||||
# Need all files to generate the exclude lists
|
||||
NEW_ALL_BIN_LIST := $(patsubst $(JDK_OUTPUTDIR)/bin/%,%,$(shell $(FIND) $(JDK_OUTPUTDIR)/bin \( -type f -o -type l \) ! -name "sjavac"))
|
||||
|
||||
ALL_JRE_BIN_FILES := \
|
||||
$(PROFILE_1_JRE_BIN_FILES) \
|
||||
$(PROFILE_2_JRE_BIN_FILES) \
|
||||
$(PROFILE_3_JRE_BIN_FILES) \
|
||||
$(FULL_JRE_BIN_FILES)
|
||||
$(PROFILE_1_JRE_BIN_FILES) \
|
||||
$(PROFILE_2_JRE_BIN_FILES) \
|
||||
$(PROFILE_3_JRE_BIN_FILES) \
|
||||
$(FULL_JRE_BIN_FILES)
|
||||
|
||||
NOT_JRE_BIN_FILES := $(filter-out $(ALL_JRE_BIN_FILES), $(NEW_ALL_BIN_LIST))
|
||||
|
||||
# Additional exclusions for profile JRE
|
||||
ifeq ($(PROFILE), profile_1)
|
||||
NOT_JRE_BIN_FILES += \
|
||||
$(PROFILE_2_JRE_BIN_FILES) \
|
||||
$(PROFILE_3_JRE_BIN_FILES) \
|
||||
$(FULL_JRE_BIN_FILES)
|
||||
NOT_JRE_BIN_FILES += \
|
||||
$(PROFILE_2_JRE_BIN_FILES) \
|
||||
$(PROFILE_3_JRE_BIN_FILES) \
|
||||
$(FULL_JRE_BIN_FILES)
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE), profile_2)
|
||||
NOT_JRE_BIN_FILES += \
|
||||
$(PROFILE_3_JRE_BIN_FILES) \
|
||||
$(FULL_JRE_BIN_FILES)
|
||||
NOT_JRE_BIN_FILES += \
|
||||
$(PROFILE_3_JRE_BIN_FILES) \
|
||||
$(FULL_JRE_BIN_FILES)
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE), profile_3)
|
||||
NOT_JRE_BIN_FILES += \
|
||||
$(FULL_JRE_BIN_FILES)
|
||||
NOT_JRE_BIN_FILES += \
|
||||
$(FULL_JRE_BIN_FILES)
|
||||
endif
|
||||
|
||||
NOT_JRE_BIN_FILES := $(addprefix $(JDK_OUTPUTDIR)/bin/, $(NOT_JRE_BIN_FILES))
|
||||
@ -172,10 +172,10 @@ NEW_ALL_LIB_LIST := $(patsubst $(JDK_OUTPUTDIR)/lib/%,%,$(shell $(FIND) $(JDK_OU
|
||||
NEW_ALL_LIB_LIST += $(patsubst $(IMAGES_OUTPUTDIR)/lib/%,%,$(shell $(FIND) $(IMAGES_OUTPUTDIR)/lib \( -type f -o -type l \) -a ! \( -name "_the*" -o -name "javac_state " \) ))
|
||||
|
||||
ALL_JRE_LIB_FILES := \
|
||||
$(PROFILE_1_JRE_LIB_FILES) \
|
||||
$(PROFILE_2_JRE_LIB_FILES) \
|
||||
$(PROFILE_3_JRE_LIB_FILES) \
|
||||
$(FULL_JRE_LIB_FILES)
|
||||
$(PROFILE_1_JRE_LIB_FILES) \
|
||||
$(PROFILE_2_JRE_LIB_FILES) \
|
||||
$(PROFILE_3_JRE_LIB_FILES) \
|
||||
$(FULL_JRE_LIB_FILES)
|
||||
|
||||
NOT_JRE_LIB_FILES := $(filter-out $(ALL_JRE_LIB_FILES), $(NEW_ALL_LIB_LIST))
|
||||
|
||||
@ -188,21 +188,21 @@ NOT_JRE_LIB_FILES := $(filter-out $(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PRE
|
||||
|
||||
# Additional exclusions for profile JREs
|
||||
ifeq ($(PROFILE), profile_1)
|
||||
NOT_JRE_LIB_FILES += \
|
||||
$(PROFILE_2_JRE_LIB_FILES) \
|
||||
$(PROFILE_3_JRE_LIB_FILES) \
|
||||
$(FULL_JRE_LIB_FILES)
|
||||
NOT_JRE_LIB_FILES += \
|
||||
$(PROFILE_2_JRE_LIB_FILES) \
|
||||
$(PROFILE_3_JRE_LIB_FILES) \
|
||||
$(FULL_JRE_LIB_FILES)
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE), profile_2)
|
||||
NOT_JRE_LIB_FILES += \
|
||||
$(PROFILE_3_JRE_LIB_FILES) \
|
||||
$(FULL_JRE_LIB_FILES)
|
||||
NOT_JRE_LIB_FILES += \
|
||||
$(PROFILE_3_JRE_LIB_FILES) \
|
||||
$(FULL_JRE_LIB_FILES)
|
||||
endif
|
||||
|
||||
ifeq ($(PROFILE), profile_3)
|
||||
NOT_JRE_LIB_FILES += \
|
||||
$(FULL_JRE_LIB_FILES)
|
||||
NOT_JRE_LIB_FILES += \
|
||||
$(FULL_JRE_LIB_FILES)
|
||||
endif
|
||||
|
||||
# Exclude the custom jar files as these will be added back via a special rule
|
||||
@ -210,7 +210,7 @@ NOT_JRE_LIB_FILES += $(CUSTOM_JARS)
|
||||
|
||||
###############################################################################
|
||||
# Customization of rt.jar file contents
|
||||
# These are expressed as exclusions from everything found in the
|
||||
# These are expressed as exclusions from everything found in the
|
||||
# JDK_OUTPUTDIR/classes directory
|
||||
###############################################################################
|
||||
|
||||
@ -231,8 +231,8 @@ NOT_JRE_LIB_FILES += $(CUSTOM_JARS)
|
||||
#
|
||||
# These are specific types that must be included within a package.
|
||||
# There are two cases:
|
||||
# - individual types in a package that is otherwise excluded at this
|
||||
# profile level. The only arises if there are split packages.
|
||||
# - individual types in a package that is otherwise excluded at this
|
||||
# profile level. The only arises if there are split packages.
|
||||
#
|
||||
# - A higher-level package is included in a high profile where a subpackage
|
||||
# is included in a lower profile. Including the package in the high profile
|
||||
@ -247,7 +247,7 @@ NOT_JRE_LIB_FILES += $(CUSTOM_JARS)
|
||||
# containing package is include. Again this occurs with split packges.
|
||||
#
|
||||
# So the exclude list for each profile consists of the include lists
|
||||
# for all profiles above it, together with any explicitly excluded types.
|
||||
# for all profiles above it, together with any explicitly excluded types.
|
||||
# This is then combined with the overall RT_JAR_EXCLUDES list (which covers
|
||||
# things that go into other jar files).
|
||||
#
|
||||
@ -257,7 +257,7 @@ NOT_JRE_LIB_FILES += $(CUSTOM_JARS)
|
||||
# profile 3 includes the entire package, but it is harmless to add them
|
||||
# explicitly, and complex to determine if we still need to include them.
|
||||
#
|
||||
# Need a way to express:
|
||||
# Need a way to express:
|
||||
# for (int i = profile+1; i < 4; i++)
|
||||
# RT_JAR_EXCLUDES += PROFILE_$i_RTJAR_INCLUDE_PACKAGES
|
||||
#
|
||||
@ -267,7 +267,7 @@ NOT_JRE_LIB_FILES += $(CUSTOM_JARS)
|
||||
#
|
||||
# These are META-INF/services/ entries found in resources.jar. Together
|
||||
# resources.jar and rt.jar hold the contents of the classes directory, (the
|
||||
# classes in rt.jar and everything else in resources.jar).Hence the
|
||||
# classes in rt.jar and everything else in resources.jar).Hence the
|
||||
# include/exclude information for resources.jar is tied to that of rt.jar
|
||||
|
||||
include profile-rtjar-includes.txt
|
||||
@ -276,58 +276,57 @@ include profile-rtjar-includes.txt
|
||||
# NOTE: Classfiles with $ in their name are problematic as that is the
|
||||
# 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.
|
||||
class_list = $(patsubst $(JDK_OUTPUTDIR)/classes/%,%,\
|
||||
$(foreach i,$(1), $(subst $$,\$$$$, $(wildcard $(JDK_OUTPUTDIR)/classes/$i))))
|
||||
class_list = $(patsubst $(JDK_OUTPUTDIR)/classes/%,%, \
|
||||
$(foreach i, $(1), $(subst $$,\$$$$, $(wildcard $(JDK_OUTPUTDIR)/classes/$i))))
|
||||
|
||||
ifeq ($(PROFILE), profile_1)
|
||||
RT_JAR_EXCLUDES += \
|
||||
$(call class_list, $(PROFILE_1_RTJAR_EXCLUDE_TYPES)) \
|
||||
$(PROFILE_2_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES)) \
|
||||
$(PROFILE_3_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES)) \
|
||||
$(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
|
||||
$(call class_list, $(PROFILE_1_RTJAR_EXCLUDE_TYPES)) \
|
||||
$(PROFILE_2_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES)) \
|
||||
$(PROFILE_3_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES)) \
|
||||
$(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
|
||||
RT_JAR_INCLUDE_TYPES := \
|
||||
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES))
|
||||
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES))
|
||||
PROFILE_INCLUDE_METAINF_SERVICES := \
|
||||
$(PROFILE_1_INCLUDE_METAINF_SERVICES)
|
||||
$(PROFILE_1_INCLUDE_METAINF_SERVICES)
|
||||
endif
|
||||
ifeq ($(PROFILE), profile_2)
|
||||
RT_JAR_EXCLUDES += \
|
||||
$(call class_list, $(PROFILE_2_RTJAR_EXCLUDE_TYPES)) \
|
||||
$(PROFILE_3_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES)) \
|
||||
$(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
|
||||
$(call class_list, $(PROFILE_2_RTJAR_EXCLUDE_TYPES)) \
|
||||
$(PROFILE_3_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES)) \
|
||||
$(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
|
||||
RT_JAR_INCLUDE_TYPES := \
|
||||
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES)) \
|
||||
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES))
|
||||
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES)) \
|
||||
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES))
|
||||
PROFILE_INCLUDE_METAINF_SERVICES := \
|
||||
$(PROFILE_1_INCLUDE_METAINF_SERVICES) \
|
||||
$(PROFILE_2_INCLUDE_METAINF_SERVICES)
|
||||
$(PROFILE_1_INCLUDE_METAINF_SERVICES) \
|
||||
$(PROFILE_2_INCLUDE_METAINF_SERVICES)
|
||||
endif
|
||||
ifeq ($(PROFILE), profile_3)
|
||||
RT_JAR_EXCLUDES += \
|
||||
$(call class_list, $(PROFILE_3_RTJAR_EXCLUDE_TYPES)) \
|
||||
$(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
|
||||
$(call class_list, $(PROFILE_3_RTJAR_EXCLUDE_TYPES)) \
|
||||
$(FULL_JRE_RTJAR_INCLUDE_PACKAGES) \
|
||||
$(call class_list, $(FULL_JRE_RTJAR_INCLUDE_TYPES))
|
||||
RT_JAR_INCLUDE_TYPES := \
|
||||
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES)) \
|
||||
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES)) \
|
||||
$(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES))
|
||||
$(call class_list, $(PROFILE_1_RTJAR_INCLUDE_TYPES)) \
|
||||
$(call class_list, $(PROFILE_2_RTJAR_INCLUDE_TYPES)) \
|
||||
$(call class_list, $(PROFILE_3_RTJAR_INCLUDE_TYPES))
|
||||
PROFILE_INCLUDE_METAINF_SERVICES := \
|
||||
$(PROFILE_1_INCLUDE_METAINF_SERVICES) \
|
||||
$(PROFILE_2_INCLUDE_METAINF_SERVICES) \
|
||||
$(PROFILE_3_INCLUDE_METAINF_SERVICES)
|
||||
$(PROFILE_1_INCLUDE_METAINF_SERVICES) \
|
||||
$(PROFILE_2_INCLUDE_METAINF_SERVICES) \
|
||||
$(PROFILE_3_INCLUDE_METAINF_SERVICES)
|
||||
endif
|
||||
|
||||
# Filter out non-OpenJDK services
|
||||
ifdef OPENJDK
|
||||
EXCLUDED_SERVICES := META-INF/services/javax.script.ScriptEngineFactory
|
||||
PROFILE_INCLUDE_METAINF_SERVICES := $(filter-out $(EXCLUDED_SERVICES),$(PROFILE_INCLUDE_METAINF_SERVICES))
|
||||
EXCLUDED_SERVICES := META-INF/services/javax.script.ScriptEngineFactory
|
||||
PROFILE_INCLUDE_METAINF_SERVICES := $(filter-out $(EXCLUDED_SERVICES), $(PROFILE_INCLUDE_METAINF_SERVICES))
|
||||
endif
|
||||
|
||||
|
||||
endif # profile
|
||||
|
||||
|
||||
@ -23,40 +23,40 @@
|
||||
# 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:
|
||||
# make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
|
||||
JAVAC_WARNINGS:=-Xlint:-unchecked,-deprecation,-overrides,classfile,dep-ann,divzero,varargs -Werror
|
||||
# make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
|
||||
JAVAC_WARNINGS := -Xlint:-unchecked,-deprecation,-overrides,classfile,dep-ann,divzero,varargs -Werror
|
||||
|
||||
# The generate old bytecode javac setup uses the new compiler to compile for the
|
||||
# boot jdk to generate tools that need to be run with the boot jdk.
|
||||
# Thus we force the target bytecode to 7.
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
|
||||
JVM:=$(JAVA),\
|
||||
JAVAC:=$(NEW_JAVAC),\
|
||||
FLAGS:=-source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS),\
|
||||
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
|
||||
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
|
||||
JVM := $(JAVA), \
|
||||
JAVAC := $(NEW_JAVAC), \
|
||||
FLAGS := -source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS), \
|
||||
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
|
||||
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
|
||||
|
||||
# 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.
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\
|
||||
JVM:=$(JAVA),\
|
||||
JAVAC:=$(NEW_JAVAC),\
|
||||
FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 \
|
||||
-encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS) \
|
||||
$(GENERATE_JDKBYTECODE_EXTRA_FLAGS),\
|
||||
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
|
||||
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE, \
|
||||
JVM := $(JAVA), \
|
||||
JAVAC := $(NEW_JAVAC), \
|
||||
FLAGS := -bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 \
|
||||
-encoding ascii -XDignore.symbol.file=true $(JAVAC_WARNINGS) \
|
||||
$(GENERATE_JDKBYTECODE_EXTRA_FLAGS), \
|
||||
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
|
||||
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
|
||||
|
||||
# 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.
|
||||
# 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.
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE,\
|
||||
JVM:=$(JAVA),\
|
||||
JAVAC:=$(NEW_JAVAC),\
|
||||
FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\
|
||||
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
|
||||
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
|
||||
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
|
||||
JVM := $(JAVA), \
|
||||
JAVAC := $(NEW_JAVAC), \
|
||||
FLAGS := -bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS), \
|
||||
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
|
||||
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
|
||||
|
||||
@ -26,11 +26,11 @@
|
||||
include $(SPEC)
|
||||
include MakeBase.gmk
|
||||
|
||||
# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Oracle JDK
|
||||
# (The terms "OpenJDK" and "JDK" below refer to OpenJDK and Oracle JDK
|
||||
# builds respectively.)
|
||||
#
|
||||
# JCE builds are very different between OpenJDK and JDK. The OpenJDK JCE
|
||||
# jar files do not require signing, but those for JDK do. If an unsigned
|
||||
# JCE builds are very different between OpenJDK and JDK. The OpenJDK JCE
|
||||
# jar files do not require signing, but those for JDK do. If an unsigned
|
||||
# jar file is installed into JDK, things will break when the crypto
|
||||
# routines are called.
|
||||
#
|
||||
@ -40,15 +40,15 @@ include MakeBase.gmk
|
||||
# For JDK, the binaries use pre-built/pre-signed binary files stored in
|
||||
# the closed workspace that are not shipped in the OpenJDK workspaces.
|
||||
# We still build the JDK files to verify the files compile, and in
|
||||
# preparation for possible signing. Developers working on JCE in JDK
|
||||
# must sign the JCE files before testing. The JCE signing key is kept
|
||||
# preparation for possible signing. Developers working on JCE in JDK
|
||||
# must sign the JCE files before testing. The JCE signing key is kept
|
||||
# separate from the JDK workspace to prevent its disclosure.
|
||||
#
|
||||
# SPECIAL NOTE TO JCE/JDK developers: The source files must eventually
|
||||
# SPECIAL NOTE TO JCE/JDK developers: The source files must eventually
|
||||
# be built, signed, and then the resulting jar files MUST BE CHECKED
|
||||
# INTO THE CLOSED PART OF THE WORKSPACE*. This separate step *MUST NOT
|
||||
# INTO THE CLOSED PART OF THE WORKSPACE*. This separate step *MUST NOT
|
||||
# BE FORGOTTEN*, otherwise a bug fixed in the source code will not be
|
||||
# reflected in the shipped binaries. The "sign-jars" target in the top
|
||||
# reflected in the shipped binaries. The "sign-jars" target in the top
|
||||
# level Makefile should be used to generate the required files.
|
||||
#
|
||||
|
||||
@ -63,19 +63,19 @@ README-MAKEFILE_WARNING := \
|
||||
#
|
||||
# Location for JCE codesigning key.
|
||||
#
|
||||
SIGNING_KEY_DIR := /security/ws/JCE-signing/src
|
||||
SIGNING_KEYSTORE := $(SIGNING_KEY_DIR)/KeyStore.jks
|
||||
SIGNING_KEY_DIR := /security/ws/JCE-signing/src
|
||||
SIGNING_KEYSTORE := $(SIGNING_KEY_DIR)/KeyStore.jks
|
||||
SIGNING_PASSPHRASE := $(SIGNING_KEY_DIR)/passphrase.txt
|
||||
SIGNING_ALIAS := oracle_jce_rsa
|
||||
SIGNING_ALIAS := oracle_jce_rsa
|
||||
|
||||
#
|
||||
# Defines for signing the various jar files.
|
||||
#
|
||||
check-keystore:
|
||||
@if [ ! -f $(SIGNING_KEYSTORE) -o ! -f $(SIGNING_PASSPHRASE) ]; then \
|
||||
$(PRINTF) "\n$(SIGNING_KEYSTORE): Signing mechanism *NOT* available..."; \
|
||||
$(PRINTF) $(README-MAKEFILE_WARNING); \
|
||||
exit 2; \
|
||||
$(PRINTF) "\n$(SIGNING_KEYSTORE): Signing mechanism *NOT* available..."; \
|
||||
$(PRINTF) $(README-MAKEFILE_WARNING); \
|
||||
exit 2; \
|
||||
fi
|
||||
|
||||
$(JCE_OUTPUTDIR)/%: $(IMAGES_OUTPUTDIR)/unsigned/%
|
||||
@ -85,11 +85,11 @@ $(JCE_OUTPUTDIR)/%: $(IMAGES_OUTPUTDIR)/unsigned/%
|
||||
@$(PRINTF) "\nJar codesigning finished.\n"
|
||||
|
||||
JAR_LIST := jce.jar \
|
||||
local_policy.jar \
|
||||
sunec.jar \
|
||||
sunjce_provider.jar \
|
||||
sunpkcs11.jar \
|
||||
US_export_policy.jar
|
||||
local_policy.jar \
|
||||
sunec.jar \
|
||||
sunjce_provider.jar \
|
||||
sunpkcs11.jar \
|
||||
US_export_policy.jar
|
||||
|
||||
SIGNED_JARS := $(addprefix $(JCE_OUTPUTDIR)/,$(JAR_LIST))
|
||||
|
||||
@ -97,7 +97,7 @@ $(SIGNED_JARS): check-keystore
|
||||
|
||||
all: $(SIGNED_JARS)
|
||||
@$(PRINTF) "\n***The jar files built by the 'jar-sign' target must***"
|
||||
@$(PRINTF) "\n***still be checked into the closed workspace! ***"
|
||||
@$(PRINTF) $(README-MAKEFILE_WARNING)
|
||||
@$(PRINTF) "\n***still be checked into the closed workspace!***"
|
||||
@$(PRINTF) $(README-MAKEFILE_WARNING)
|
||||
|
||||
endif # !OPENJDK
|
||||
endif # !OPENJDK
|
||||
|
||||
@ -24,152 +24,151 @@
|
||||
#
|
||||
|
||||
# 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))
|
||||
|
||||
TOOLS_SRC:=$(JDK_TOPDIR)/make/tools/src \
|
||||
$(JDK_TOPDIR)/makefiles/sun/awt/ \
|
||||
$(JDK_TOPDIR)/makefiles/sun/osxapp \
|
||||
$(JDK_TOPDIR)/make/tools/swing-beans
|
||||
TOOLS_SRC := $(JDK_TOPDIR)/make/tools/src \
|
||||
$(JDK_TOPDIR)/makefiles/sun/awt/ \
|
||||
$(JDK_TOPDIR)/makefiles/sun/osxapp \
|
||||
$(JDK_TOPDIR)/make/tools/swing-beans
|
||||
|
||||
ifneq ($(OPENJDK_TARGET_OS),windows)
|
||||
TOOLS_SRC+=$(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
|
||||
ifneq ($(OPENJDK_TARGET_OS), windows)
|
||||
TOOLS_SRC += $(JDK_TOPDIR)/src/solaris/classes/sun/awt/X11/generator
|
||||
endif
|
||||
|
||||
# The exception handling of swing beaninfo which have the own tool directory
|
||||
ifeq (,$(BUILD_TOOLS))
|
||||
$(eval $(call SetupJavaCompilation,BUILD_TOOLS,\
|
||||
SETUP:=GENERATE_OLDBYTECODE,\
|
||||
SRC:=$(TOOLS_SRC),\
|
||||
BIN:=$(JDK_OUTPUTDIR)/btclasses))
|
||||
|
||||
ifeq (, $(BUILD_TOOLS))
|
||||
$(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
|
||||
SETUP := GENERATE_OLDBYTECODE, \
|
||||
SRC := $(TOOLS_SRC), \
|
||||
BIN := $(JDK_OUTPUTDIR)/btclasses))
|
||||
endif
|
||||
|
||||
$(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template : \
|
||||
$(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/%.template
|
||||
$(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template: \
|
||||
$(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/nimbus/%.template
|
||||
$(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
|
||||
$(JDK_OUTPUTDIR)/btclasses/build/tools/deps/% : \
|
||||
$(JDK_TOPDIR)/make/tools/src/build/tools/deps/%
|
||||
$(JDK_OUTPUTDIR)/btclasses/build/tools/deps/%: \
|
||||
$(JDK_TOPDIR)/make/tools/src/build/tools/deps/%
|
||||
$(call install-file)
|
||||
|
||||
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.
|
||||
TOOL_ADDJSUM=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.addjsum.AddJsum
|
||||
TOOL_ADDJSUM = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.addjsum.AddJsum
|
||||
|
||||
# The buildmetaindex tool creates a meta-index to make core class loaders lazier.
|
||||
TOOL_BUILDMETAINDEX=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.buildmetaindex.BuildMetaIndex
|
||||
TOOL_BUILDMETAINDEX = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.buildmetaindex.BuildMetaIndex
|
||||
|
||||
# The comment checker is not currently used. Should it be removed or added to javac?
|
||||
TOOL_COMMENTCHECKER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.commentchecker.CommentChecker
|
||||
TOOL_COMMENTCHECKER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.commentchecker.CommentChecker
|
||||
|
||||
TOOL_COMPILEFONTCONFIG=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.compilefontconfig.CompileFontConfig
|
||||
TOOL_COMPILEFONTCONFIG = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.compilefontconfig.CompileFontConfig
|
||||
|
||||
TOOL_COMPILEPROPERTIES=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.compileproperties.CompileProperties
|
||||
TOOL_COMPILEPROPERTIES = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.compileproperties.CompileProperties
|
||||
|
||||
TOOL_STRIPPROPERTIES=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.stripproperties.StripProperties
|
||||
TOOL_STRIPPROPERTIES = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.stripproperties.StripProperties
|
||||
|
||||
TOOL_JARREORDER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.jarreorder.JarReorder
|
||||
TOOL_JARREORDER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.jarreorder.JarReorder
|
||||
|
||||
TOOL_GENERATECHARACTER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.generatecharacter.GenerateCharacter
|
||||
TOOL_GENERATECHARACTER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.generatecharacter.GenerateCharacter
|
||||
|
||||
TOOL_CHARACTERNAME=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.generatecharacter.CharacterName
|
||||
TOOL_CHARACTERNAME = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.generatecharacter.CharacterName
|
||||
|
||||
TOOL_DIRDIFF=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.dirdiff.DirDiff
|
||||
TOOL_DIRDIFF = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.dirdiff.DirDiff
|
||||
|
||||
TOOL_DTDBUILDER=$(JAVA) -Ddtd_home=$(JDK_TOPDIR)/make/tools/dtdbuilder/dtds \
|
||||
-cp $(JDK_OUTPUTDIR)/btclasses build.tools.dtdbuilder.DTDBuilder
|
||||
TOOL_DTDBUILDER = $(JAVA) -Ddtd_home=$(JDK_TOPDIR)/make/tools/dtdbuilder/dtds \
|
||||
-cp $(JDK_OUTPUTDIR)/btclasses build.tools.dtdbuilder.DTDBuilder
|
||||
|
||||
TOOL_GENERATEBREAKITERATORDATA=$(JAVA) \
|
||||
-cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.generatebreakiteratordata.GenerateBreakIteratorData
|
||||
TOOL_GENERATEBREAKITERATORDATA = $(JAVA) \
|
||||
-cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.generatebreakiteratordata.GenerateBreakIteratorData
|
||||
|
||||
TOOL_GENERATECURRENCYDATA=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.generatecurrencydata.GenerateCurrencyData
|
||||
TOOL_GENERATECURRENCYDATA = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.generatecurrencydata.GenerateCurrencyData
|
||||
|
||||
TOOL_HASHER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.hasher.Hasher
|
||||
TOOL_HASHER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.hasher.Hasher
|
||||
|
||||
# Jarsplit used in jdk/makefiles/common/Release.gmk
|
||||
TOOL_JARSPLIT=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.jarsplit.JarSplit
|
||||
TOOL_JARSPLIT = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.jarsplit.JarSplit
|
||||
|
||||
TOOL_TZDB=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.tzdb.TzdbZoneRulesCompiler
|
||||
TOOL_TZDB = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
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.
|
||||
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
|
||||
TOOL_CHARSETMAPPING=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.charsetmapping.Main
|
||||
TOOL_CHARSETMAPPING = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
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.
|
||||
TOOL_MAKECLASSLIST=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.makeclasslist.MakeClasslist
|
||||
TOOL_MAKECLASSLIST = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.makeclasslist.MakeClasslist
|
||||
|
||||
# Nimbus is used somewhere in the swing build.
|
||||
TOOL_GENERATENIMBUS=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.generatenimbus.Generator
|
||||
TOOL_GENERATENIMBUS = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.generatenimbus.Generator
|
||||
|
||||
TOOL_WRAPPERGENERATOR=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
WrapperGenerator
|
||||
TOOL_WRAPPERGENERATOR = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
WrapperGenerator
|
||||
|
||||
TOOL_AWT_TOBIN=$(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
sun.awt.ToBin
|
||||
TOOL_AWT_TOBIN = $(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
sun.awt.ToBin
|
||||
|
||||
TOOL_OSX_TOBIN=$(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
sun.osxapp.ToBin
|
||||
TOOL_OSX_TOBIN = $(JAVA) -Djava.awt.headless=true -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
sun.osxapp.ToBin
|
||||
|
||||
TOOL_CLDRCONVERTER=$(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
build.tools.cldrconverter.CLDRConverter
|
||||
TOOL_CLDRCONVERTER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
|
||||
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) \
|
||||
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) \
|
||||
build.tools.deps.CheckDeps
|
||||
build.tools.deps.CheckDeps
|
||||
|
||||
##########################################################################################
|
||||
|
||||
# Tools needed on solaris because OBJCOPY is broken.
|
||||
|
||||
$(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK,\
|
||||
SRC:=$(JDK_TOPDIR)/make/tools/add_gnu_debuglink,\
|
||||
LANG:=C,\
|
||||
CC:=$(BUILD_CC),\
|
||||
LDEXE:=$(BUILD_LD),\
|
||||
LDFLAGS:=-lelf,\
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/add_gnu_debuglink,\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/btbin,\
|
||||
PROGRAM:=add_gnu_debuglink))
|
||||
$(eval $(call SetupNativeCompilation,ADD_GNU_DEBUGLINK, \
|
||||
SRC := $(JDK_TOPDIR)/make/tools/add_gnu_debuglink, \
|
||||
LANG := C, \
|
||||
CC := $(BUILD_CC), \
|
||||
LDEXE := $(BUILD_LD), \
|
||||
LDFLAGS := -lelf, \
|
||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/add_gnu_debuglink, \
|
||||
OUTPUT_DIR := $(JDK_OUTPUTDIR)/btbin, \
|
||||
PROGRAM := add_gnu_debuglink))
|
||||
|
||||
$(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS,\
|
||||
SRC:=$(JDK_TOPDIR)/make/tools/fix_empty_sec_hdr_flags,\
|
||||
LANG:=C,\
|
||||
CC:=$(BUILD_CC),\
|
||||
LDEXE:=$(BUILD_LD),\
|
||||
LDFLAGS:=-lelf,\
|
||||
OBJECT_DIR:=$(JDK_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags,\
|
||||
OUTPUT_DIR:=$(JDK_OUTPUTDIR)/btbin,\
|
||||
PROGRAM:=fix_empty_sec_hdr_flags))
|
||||
$(eval $(call SetupNativeCompilation,FIX_EMPTY_SEC_HDR_FLAGS, \
|
||||
SRC := $(JDK_TOPDIR)/make/tools/fix_empty_sec_hdr_flags, \
|
||||
LANG := C, \
|
||||
CC := $(BUILD_CC), \
|
||||
LDEXE := $(BUILD_LD), \
|
||||
LDFLAGS := -lelf, \
|
||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/fix_empty_sec_hdr_flags, \
|
||||
OUTPUT_DIR := $(JDK_OUTPUTDIR)/btbin, \
|
||||
PROGRAM := fix_empty_sec_hdr_flags))
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -25,22 +25,21 @@
|
||||
|
||||
# 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 && \
|
||||
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
|
||||
jprt_build_fastdebug: fastdebug images
|
||||
( $(CD) $(OUTPUTDIR)/j2sdk-image && \
|
||||
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
|
||||
jprt_build_debug: debug images
|
||||
jprt_build_debug: debug images
|
||||
( $(CD) $(OUTPUTDIR)/j2sdk-image && \
|
||||
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
$(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
|
||||
|
||||
#
|
||||
# Phonies to avoid accidents.
|
||||
#
|
||||
.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
|
||||
|
||||
|
||||
@ -32,278 +32,277 @@ jprt.tools.default.release=jdk8
|
||||
jprt.build.flavors=product,fastdebug
|
||||
|
||||
# Standard list of jprt build targets for this source tree
|
||||
jprt.build.targets= \
|
||||
solaris_sparc_5.10-{product|fastdebug}, \
|
||||
solaris_sparcv9_5.10-{product|fastdebug}, \
|
||||
solaris_i586_5.10-{product|fastdebug}, \
|
||||
solaris_x64_5.10-{product|fastdebug}, \
|
||||
linux_i586_2.6-{product|fastdebug}, \
|
||||
linux_x64_2.6-{product|fastdebug}, \
|
||||
windows_i586_6.1-{product|fastdebug}, \
|
||||
jprt.build.targets= \
|
||||
solaris_sparc_5.10-{product|fastdebug}, \
|
||||
solaris_sparcv9_5.10-{product|fastdebug}, \
|
||||
solaris_i586_5.10-{product|fastdebug}, \
|
||||
solaris_x64_5.10-{product|fastdebug}, \
|
||||
linux_i586_2.6-{product|fastdebug}, \
|
||||
linux_x64_2.6-{product|fastdebug}, \
|
||||
windows_i586_6.1-{product|fastdebug}, \
|
||||
windows_x64_6.1-{product|fastdebug}
|
||||
|
||||
# User can select the test set with jprt submit "-testset name" option
|
||||
jprt.my.test.set=${jprt.test.set}
|
||||
|
||||
# Standard vm test target
|
||||
jprt.vm.default.test.targets= \
|
||||
solaris_sparc_5.10-product-c1-jvm98, \
|
||||
solaris_sparcv9_5.10-product-c2-jvm98, \
|
||||
solaris_i586_5.10-product-c1-jvm98, \
|
||||
solaris_x64_5.10-product-c2-jvm98, \
|
||||
linux_i586_2.6-product-{c1|c2}-jvm98, \
|
||||
linux_x64_2.6-product-c2-jvm98, \
|
||||
windows_i586_6.1-product-c1-jvm98, \
|
||||
jprt.vm.default.test.targets= \
|
||||
solaris_sparc_5.10-product-c1-jvm98, \
|
||||
solaris_sparcv9_5.10-product-c2-jvm98, \
|
||||
solaris_i586_5.10-product-c1-jvm98, \
|
||||
solaris_x64_5.10-product-c2-jvm98, \
|
||||
linux_i586_2.6-product-{c1|c2}-jvm98, \
|
||||
linux_x64_2.6-product-c2-jvm98, \
|
||||
windows_i586_6.1-product-c1-jvm98, \
|
||||
windows_x64_6.1-product-c2-jvm98
|
||||
|
||||
# Select vm testlist to use (allow for testset to be empty too)
|
||||
jprt.vm.all.test.targets=${jprt.vm.default.test.targets}
|
||||
jprt.vm..test.targets=${jprt.vm.default.test.targets}
|
||||
jprt.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets}
|
||||
jprt.vm..test.targets=${jprt.vm.default.test.targets}
|
||||
jprt.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets}
|
||||
|
||||
# Default jdk test targets in test/Makefile (no fastdebug & limited c2)
|
||||
jprt.make.rule.default.test.targets= \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_beans1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_beans1, \
|
||||
solaris_i586_5.10-product-c1-jdk_beans1, \
|
||||
solaris_x64_5.10-product-c2-jdk_beans1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_beans1, \
|
||||
linux_x64_2.6-product-c2-jdk_beans1, \
|
||||
windows_i586_6.1-product-c1-jdk_beans1, \
|
||||
windows_x64_6.1-product-c2-jdk_beans1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_io, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_io, \
|
||||
solaris_i586_5.10-product-c1-jdk_io, \
|
||||
solaris_x64_5.10-product-c2-jdk_io, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_io, \
|
||||
linux_x64_2.6-product-c2-jdk_io, \
|
||||
windows_i586_6.1-product-c1-jdk_io, \
|
||||
windows_x64_6.1-product-c2-jdk_io, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_lang, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_lang, \
|
||||
solaris_i586_5.10-product-c1-jdk_lang, \
|
||||
solaris_x64_5.10-product-c2-jdk_lang, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_lang, \
|
||||
linux_x64_2.6-product-c2-jdk_lang, \
|
||||
windows_i586_6.1-product-c1-jdk_lang, \
|
||||
windows_x64_6.1-product-c2-jdk_lang, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_math, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_math, \
|
||||
solaris_i586_5.10-product-c1-jdk_math, \
|
||||
solaris_x64_5.10-product-c2-jdk_math, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_math, \
|
||||
linux_x64_2.6-product-c2-jdk_math, \
|
||||
windows_i586_6.1-product-c1-jdk_math, \
|
||||
windows_x64_6.1-product-c2-jdk_math, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_misc, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_misc, \
|
||||
solaris_i586_5.10-product-c1-jdk_misc, \
|
||||
solaris_x64_5.10-product-c2-jdk_misc, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_misc, \
|
||||
linux_x64_2.6-product-c2-jdk_misc, \
|
||||
windows_i586_6.1-product-c1-jdk_misc, \
|
||||
windows_x64_6.1-product-c2-jdk_misc, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_net, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_net, \
|
||||
solaris_i586_5.10-product-c1-jdk_net, \
|
||||
solaris_x64_5.10-product-c2-jdk_net, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_net, \
|
||||
linux_x64_2.6-product-c2-jdk_net, \
|
||||
windows_i586_6.1-product-c1-jdk_net, \
|
||||
windows_x64_6.1-product-c2-jdk_net, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_nio1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_nio1, \
|
||||
solaris_i586_5.10-product-c1-jdk_nio1, \
|
||||
solaris_x64_5.10-product-c2-jdk_nio1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_nio1, \
|
||||
linux_x64_2.6-product-c2-jdk_nio1, \
|
||||
windows_i586_6.1-product-c1-jdk_nio1, \
|
||||
windows_x64_6.1-product-c2-jdk_nio1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_nio2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_nio2, \
|
||||
solaris_i586_5.10-product-c1-jdk_nio2, \
|
||||
solaris_x64_5.10-product-c2-jdk_nio2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_nio2, \
|
||||
linux_x64_2.6-product-c2-jdk_nio2, \
|
||||
windows_i586_6.1-product-c1-jdk_nio2, \
|
||||
windows_x64_6.1-product-c2-jdk_nio2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_nio3, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_nio3, \
|
||||
solaris_i586_5.10-product-c1-jdk_nio3, \
|
||||
solaris_x64_5.10-product-c2-jdk_nio3, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_nio3, \
|
||||
linux_x64_2.6-product-c2-jdk_nio3, \
|
||||
windows_i586_6.1-product-c1-jdk_nio3, \
|
||||
windows_x64_6.1-product-c2-jdk_nio3, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_security1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_security1, \
|
||||
solaris_i586_5.10-product-c1-jdk_security1, \
|
||||
solaris_x64_5.10-product-c2-jdk_security1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_security1, \
|
||||
linux_x64_2.6-product-c2-jdk_security1, \
|
||||
windows_i586_6.1-product-c1-jdk_security1, \
|
||||
windows_x64_6.1-product-c2-jdk_security1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_text, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_text, \
|
||||
solaris_i586_5.10-product-c1-jdk_text, \
|
||||
solaris_x64_5.10-product-c2-jdk_text, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_text, \
|
||||
linux_x64_2.6-product-c2-jdk_text, \
|
||||
windows_i586_6.1-product-c1-jdk_text, \
|
||||
windows_x64_6.1-product-c2-jdk_text, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_tools1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_tools1, \
|
||||
solaris_i586_5.10-product-c1-jdk_tools1, \
|
||||
solaris_x64_5.10-product-c2-jdk_tools1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_tools1, \
|
||||
linux_x64_2.6-product-c2-jdk_tools1, \
|
||||
windows_i586_6.1-product-c1-jdk_tools1, \
|
||||
windows_x64_6.1-product-c2-jdk_tools1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_util, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_util, \
|
||||
solaris_i586_5.10-product-c1-jdk_util, \
|
||||
solaris_x64_5.10-product-c2-jdk_util, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_util, \
|
||||
linux_x64_2.6-product-c2-jdk_util, \
|
||||
windows_i586_6.1-product-c1-jdk_util, \
|
||||
jprt.make.rule.default.test.targets= \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_beans1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_beans1, \
|
||||
solaris_i586_5.10-product-c1-jdk_beans1, \
|
||||
solaris_x64_5.10-product-c2-jdk_beans1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_beans1, \
|
||||
linux_x64_2.6-product-c2-jdk_beans1, \
|
||||
windows_i586_6.1-product-c1-jdk_beans1, \
|
||||
windows_x64_6.1-product-c2-jdk_beans1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_io, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_io, \
|
||||
solaris_i586_5.10-product-c1-jdk_io, \
|
||||
solaris_x64_5.10-product-c2-jdk_io, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_io, \
|
||||
linux_x64_2.6-product-c2-jdk_io, \
|
||||
windows_i586_6.1-product-c1-jdk_io, \
|
||||
windows_x64_6.1-product-c2-jdk_io, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_lang, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_lang, \
|
||||
solaris_i586_5.10-product-c1-jdk_lang, \
|
||||
solaris_x64_5.10-product-c2-jdk_lang, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_lang, \
|
||||
linux_x64_2.6-product-c2-jdk_lang, \
|
||||
windows_i586_6.1-product-c1-jdk_lang, \
|
||||
windows_x64_6.1-product-c2-jdk_lang, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_math, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_math, \
|
||||
solaris_i586_5.10-product-c1-jdk_math, \
|
||||
solaris_x64_5.10-product-c2-jdk_math, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_math, \
|
||||
linux_x64_2.6-product-c2-jdk_math, \
|
||||
windows_i586_6.1-product-c1-jdk_math, \
|
||||
windows_x64_6.1-product-c2-jdk_math, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_misc, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_misc, \
|
||||
solaris_i586_5.10-product-c1-jdk_misc, \
|
||||
solaris_x64_5.10-product-c2-jdk_misc, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_misc, \
|
||||
linux_x64_2.6-product-c2-jdk_misc, \
|
||||
windows_i586_6.1-product-c1-jdk_misc, \
|
||||
windows_x64_6.1-product-c2-jdk_misc, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_net, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_net, \
|
||||
solaris_i586_5.10-product-c1-jdk_net, \
|
||||
solaris_x64_5.10-product-c2-jdk_net, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_net, \
|
||||
linux_x64_2.6-product-c2-jdk_net, \
|
||||
windows_i586_6.1-product-c1-jdk_net, \
|
||||
windows_x64_6.1-product-c2-jdk_net, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_nio1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_nio1, \
|
||||
solaris_i586_5.10-product-c1-jdk_nio1, \
|
||||
solaris_x64_5.10-product-c2-jdk_nio1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_nio1, \
|
||||
linux_x64_2.6-product-c2-jdk_nio1, \
|
||||
windows_i586_6.1-product-c1-jdk_nio1, \
|
||||
windows_x64_6.1-product-c2-jdk_nio1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_nio2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_nio2, \
|
||||
solaris_i586_5.10-product-c1-jdk_nio2, \
|
||||
solaris_x64_5.10-product-c2-jdk_nio2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_nio2, \
|
||||
linux_x64_2.6-product-c2-jdk_nio2, \
|
||||
windows_i586_6.1-product-c1-jdk_nio2, \
|
||||
windows_x64_6.1-product-c2-jdk_nio2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_nio3, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_nio3, \
|
||||
solaris_i586_5.10-product-c1-jdk_nio3, \
|
||||
solaris_x64_5.10-product-c2-jdk_nio3, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_nio3, \
|
||||
linux_x64_2.6-product-c2-jdk_nio3, \
|
||||
windows_i586_6.1-product-c1-jdk_nio3, \
|
||||
windows_x64_6.1-product-c2-jdk_nio3, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_security1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_security1, \
|
||||
solaris_i586_5.10-product-c1-jdk_security1, \
|
||||
solaris_x64_5.10-product-c2-jdk_security1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_security1, \
|
||||
linux_x64_2.6-product-c2-jdk_security1, \
|
||||
windows_i586_6.1-product-c1-jdk_security1, \
|
||||
windows_x64_6.1-product-c2-jdk_security1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_text, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_text, \
|
||||
solaris_i586_5.10-product-c1-jdk_text, \
|
||||
solaris_x64_5.10-product-c2-jdk_text, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_text, \
|
||||
linux_x64_2.6-product-c2-jdk_text, \
|
||||
windows_i586_6.1-product-c1-jdk_text, \
|
||||
windows_x64_6.1-product-c2-jdk_text, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_tools1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_tools1, \
|
||||
solaris_i586_5.10-product-c1-jdk_tools1, \
|
||||
solaris_x64_5.10-product-c2-jdk_tools1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_tools1, \
|
||||
linux_x64_2.6-product-c2-jdk_tools1, \
|
||||
windows_i586_6.1-product-c1-jdk_tools1, \
|
||||
windows_x64_6.1-product-c2-jdk_tools1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_util, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_util, \
|
||||
solaris_i586_5.10-product-c1-jdk_util, \
|
||||
solaris_x64_5.10-product-c2-jdk_util, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_util, \
|
||||
linux_x64_2.6-product-c2-jdk_util, \
|
||||
windows_i586_6.1-product-c1-jdk_util, \
|
||||
windows_x64_6.1-product-c2-jdk_util
|
||||
|
||||
# All jdk test targets in test/Makefile (still no fastdebug & limited c2)
|
||||
jprt.make.rule.all.test.targets= \
|
||||
\
|
||||
${jprt.make.rule.default.test.targets}, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_awt, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_awt, \
|
||||
solaris_i586_5.10-product-c1-jdk_awt, \
|
||||
solaris_x64_5.10-product-c2-jdk_awt, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_awt, \
|
||||
linux_x64_2.6-product-c2-jdk_awt, \
|
||||
windows_i586_6.1-product-c1-jdk_awt, \
|
||||
windows_x64_6.1-product-c2-jdk_awt, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_beans2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_beans2, \
|
||||
solaris_i586_5.10-product-c1-jdk_beans2, \
|
||||
solaris_x64_5.10-product-c2-jdk_beans2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_beans2, \
|
||||
linux_x64_2.6-product-c2-jdk_beans2, \
|
||||
windows_i586_6.1-product-c1-jdk_beans2, \
|
||||
windows_x64_6.1-product-c2-jdk_beans2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_beans3, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_beans3, \
|
||||
solaris_i586_5.10-product-c1-jdk_beans3, \
|
||||
solaris_x64_5.10-product-c2-jdk_beans3, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_beans3, \
|
||||
linux_x64_2.6-product-c2-jdk_beans3, \
|
||||
windows_i586_6.1-product-c1-jdk_beans3, \
|
||||
windows_x64_6.1-product-c2-jdk_beans3, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_management1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_management1, \
|
||||
solaris_i586_5.10-product-c1-jdk_management1, \
|
||||
solaris_x64_5.10-product-c2-jdk_management1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_management1, \
|
||||
linux_x64_2.6-product-c2-jdk_management1, \
|
||||
windows_i586_6.1-product-c1-jdk_management1, \
|
||||
windows_x64_6.1-product-c2-jdk_management1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_management2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_management2, \
|
||||
solaris_i586_5.10-product-c1-jdk_management2, \
|
||||
solaris_x64_5.10-product-c2-jdk_management2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_management2, \
|
||||
linux_x64_2.6-product-c2-jdk_management2, \
|
||||
windows_i586_6.1-product-c1-jdk_management2, \
|
||||
windows_x64_6.1-product-c2-jdk_management2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_rmi, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_rmi, \
|
||||
solaris_i586_5.10-product-c1-jdk_rmi, \
|
||||
solaris_x64_5.10-product-c2-jdk_rmi, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_rmi, \
|
||||
linux_x64_2.6-product-c2-jdk_rmi, \
|
||||
windows_i586_6.1-product-c1-jdk_rmi, \
|
||||
windows_x64_6.1-product-c2-jdk_rmi, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_security2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_security2, \
|
||||
solaris_i586_5.10-product-c1-jdk_security2, \
|
||||
solaris_x64_5.10-product-c2-jdk_security2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_security2, \
|
||||
linux_x64_2.6-product-c2-jdk_security2, \
|
||||
windows_i586_6.1-product-c1-jdk_security2, \
|
||||
windows_x64_6.1-product-c2-jdk_security2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_security3, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_security3, \
|
||||
solaris_i586_5.10-product-c1-jdk_security3, \
|
||||
solaris_x64_5.10-product-c2-jdk_security3, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_security3, \
|
||||
linux_x64_2.6-product-c2-jdk_security3, \
|
||||
windows_i586_6.1-product-c1-jdk_security3, \
|
||||
windows_x64_6.1-product-c2-jdk_security3, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_sound, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_sound, \
|
||||
solaris_i586_5.10-product-c1-jdk_sound, \
|
||||
solaris_x64_5.10-product-c2-jdk_sound, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_sound, \
|
||||
linux_x64_2.6-product-c2-jdk_sound, \
|
||||
windows_i586_6.1-product-c1-jdk_sound, \
|
||||
windows_x64_6.1-product-c2-jdk_sound, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_swing, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_swing, \
|
||||
solaris_i586_5.10-product-c1-jdk_swing, \
|
||||
solaris_x64_5.10-product-c2-jdk_swing, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_swing, \
|
||||
linux_x64_2.6-product-c2-jdk_swing, \
|
||||
windows_i586_6.1-product-c1-jdk_swing, \
|
||||
windows_x64_6.1-product-c2-jdk_swing, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_tools2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_tools2, \
|
||||
solaris_i586_5.10-product-c1-jdk_tools2, \
|
||||
solaris_x64_5.10-product-c2-jdk_tools2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_tools2, \
|
||||
linux_x64_2.6-product-c2-jdk_tools2, \
|
||||
windows_i586_6.1-product-c1-jdk_tools2, \
|
||||
jprt.make.rule.all.test.targets= \
|
||||
\
|
||||
${jprt.make.rule.default.test.targets}, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_awt, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_awt, \
|
||||
solaris_i586_5.10-product-c1-jdk_awt, \
|
||||
solaris_x64_5.10-product-c2-jdk_awt, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_awt, \
|
||||
linux_x64_2.6-product-c2-jdk_awt, \
|
||||
windows_i586_6.1-product-c1-jdk_awt, \
|
||||
windows_x64_6.1-product-c2-jdk_awt, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_beans2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_beans2, \
|
||||
solaris_i586_5.10-product-c1-jdk_beans2, \
|
||||
solaris_x64_5.10-product-c2-jdk_beans2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_beans2, \
|
||||
linux_x64_2.6-product-c2-jdk_beans2, \
|
||||
windows_i586_6.1-product-c1-jdk_beans2, \
|
||||
windows_x64_6.1-product-c2-jdk_beans2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_beans3, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_beans3, \
|
||||
solaris_i586_5.10-product-c1-jdk_beans3, \
|
||||
solaris_x64_5.10-product-c2-jdk_beans3, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_beans3, \
|
||||
linux_x64_2.6-product-c2-jdk_beans3, \
|
||||
windows_i586_6.1-product-c1-jdk_beans3, \
|
||||
windows_x64_6.1-product-c2-jdk_beans3, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_management1, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_management1, \
|
||||
solaris_i586_5.10-product-c1-jdk_management1, \
|
||||
solaris_x64_5.10-product-c2-jdk_management1, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_management1, \
|
||||
linux_x64_2.6-product-c2-jdk_management1, \
|
||||
windows_i586_6.1-product-c1-jdk_management1, \
|
||||
windows_x64_6.1-product-c2-jdk_management1, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_management2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_management2, \
|
||||
solaris_i586_5.10-product-c1-jdk_management2, \
|
||||
solaris_x64_5.10-product-c2-jdk_management2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_management2, \
|
||||
linux_x64_2.6-product-c2-jdk_management2, \
|
||||
windows_i586_6.1-product-c1-jdk_management2, \
|
||||
windows_x64_6.1-product-c2-jdk_management2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_rmi, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_rmi, \
|
||||
solaris_i586_5.10-product-c1-jdk_rmi, \
|
||||
solaris_x64_5.10-product-c2-jdk_rmi, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_rmi, \
|
||||
linux_x64_2.6-product-c2-jdk_rmi, \
|
||||
windows_i586_6.1-product-c1-jdk_rmi, \
|
||||
windows_x64_6.1-product-c2-jdk_rmi, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_security2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_security2, \
|
||||
solaris_i586_5.10-product-c1-jdk_security2, \
|
||||
solaris_x64_5.10-product-c2-jdk_security2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_security2, \
|
||||
linux_x64_2.6-product-c2-jdk_security2, \
|
||||
windows_i586_6.1-product-c1-jdk_security2, \
|
||||
windows_x64_6.1-product-c2-jdk_security2, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_security3, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_security3, \
|
||||
solaris_i586_5.10-product-c1-jdk_security3, \
|
||||
solaris_x64_5.10-product-c2-jdk_security3, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_security3, \
|
||||
linux_x64_2.6-product-c2-jdk_security3, \
|
||||
windows_i586_6.1-product-c1-jdk_security3, \
|
||||
windows_x64_6.1-product-c2-jdk_security3, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_sound, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_sound, \
|
||||
solaris_i586_5.10-product-c1-jdk_sound, \
|
||||
solaris_x64_5.10-product-c2-jdk_sound, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_sound, \
|
||||
linux_x64_2.6-product-c2-jdk_sound, \
|
||||
windows_i586_6.1-product-c1-jdk_sound, \
|
||||
windows_x64_6.1-product-c2-jdk_sound, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_swing, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_swing, \
|
||||
solaris_i586_5.10-product-c1-jdk_swing, \
|
||||
solaris_x64_5.10-product-c2-jdk_swing, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_swing, \
|
||||
linux_x64_2.6-product-c2-jdk_swing, \
|
||||
windows_i586_6.1-product-c1-jdk_swing, \
|
||||
windows_x64_6.1-product-c2-jdk_swing, \
|
||||
\
|
||||
solaris_sparc_5.10-product-c1-jdk_tools2, \
|
||||
solaris_sparcv9_5.10-product-c2-jdk_tools2, \
|
||||
solaris_i586_5.10-product-c1-jdk_tools2, \
|
||||
solaris_x64_5.10-product-c2-jdk_tools2, \
|
||||
linux_i586_2.6-product-{c1|c2}-jdk_tools2, \
|
||||
linux_x64_2.6-product-c2-jdk_tools2, \
|
||||
windows_i586_6.1-product-c1-jdk_tools2, \
|
||||
windows_x64_6.1-product-c2-jdk_tools2
|
||||
|
||||
# JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken)
|
||||
jprt.my.jck.test.target.set= \
|
||||
solaris_sparc_5.10-product-c1-JCK7TESTRULE, \
|
||||
solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \
|
||||
solaris_i586_5.10-product-c1-JCK7TESTRULE, \
|
||||
solaris_x64_5.10-product-c2-JCK7TESTRULE, \
|
||||
linux_i586_2.6-product-c1-JCK7TESTRULE, \
|
||||
jprt.my.jck.test.target.set= \
|
||||
solaris_sparc_5.10-product-c1-JCK7TESTRULE, \
|
||||
solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, \
|
||||
solaris_i586_5.10-product-c1-JCK7TESTRULE, \
|
||||
solaris_x64_5.10-product-c2-JCK7TESTRULE, \
|
||||
linux_i586_2.6-product-c1-JCK7TESTRULE, \
|
||||
linux_x64_2.6-product-c2-JCK7TESTRULE
|
||||
|
||||
# JCK testset targets (e.g. jprt submit -testset jck ... )
|
||||
jprt.make.rule.jck.test.targets= \
|
||||
${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7devtools}, \
|
||||
${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7runtime}, \
|
||||
jprt.make.rule.jck.test.targets= \
|
||||
${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7devtools}, \
|
||||
${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7runtime}, \
|
||||
${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7compiler}
|
||||
|
||||
# Select list to use (allow for testset to be empty too)
|
||||
jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets}
|
||||
jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets}
|
||||
jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets}
|
||||
jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets}
|
||||
|
||||
# Directories to be excluded from the source bundles
|
||||
jprt.bundle.exclude.src.dirs=build dist webrev
|
||||
|
||||
|
||||
@ -201,7 +201,7 @@ SUNWprivate_1.1 {
|
||||
Java_sun_print_CUPSPrinter_initIDs;
|
||||
Java_sun_print_CUPSPrinter_getCupsServer;
|
||||
Java_sun_print_CUPSPrinter_getCupsPort;
|
||||
Java_sun_print_CUPSPrinter_canConnect;
|
||||
Java_sun_print_CUPSPrinter_canConnect;
|
||||
Java_sun_print_CUPSPrinter_getMedia;
|
||||
Java_sun_print_CUPSPrinter_getPageSizes;
|
||||
|
||||
@ -230,7 +230,7 @@ SUNWprivate_1.1 {
|
||||
Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetColorForState;
|
||||
Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetClassValue;
|
||||
Java_com_sun_java_swing_plaf_gtk_GTKStyle_nativeGetPangoFontName;
|
||||
|
||||
|
||||
awt_display;
|
||||
awt_Lock;
|
||||
awt_Unlock;
|
||||
@ -253,7 +253,7 @@ SUNWprivate_1.1 {
|
||||
getAwtLockFunctions;
|
||||
getAwtData;
|
||||
getAwtDisplay;
|
||||
|
||||
|
||||
# libfontmanager entry points
|
||||
AWTIsHeadless;
|
||||
AWTCountFonts;
|
||||
@ -282,4 +282,3 @@ SUNWprivate_1.1 {
|
||||
local:
|
||||
*;
|
||||
};
|
||||
|
||||
|
||||
@ -46,9 +46,9 @@ SUNWprivate_1.1 {
|
||||
Java_java_awt_MenuBar_initIDs;
|
||||
Java_java_awt_ScrollPaneAdjustable_initIDs;
|
||||
Java_java_awt_Toolkit_initIDs;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__Z;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__Z;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
|
||||
Java_sun_awt_image_ByteComponentRaster_initIDs;
|
||||
Java_sun_awt_image_GifImageDecoder_initIDs;
|
||||
Java_sun_awt_image_GifImageDecoder_parseImage;
|
||||
@ -156,7 +156,7 @@ SUNWprivate_1.1 {
|
||||
colorValueID;
|
||||
mul8table;
|
||||
jvm;
|
||||
|
||||
|
||||
# ProcessPath entry points and data
|
||||
doDrawPath;
|
||||
doFillPath;
|
||||
@ -195,4 +195,3 @@ SUNWprivate_1.1 {
|
||||
local:
|
||||
*;
|
||||
};
|
||||
|
||||
|
||||
@ -47,9 +47,9 @@ SUNWprivate_1.1 {
|
||||
Java_java_awt_ScrollPaneAdjustable_initIDs;
|
||||
Java_java_awt_Toolkit_initIDs;
|
||||
Java_java_awt_TrayIcon_initIDs;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__Z;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__Z;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2;
|
||||
Java_sun_awt_DebugSettings_setCTracingOn__ZLjava_lang_String_2I;
|
||||
Java_sun_awt_image_ByteComponentRaster_initIDs;
|
||||
Java_sun_awt_image_GifImageDecoder_initIDs;
|
||||
Java_sun_awt_image_GifImageDecoder_parseImage;
|
||||
@ -223,8 +223,8 @@ SUNWprivate_1.1 {
|
||||
Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
|
||||
Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
|
||||
Java_sun_awt_X11GraphicsEnvironment_initXRender;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Java_java_awt_AWTEvent_initIDs;
|
||||
Java_java_awt_Button_initIDs;
|
||||
@ -287,7 +287,7 @@ SUNWprivate_1.1 {
|
||||
getAwtLockFunctions;
|
||||
getAwtData;
|
||||
getAwtDisplay;
|
||||
|
||||
|
||||
# libfontmanager entry points
|
||||
AWTIsHeadless;
|
||||
AWTCountFonts;
|
||||
@ -314,4 +314,3 @@ SUNWprivate_1.1 {
|
||||
local:
|
||||
*;
|
||||
};
|
||||
|
||||
|
||||
@ -73,7 +73,7 @@ SUNWprivate_1.1 {
|
||||
Java_sun_print_CUPSPrinter_initIDs;
|
||||
Java_sun_print_CUPSPrinter_getCupsServer;
|
||||
Java_sun_print_CUPSPrinter_getCupsPort;
|
||||
Java_sun_print_CUPSPrinter_canConnect;
|
||||
Java_sun_print_CUPSPrinter_canConnect;
|
||||
Java_sun_print_CUPSPrinter_getMedia;
|
||||
Java_sun_print_CUPSPrinter_getPageSizes;
|
||||
|
||||
@ -106,4 +106,3 @@ SUNWprivate_1.1 {
|
||||
local:
|
||||
*;
|
||||
};
|
||||
|
||||
|
||||
@ -439,7 +439,7 @@ SUNWprivate_1.1 {
|
||||
Java_sun_print_CUPSPrinter_initIDs;
|
||||
Java_sun_print_CUPSPrinter_getCupsServer;
|
||||
Java_sun_print_CUPSPrinter_getCupsPort;
|
||||
Java_sun_print_CUPSPrinter_canConnect;
|
||||
Java_sun_print_CUPSPrinter_canConnect;
|
||||
Java_sun_print_CUPSPrinter_getMedia;
|
||||
Java_sun_print_CUPSPrinter_getPageSizes;
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
SUNWprivate_1.1 {
|
||||
global:
|
||||
getSunFontIDs;
|
||||
newLayoutTableCache;
|
||||
newLayoutTableCache;
|
||||
freeLayoutTableCache;
|
||||
isNullScalerContext;
|
||||
Java_sun_font_NullFontScaler_getNullScalerContext;
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
SUNWprivate_1.1 {
|
||||
global:
|
||||
getSunFontIDs;
|
||||
newLayoutTableCache;
|
||||
newLayoutTableCache;
|
||||
freeLayoutTableCache;
|
||||
isNullScalerContext;
|
||||
Java_sun_font_NullFontScaler_getNullScalerContext;
|
||||
|
||||
@ -39,7 +39,7 @@ SUNWprivate_1.1 {
|
||||
Java_sun_security_smartcardio_PCSC_SCardBeginTransaction;
|
||||
Java_sun_security_smartcardio_PCSC_SCardEndTransaction;
|
||||
Java_sun_security_smartcardio_PCSC_SCardControl;
|
||||
|
||||
|
||||
local:
|
||||
*;
|
||||
};
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
SUNWprivate_1.1 {
|
||||
global:
|
||||
JDgaLibInit;
|
||||
JDgaLibInit;
|
||||
local:
|
||||
*;
|
||||
};
|
||||
|
||||
@ -36,7 +36,7 @@ SUNWprivate_1.1 {
|
||||
JLI_ReportExceptionDescription;
|
||||
JLI_GetStdArgs;
|
||||
JLI_GetStdArgc;
|
||||
|
||||
|
||||
local:
|
||||
*;
|
||||
};
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
|
||||
SUNWprivate_1.1 {
|
||||
global:
|
||||
VerifyClass;
|
||||
|
||||
@ -107,14 +107,14 @@ PROFILE_2_JRE_BIN_FILES := \
|
||||
rmid$(EXE_SUFFIX) \
|
||||
rmiregistry$(EXE_SUFFIX)
|
||||
|
||||
PROFILE_2_JRE_LIB_FILES :=
|
||||
PROFILE_2_JRE_LIB_FILES :=
|
||||
|
||||
PROFILE_2_JRE_OTHER_FILES :=
|
||||
PROFILE_2_JRE_OTHER_FILES :=
|
||||
|
||||
PROFILE_2_JRE_JAR_FILES :=
|
||||
PROFILE_2_JRE_JAR_FILES :=
|
||||
|
||||
|
||||
PROFILE_3_JRE_BIN_FILES :=
|
||||
PROFILE_3_JRE_BIN_FILES :=
|
||||
|
||||
PROFILE_3_JRE_LIB_FILES := \
|
||||
$(OPENJDK_TARGET_CPU_LEGACY_LIB)/$(LIBRARY_PREFIX)hprof$(SHARED_LIBRARY_SUFFIX) \
|
||||
@ -138,7 +138,7 @@ PROFILE_3_JRE_LIB_FILES := \
|
||||
management/management.properties \
|
||||
management/snmp.acl.template
|
||||
|
||||
PROFILE_3_JRE_OTHER_FILES :=
|
||||
PROFILE_3_JRE_OTHER_FILES :=
|
||||
|
||||
PROFILE_3_JRE_JAR_FILES := \
|
||||
management-agent.jar
|
||||
@ -255,4 +255,3 @@ FULL_JRE_JAR_FILES := \
|
||||
ext/nashorn.jar \
|
||||
ext/zipfs.jar \
|
||||
jfr.jar
|
||||
|
||||
|
||||
@ -24,22 +24,22 @@
|
||||
#
|
||||
|
||||
# Included or excluded types must take one of two forms
|
||||
# - *.class to indicate all classes; or else
|
||||
# - *.class to indicate all classes; or else
|
||||
# - a full single type name e.g.
|
||||
# com/sun/security/auth/callback/DialogCallbackHandler$$1.class
|
||||
# com/sun/security/auth/callback/DialogCallbackHandler$$1.class
|
||||
# You can not use arbitrary wildcards like DialogCallbackHandler*.class.
|
||||
#
|
||||
# Notes:
|
||||
# - Nested types must use $$ in place of $ as $ is the make meta-character
|
||||
# - If a package is not listed in any profile's inclusion list then it will
|
||||
# not appear in any profile. But if a package is also missing from the
|
||||
# full JRE's inclusion list then it will still be part of the full JRE.
|
||||
# This is because the full JRE's inclusion lists are only used to define
|
||||
# the exclusion lists for profiles; they are not used to define the full
|
||||
# JRE contents - that is still done with the pre-profile legacy mechanism
|
||||
# (all packagesthat can be found, less those not intended for rt.jar).
|
||||
# This was done to minimize the impact of profiles on the regular
|
||||
# non-profile build.
|
||||
# - Nested types must use $$ in place of $ as $ is the make meta-character
|
||||
# - If a package is not listed in any profile's inclusion list then it will
|
||||
# not appear in any profile. But if a package is also missing from the
|
||||
# full JRE's inclusion list then it will still be part of the full JRE.
|
||||
# This is because the full JRE's inclusion lists are only used to define
|
||||
# the exclusion lists for profiles; they are not used to define the full
|
||||
# JRE contents - that is still done with the pre-profile legacy mechanism
|
||||
# (all packagesthat can be found, less those not intended for rt.jar).
|
||||
# This was done to minimize the impact of profiles on the regular
|
||||
# non-profile build.
|
||||
#
|
||||
PROFILE_1_RTJAR_INCLUDE_PACKAGES := \
|
||||
com/sun/demo/jvmti/hprof \
|
||||
@ -71,11 +71,11 @@ PROFILE_1_RTJAR_INCLUDE_PACKAGES := \
|
||||
sun/usagetracker \
|
||||
sun/util
|
||||
|
||||
PROFILE_1_RTJAR_INCLUDE_TYPES :=
|
||||
PROFILE_1_RTJAR_INCLUDE_TYPES :=
|
||||
|
||||
PROFILE_1_RTJAR_EXCLUDE_TYPES :=
|
||||
PROFILE_1_RTJAR_EXCLUDE_TYPES :=
|
||||
|
||||
PROFILE_1_INCLUDE_METAINF_SERVICES :=
|
||||
PROFILE_1_INCLUDE_METAINF_SERVICES :=
|
||||
|
||||
|
||||
PROFILE_2_RTJAR_INCLUDE_PACKAGES := \
|
||||
@ -96,12 +96,12 @@ PROFILE_2_RTJAR_INCLUDE_PACKAGES := \
|
||||
sun/rmi \
|
||||
sun/util/xml
|
||||
|
||||
PROFILE_2_RTJAR_INCLUDE_TYPES :=
|
||||
PROFILE_2_RTJAR_INCLUDE_TYPES :=
|
||||
|
||||
PROFILE_2_RTJAR_EXCLUDE_TYPES :=
|
||||
PROFILE_2_RTJAR_EXCLUDE_TYPES :=
|
||||
|
||||
PROFILE_2_INCLUDE_METAINF_SERVICES := \
|
||||
META-INF/services/sun.util.spi.XmlPropertiesProvider
|
||||
META-INF/services/sun.util.spi.XmlPropertiesProvider
|
||||
|
||||
|
||||
PROFILE_3_RTJAR_INCLUDE_PACKAGES := \
|
||||
@ -146,7 +146,7 @@ PROFILE_3_RTJAR_INCLUDE_PACKAGES := \
|
||||
sun/security/smartcardio \
|
||||
sun/tracing
|
||||
|
||||
PROFILE_3_RTJAR_INCLUDE_TYPES :=
|
||||
PROFILE_3_RTJAR_INCLUDE_TYPES :=
|
||||
|
||||
PROFILE_3_RTJAR_EXCLUDE_TYPES := \
|
||||
com/sun/security/auth/callback/DialogCallbackHandler$$1.class \
|
||||
@ -237,22 +237,20 @@ FULL_JRE_RTJAR_INCLUDE_TYPES := \
|
||||
javax/management/remote/rmi/_RMIServer_Stub.class \
|
||||
javax/rmi/*.class
|
||||
|
||||
FULL_JRE_RTJAR_EXCLUDE_TYPES :=
|
||||
FULL_JRE_RTJAR_EXCLUDE_TYPES :=
|
||||
|
||||
FULL_JRE_INCLUDE_METAINF_SERVICES := \
|
||||
META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
|
||||
META-INF/services/com.sun.tools.internal.xjc.Plugin \
|
||||
META-INF/services/javax.print.PrintServiceLookup \
|
||||
META-INF/services/javax.print.StreamPrintServiceFactory \
|
||||
META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \
|
||||
META-INF/services/javax.sound.midi.spi.MidiFileReader \
|
||||
META-INF/services/javax.sound.midi.spi.MidiFileWriter \
|
||||
META-INF/services/javax.sound.midi.spi.SoundbankReader \
|
||||
META-INF/services/javax.sound.sampled.spi.AudioFileReader \
|
||||
META-INF/services/javax.sound.sampled.spi.AudioFileWriter \
|
||||
META-INF/services/javax.sound.sampled.spi.FormatConversionProvider \
|
||||
META-INF/services/javax.sound.sampled.spi.MixerProvider \
|
||||
META-INF/services/sun.java2d.cmm.PCMM \
|
||||
META-INF/services/sun.java2d.pipe.RenderingEngine
|
||||
|
||||
|
||||
META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
|
||||
META-INF/services/com.sun.tools.internal.xjc.Plugin \
|
||||
META-INF/services/javax.print.PrintServiceLookup \
|
||||
META-INF/services/javax.print.StreamPrintServiceFactory \
|
||||
META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \
|
||||
META-INF/services/javax.sound.midi.spi.MidiFileReader \
|
||||
META-INF/services/javax.sound.midi.spi.MidiFileWriter \
|
||||
META-INF/services/javax.sound.midi.spi.SoundbankReader \
|
||||
META-INF/services/javax.sound.sampled.spi.AudioFileReader \
|
||||
META-INF/services/javax.sound.sampled.spi.AudioFileWriter \
|
||||
META-INF/services/javax.sound.sampled.spi.FormatConversionProvider \
|
||||
META-INF/services/javax.sound.sampled.spi.MixerProvider \
|
||||
META-INF/services/sun.java2d.cmm.PCMM \
|
||||
META-INF/services/sun.java2d.pipe.RenderingEngine
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
#
|
||||
|
||||
# Parse the first contiguous comment block in this script and generate
|
||||
# a java comment block. If this script is invoked with a copyright
|
||||
# a java comment block. If this script is invoked with a copyright
|
||||
# year/year range, the java comment block will contain a Sun copyright.
|
||||
|
||||
COPYRIGHT_YEARS="$1"
|
||||
@ -41,5 +41,5 @@ __END__
|
||||
fi
|
||||
|
||||
$NAWK ' /^#.*Copyright.*Oracle/ { next }
|
||||
/^#([^!]|$)/ { sub(/^#/, " *"); print }
|
||||
/^$/ { print " */"; exit } ' $0
|
||||
/^#([^!]|$)/ { sub(/^#/, " *"); print }
|
||||
/^$/ { print " */"; exit } ' $0
|
||||
|
||||
@ -28,17 +28,17 @@
|
||||
# Generate a charset provider class
|
||||
|
||||
# Required environment variables
|
||||
# NAWK awk tool
|
||||
# TEMPDIR temporary directory
|
||||
# HASHER Hasher program
|
||||
# NAWK awk tool
|
||||
# TEMPDIR temporary directory
|
||||
# HASHER Hasher program
|
||||
|
||||
SPEC=$1; shift
|
||||
DST=$1; shift
|
||||
|
||||
eval `$NAWK <$SPEC '
|
||||
/^[ \t]*copyright / { printf "COPYRIGHT_YEARS=\"%s %s\"\n", $2, $3; }
|
||||
/^[ \t]*package / { printf "PKG=%s\n", $2; }
|
||||
/^[ \t]*class / { printf "CLASS=%s\n", $2; }
|
||||
/^[ \t]*copyright / { printf "COPYRIGHT_YEARS=\"%s %s\"\n", $2, $3; }
|
||||
/^[ \t]*package / { printf "PKG=%s\n", $2; }
|
||||
/^[ \t]*class / { printf "CLASS=%s\n", $2; }
|
||||
'`
|
||||
|
||||
OUT=$DST/$CLASS.java
|
||||
@ -69,50 +69,50 @@ __END__
|
||||
# Alias tables
|
||||
#
|
||||
$NAWK <$SPEC >>$OUT '
|
||||
BEGIN { n = 1; m = 1; }
|
||||
BEGIN { n = 1; m = 1; }
|
||||
|
||||
/^[ \t]*charset / {
|
||||
csn = $2; cln = $3;
|
||||
lcsn = tolower(csn);
|
||||
lcsns[n++] = lcsn;
|
||||
csns[lcsn] = csn;
|
||||
classMap[lcsn] = cln;
|
||||
if (n > 2)
|
||||
/^[ \t]*charset / {
|
||||
csn = $2; cln = $3;
|
||||
lcsn = tolower(csn);
|
||||
lcsns[n++] = lcsn;
|
||||
csns[lcsn] = csn;
|
||||
classMap[lcsn] = cln;
|
||||
if (n > 2)
|
||||
printf " };\n\n";
|
||||
printf " static final String[] aliases_%s = new String[] {\n", cln;
|
||||
}
|
||||
|
||||
/^[ \t]*alias / {
|
||||
acsns[m++] = tolower($2);
|
||||
aliasMap[tolower($2)] = lcsn;
|
||||
printf " \"%s\",\n", $2;
|
||||
}
|
||||
|
||||
END {
|
||||
printf " };\n\n";
|
||||
printf " static final String[] aliases_%s = new String[] {\n", cln;
|
||||
}
|
||||
|
||||
/^[ \t]*alias / {
|
||||
acsns[m++] = tolower($2);
|
||||
aliasMap[tolower($2)] = lcsn;
|
||||
printf " \"%s\",\n", $2;
|
||||
}
|
||||
|
||||
END {
|
||||
printf " };\n\n";
|
||||
}
|
||||
}
|
||||
'
|
||||
|
||||
|
||||
# Prehashed alias and class maps
|
||||
#
|
||||
$NAWK <$SPEC >$TEMPDIR/aliases '
|
||||
/^[ \t]*charset / {
|
||||
csn = $2;
|
||||
lcsn = tolower(csn);
|
||||
}
|
||||
/^[ \t]*alias / {
|
||||
an = tolower($2);
|
||||
printf "%-20s \"%s\"\n", an, lcsn;
|
||||
}
|
||||
/^[ \t]*charset / {
|
||||
csn = $2;
|
||||
lcsn = tolower(csn);
|
||||
}
|
||||
/^[ \t]*alias / {
|
||||
an = tolower($2);
|
||||
printf "%-20s \"%s\"\n", an, lcsn;
|
||||
}
|
||||
'
|
||||
|
||||
$NAWK <$SPEC >$TEMPDIR/classes '
|
||||
/^[ \t]*charset / {
|
||||
csn = $2; cln = $3;
|
||||
lcsn = tolower(csn);
|
||||
printf "%-20s \"%s\"\n", lcsn, cln;
|
||||
}
|
||||
/^[ \t]*charset / {
|
||||
csn = $2; cln = $3;
|
||||
lcsn = tolower(csn);
|
||||
printf "%-20s \"%s\"\n", lcsn, cln;
|
||||
}
|
||||
'
|
||||
|
||||
${HASHER} -i Aliases <$TEMPDIR/aliases >>$OUT
|
||||
|
||||
@ -32,7 +32,7 @@ DST=$2
|
||||
gen() {
|
||||
ID=$1
|
||||
WHAT=$2
|
||||
SVUID=$3
|
||||
SVUID=$3
|
||||
ARG_TYPE=$4
|
||||
ARG_ID=$5
|
||||
ARG_PROP=$6
|
||||
@ -43,7 +43,7 @@ gen() {
|
||||
|
||||
$SH ${SCRIPTS}/addNotices.sh "$COPYRIGHT_YEARS" > $out
|
||||
|
||||
cat >>$out <<__END__
|
||||
cat >>$out <<__END__
|
||||
|
||||
// -- This file was mechanically generated: Do not edit! -- //
|
||||
|
||||
|
||||
@ -40,70 +40,67 @@ JAVA_LOCALES=
|
||||
|
||||
toJavaLocale()
|
||||
{
|
||||
NewLocale=`echo $1 | $NAWK '
|
||||
BEGIN {
|
||||
# The following values have to be consistent with java.util.Locale.
|
||||
javalocales["en"] = "ENGLISH";
|
||||
javalocales["fr"] = "FRENCH";
|
||||
javalocales["de"] = "GERMAN";
|
||||
javalocales["it"] = "ITALIAN";
|
||||
javalocales["ja"] = "JAPANESE";
|
||||
javalocales["ko"] = "KOREAN";
|
||||
javalocales["zh"] = "CHINESE";
|
||||
javalocales["zh_CN"] = "SIMPLIFIED_CHINESE";
|
||||
javalocales["zh_TW"] = "TRADITIONAL_CHINESE";
|
||||
javalocales["fr_FR"] = "FRANCE";
|
||||
javalocales["de_DE"] = "GERMANY";
|
||||
javalocales["it_IT"] = "ITALY";
|
||||
javalocales["ja_JP"] = "JAPAN";
|
||||
javalocales["ko_KR"] = "KOREA";
|
||||
javalocales["en_GB"] = "UK";
|
||||
javalocales["en_US"] = "US";
|
||||
javalocales["en_CA"] = "CANADA";
|
||||
javalocales["fr_CA"] = "CANADA_FRENCH";
|
||||
}
|
||||
{
|
||||
if ($0 in javalocales) {
|
||||
print " Locale." javalocales[$0];
|
||||
} else {
|
||||
split($0, a, "_");
|
||||
if (a[3] != "") {
|
||||
print " new Locale(\"" a[1] "\", \"" a[2] "\", \"" a[3] "\")";
|
||||
} else if (a[2] != "") {
|
||||
print " new Locale(\"" a[1] "\", \"" a[2] "\")";
|
||||
} else {
|
||||
print " new Locale(\"" a[1] "\")";
|
||||
}
|
||||
}
|
||||
}'`
|
||||
NewLocale=`echo $1 | $NAWK '
|
||||
BEGIN {
|
||||
# The following values have to be consistent with java.util.Locale.
|
||||
javalocales["en"] = "ENGLISH";
|
||||
javalocales["fr"] = "FRENCH";
|
||||
javalocales["de"] = "GERMAN";
|
||||
javalocales["it"] = "ITALIAN";
|
||||
javalocales["ja"] = "JAPANESE";
|
||||
javalocales["ko"] = "KOREAN";
|
||||
javalocales["zh"] = "CHINESE";
|
||||
javalocales["zh_CN"] = "SIMPLIFIED_CHINESE";
|
||||
javalocales["zh_TW"] = "TRADITIONAL_CHINESE";
|
||||
javalocales["fr_FR"] = "FRANCE";
|
||||
javalocales["de_DE"] = "GERMANY";
|
||||
javalocales["it_IT"] = "ITALY";
|
||||
javalocales["ja_JP"] = "JAPAN";
|
||||
javalocales["ko_KR"] = "KOREA";
|
||||
javalocales["en_GB"] = "UK";
|
||||
javalocales["en_US"] = "US";
|
||||
javalocales["en_CA"] = "CANADA";
|
||||
javalocales["fr_CA"] = "CANADA_FRENCH";
|
||||
}
|
||||
{
|
||||
if ($0 in javalocales) {
|
||||
print " Locale." javalocales[$0];
|
||||
} else {
|
||||
split($0, a, "_");
|
||||
if (a[3] != "") {
|
||||
print " new Locale(\"" a[1] "\", \"" a[2] "\", \"" a[3] "\")";
|
||||
} else if (a[2] != "") {
|
||||
print " new Locale(\"" a[1] "\", \"" a[2] "\")";
|
||||
} else {
|
||||
print " new Locale(\"" a[1] "\")";
|
||||
}
|
||||
}
|
||||
}'`
|
||||
|
||||
JAVA_LOCALES=$JAVA_LOCALES$NewLocale
|
||||
JAVA_LOCALES=$JAVA_LOCALES$NewLocale
|
||||
}
|
||||
|
||||
# count the number of locales
|
||||
counter=0
|
||||
for i in $LOCALES
|
||||
do
|
||||
counter=`expr $counter + 1`
|
||||
counter=`expr $counter + 1`
|
||||
done
|
||||
|
||||
index=0
|
||||
for locale in $LOCALES
|
||||
do
|
||||
index=`expr $index + 1`;
|
||||
if [ $index != $counter ]
|
||||
then
|
||||
toJavaLocale $locale
|
||||
JAVA_LOCALES=$JAVA_LOCALES","
|
||||
else
|
||||
toJavaLocale $locale
|
||||
fi
|
||||
index=`expr $index + 1`;
|
||||
if [ $index != $counter ]
|
||||
then
|
||||
toJavaLocale $locale
|
||||
JAVA_LOCALES=$JAVA_LOCALES","
|
||||
else
|
||||
toJavaLocale $locale
|
||||
fi
|
||||
done
|
||||
|
||||
# replace the #LOCALE_LIST# in the precompiled CoreResourceBundleControl.java file.
|
||||
|
||||
$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
|
||||
|
||||
@ -36,7 +36,7 @@ public class ToBin {
|
||||
BufferedImage bi = null;
|
||||
int iconWidth = im.getWidth(null);
|
||||
int iconHeight = im.getHeight(null);
|
||||
if (im != null && iconHeight != 0 && iconWidth != 0) {
|
||||
if (im != null && iconHeight != 0 && iconWidth != 0) {
|
||||
bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB);
|
||||
Graphics g = bi.getGraphics();
|
||||
try {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user